[Red5commits] [1761] added FME specific methods

[jbauch]

added FME specific methods


Timestamp: 03/15/07 20:05:26 EST (less than one hour ago) 
Change: 1761 
Author: jbauch

Files (see diff or trac for details): 
java/server/trunk/src/org/red5/server/adapter/ApplicationAdapter.java
java/server/trunk/src/org/red5/server/api/stream/IStreamService.java
java/server/trunk/src/org/red5/server/net/rtmp/RTMPHandler.java
java/server/trunk/src/org/red5/server/net/rtmp/message/Constants.java
java/server/trunk/src/org/red5/server/stream/StreamService.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1761

Index: /java/server/trunk/src/org/red5/server/adapter/ApplicationAdapter.java
===================================================================
--- /java/server/trunk/src/org/red5/server/adapter/ApplicationAdapter.java (revision 1698)
+++ /java/server/trunk/src/org/red5/server/adapter/ApplicationAdapter.java (revision 1761)
@@ -1026,3 +1026,20 @@
         }
     }
+    
+    /**
+     * Notification method that is sent by FME just before publishing starts.
+     * 
+     * @param streamName	Name of stream that is about to be published.
+     */
+    public void FCPublish(String streamName) {
+    	// Override if necessary.
+    }
+    
+    /**
+     * Notification method that is sent by FME when publishing of a stream ends.
+     */
+    public void FCUnpublish() {
+    	// Override if necessary.
+    }
+    
 }
Index: /java/server/trunk/src/org/red5/server/stream/StreamService.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/StreamService.java (revision 1719)
+++ /java/server/trunk/src/org/red5/server/stream/StreamService.java (revision 1761)
@@ -114,4 +114,9 @@
 		conn.unreserveStreamId(streamId);
 	}
+    
+	/** {@inheritDoc} */
+    public void releaseStream(String streamName) {
+    	// XXX: what to do here?
+    }
 
 	/** {@inheritDoc} */
Index: /java/server/trunk/src/org/red5/server/net/rtmp/RTMPHandler.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/rtmp/RTMPHandler.java (revision 1760)
+++ /java/server/trunk/src/org/red5/server/net/rtmp/RTMPHandler.java (revision 1761)
@@ -337,4 +337,5 @@
 			} else if (action.equals(ACTION_CREATE_STREAM)
 					|| action.equals(ACTION_DELETE_STREAM)
+					|| action.equals(ACTION_RELEASE_STREAM)
 					|| action.equals(ACTION_PUBLISH)
 					|| action.equals(ACTION_PLAY) || action.equals(ACTION_SEEK)
Index: /java/server/trunk/src/org/red5/server/net/rtmp/message/Constants.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/rtmp/message/Constants.java (revision 1698)
+++ /java/server/trunk/src/org/red5/server/net/rtmp/message/Constants.java (revision 1761)
@@ -196,4 +196,6 @@
 	public static final String ACTION_CLOSE_STREAM = "closeStream";
 
+	public static final String ACTION_RELEASE_STREAM = "releaseStream";
+
 	public static final String ACTION_PUBLISH = "publish";
 
Index: /java/server/trunk/src/org/red5/server/api/stream/IStreamService.java
===================================================================
--- /java/server/trunk/src/org/red5/server/api/stream/IStreamService.java (revision 1698)
+++ /java/server/trunk/src/org/red5/server/api/stream/IStreamService.java (revision 1761)
@@ -47,4 +47,11 @@
 	 */
 	public void deleteStream(int streamId);
+
+	/**
+	 * Called by FME.
+	 * 
+	 * @param streamName
+	 */
+	public void releaseStream(String streamName);
 
     /**


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.