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

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

Browse Source
This commit is contained in:
deniszgonjanin 2010-08-26 17:49:32 +00:00
commit 655594a914
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/Application.java
View File

@ -32,6 +32,7 @@ import org.red5.server.api.IScope;
import org.red5.server.api.Red5;
import org.red5.server.api.service.IServiceCapableConnection;
import org.red5.server.api.stream.IBroadcastStream;
import org.red5.server.stream.ClientBroadcastStream;
public class Application extends MultiThreadedApplicationAdapter {
private static Logger log = Red5LoggerFactory.getLogger(Application.class, "sip");
@ -104,9 +105,27 @@ public class Application extends MultiThreadedApplicationAdapter {
super.streamPublishStart(stream);
String clientId = conn.getClient().getId();
sipPeerManager.startTalkStream(peerId, clientId, stream, conn.getScope());
// recordStream(stream);
}
}
/**
* A hook to record a sample stream. A file is written in webapps/sip/streams/
* @param stream
*/
private void recordStream(IBroadcastStream stream) {
IConnection conn = Red5.getConnectionLocal();
String streamName = stream.getPublishedName();
try {
ClientBroadcastStream cstream = (ClientBroadcastStream) this.getBroadcastStream(conn.getScope(), stream.getPublishedName() );
cstream.saveAs(streamName, false);
} catch(Exception e) {
System.out.println("ERROR while recording stream " + e.getMessage());
e.printStackTrace();
}
}
@Override
public void streamBroadcastClose(IBroadcastStream stream) {
System.out.println("streamBroadcastClose: " + stream.getPublishedName());

4
bigbluebutton-client/resources/prod/BigBlueButton.html
View File

@ -82,7 +82,7 @@ if ( hasProductInstall && !hasRequestedVersion ) {
// see. http://stackoverflow.com/questions/313966/mousewheel-not-working-when-published-movie-has-wmodetransparent
// ralam (mar 31, 2010)
AC_FL_RunContent(
"src", "BigBlueButton",
"src", "BigBlueButton.swf?v=VERSION",
"width", "100%",
"height", "100%",
"align", "middle",
@ -197,7 +197,7 @@ function getLanguage(){
<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
id="BigBlueButton" width="100%" height="100%"
codebase="http://fpdownload.macromedia.com/get/flashplayer/current/swflash.cab">
<param name="movie" value="BigBlueButton.swf" />
<param name="movie" value="BigBlueButton.swf?v=VERSION" />
<param name="quality" value="high" />
<param name="bgcolor" value="#869ca7" />
<param name="allowScriptAccess" value="sameDomain" />