Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

kirill-scherba · Dec 3, 2010 · 02970d2 · 02970d2
2 parents a01541e + 3261a66
commit 02970d2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java
@@ -81,8 +81,11 @@ public String getListenStreamName() {
     }
 
     public void startTalkStream(IBroadcastStream broadcastStream, IScope scope) throws StreamException {
+    	log.debug("Starting userListenSteam");
     	userListenStream.start();
+    	log.debug("userTalkStream setup");
     	userTalkStream.start(broadcastStream, scope);
+    	log.debug("userTalkStream Started");
     }
 
     public void stopTalkStream(IBroadcastStream broadcastStream, IScope scope) {

diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java
@@ -95,10 +95,14 @@ public void stop() {
 		}
 		rtpStreamReceiver.stop();
 		log.debug("Stopped RTP Stream Receiver for {}", listenStreamName);
-		audioBroadcastStream.stop();
-		log.debug("Stopped audioBroadcastStream for {}", listenStreamName);
-	    audioBroadcastStream.close();
-	    log.debug("Closed audioBroadcastStream for {}", listenStreamName);
+		if (audioBroadcastStream != null) {
+			audioBroadcastStream.stop();
+			log.debug("Stopped audioBroadcastStream for {}", listenStreamName);
+			audioBroadcastStream.close();
+		    log.debug("Closed audioBroadcastStream for {}", listenStreamName);
+		} else
+			log.debug("audioBroadcastStream is null, couldn't stop");
+	    log.debug("Stream(s) stopped");
 	}
 
 	public void start() {

diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as
@@ -59,7 +59,7 @@ package org.bigbluebutton.modules.phone.managers
 
 		public function initMicrophone():void {
 			mic = Microphone.getMicrophone();
-			mic = null;
+
 			if(mic == null){
 				initWithNoMicrophone();
 			} else {
@@ -198,7 +198,7 @@ package org.bigbluebutton.modules.phone.managers
 		}
 
 		public function stopStreams():void {
-			LogUtil.debug("Stoping Streams");
+			LogUtil.debug("Stopping Stream(s)");
 			if(incomingStream != null) {
 				LogUtil.debug("--Stopping Incoming Stream");
 				incomingStream.play(false); 
@@ -215,6 +215,7 @@ package org.bigbluebutton.modules.phone.managers
 			}
 
 			isCallConnected = false;
+			LogUtil.debug("Stopped Stream(s)");
 		}
 
 		private function netStatus (evt:NetStatusEvent ):void {