BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- allow users with no mic to listen to audio stream

Browse Source
This commit is contained in:
Richard Alam 2012-01-24 21:53:52 +00:00
parent 6e4eaaba04
commit 427f827ba6
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java
View File

@ -69,6 +69,8 @@ public class CallStream implements StreamObserver {
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 class CallStream implements StreamObserver {
}
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");

6
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
View File

@ -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"));

8
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as
View File

@ -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;