- allow users with no mic to listen to audio stream

tvos · Jan 24, 2012 · 427f827 · 427f827
1 parent 6e4eaab
commit 427f827
Show file tree

Hide file tree

Showing 3 changed files with 12 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
@@ -69,6 +69,8 @@ public void start() {
 
 		userListenStream = new SipToFlashAudioStream(scope, sipToFlashTranscoder, connInfo.getSocket());
 		userListenStream.addListenStreamObserver(this);	
+		log.debug("Starting userListenStream so that users with no mic can listen.");
+		userListenStream.start();
 		userTalkStream = new FlashToSipAudioStream(flashToSipTranscoder, connInfo.getSocket(), connInfo); 
     }
 
@@ -81,8 +83,6 @@ 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");

diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
@@ -53,7 +53,11 @@ package org.bigbluebutton.modules.phone.managers {
 
 			if (phoneOptions.autoJoin) {
 				if (phoneOptions.skipCheck || noMicrophone()) {
-					joinVoice(true);
+					if (noMicrophone()) {
+						joinVoice(false);
+					} else {
+						joinVoice(true);						
+					}
 				} else {
 					var dispatcher:Dispatcher = new Dispatcher();
 					dispatcher.dispatchEvent(new BBBEvent("SHOW_MIC_SETTINGS"));

diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as
@@ -135,7 +135,7 @@ package org.bigbluebutton.modules.phone.managers {
 			publish(publishStreamName);
 		}
 
-		private function play(playStreamName:String):void {			
+		private function play(playStreamName:String):void {		
 			incomingStream.play(playStreamName);
 		}
 
@@ -158,7 +158,9 @@ package org.bigbluebutton.modules.phone.managers {
 			 * http://stackoverflow.com/questions/1079935/actionscript-netstream-stutters-after-buffering
 			 * ralam (Dec 13, 2010)
 			 */
-			incomingStream.bufferTime = 0;			
+			incomingStream.bufferTime = 0;	
+			incomingStream.receiveAudio(true);
+			incomingStream.receiveVideo(false);
 		}
 
 		private function setupOutgoingStream():void {
@@ -201,7 +203,7 @@ package org.bigbluebutton.modules.phone.managers {
 
 		private function netStatus (evt:NetStatusEvent ):void {		 
 			var event:PlayStreamStatusEvent = new PlayStreamStatusEvent();
-
+			LogUtil.debug("******* evt.info.code  " + evt.info.code);
 			switch(evt.info.code) {			
 				case "NetStream.Play.StreamNotFound":
 					event.status = PlayStreamStatusEvent.PLAY_STREAM_STATUS_EVENT;