[Red5commits] [2393] unsubscribe msgIn when(1) in stop() if not in pull mode (not VOD) so that seeki

[sgong]

unsubscribe msgIn when
(1) in stop() if not in pull mode (not VOD) so that seeking is still possible for VOD
(2) in play() if msgIn is not null, which occurs for last VOD item.


Timestamp: 10/15/07 07:45:41 EST (less than one hour ago) 
Change: 2393 
Author: sgong

Files (see diff or trac for details): 
java/server/trunk/src/org/red5/server/stream/PlaylistSubscriberStream.java


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

Index: /java/server/trunk/src/org/red5/server/stream/PlaylistSubscriberStream.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/PlaylistSubscriberStream.java (revision 2392)
+++ /java/server/trunk/src/org/red5/server/stream/PlaylistSubscriberStream.java (revision 2393)
@@ -937,4 +937,8 @@
 				throw new IllegalStateException();
 			}
+            if (msgIn != null) {
+            	msgIn.unsubscribe(this);
+            	msgIn = null;
+            }
 			int type = (int) (item.getStart() / 1000);
 			// see if it's a published stream
@@ -1269,5 +1273,5 @@
 			}
 			state = State.STOPPED;
-			if (msgIn != null) {
+			if (msgIn != null && !isPullMode) {
 				msgIn.unsubscribe(this);
 				msgIn = null;


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