Permalink
Browse files

- upgrade to red5 r4415

  • Loading branch information...
1 parent a01b9df commit ad35b2ab08273ae100ca6fab28362c1739f9174e @ritzalam ritzalam committed Sep 12, 2012
View
@@ -81,7 +81,7 @@ dependencies {
providedCompile 'org.springframework:spring-core:3.0.6.RELEASE@jar'
// Red5
- providedCompile 'org/red5:red5:1.0r4406@jar'
+ providedCompile 'org/red5:red5:1.0r4415@jar'
// Logging
providedCompile 'org.slf4j:com.springsource.slf4j.api:1.6.1@jar'
View
@@ -81,7 +81,7 @@ dependencies {
providedCompile 'org.springframework:spring-core:3.0.6.RELEASE@jar'
// Red5
- providedCompile 'org/red5:red5:1.0r4406@jar'
+ providedCompile 'org/red5:red5:1.0r4415@jar'
// Logging
providedCompile 'org.slf4j:com.springsource.slf4j.api:1.6.1@jar'
@@ -19,7 +19,7 @@
**/
package org.bigbluebutton.voiceconf.sip;
-import org.red5.server.api.IScope;
+import org.red5.server.api.scope.IScope;
public interface ScopeProvider {
@@ -7,8 +7,6 @@
import org.red5.server.api.scope.IScope;
import org.red5.server.net.rtmp.event.AudioData;
import org.red5.server.scope.Scope;
-import org.red5.server.stream.BroadcastScope;
-import org.red5.server.stream.IBroadcastScope;
import org.red5.server.stream.IProviderService;
import org.slf4j.Logger;
@@ -72,9 +70,7 @@ private void startPublishing(IScope aScope){
IProviderService providerService = (IProviderService) context.getBean(IProviderService.BEAN_NAME);
if (providerService.registerBroadcastStream(aScope, listenStreamName, broadcastStream)){
- IBroadcastScope bScope = (BroadcastScope) providerService.getLiveProviderInput(aScope, listenStreamName, true);
-
- ((BroadcastScope)bScope).setAttribute(IBroadcastScope.STREAM_ATTRIBUTE, broadcastStream);
+ // Do nothing.
} else{
log.error("could not register broadcast stream");
throw new RuntimeException("could not register broadcast stream");
@@ -72,7 +72,7 @@ dependencies {
providedCompile 'org.springframework:spring-core:3.0.6.RELEASE@jar'
// Red5
- providedCompile 'org/red5:red5:1.0r4406@jar'
+ providedCompile 'org/red5:red5:1.0r4415@jar'
// Logging
providedCompile 'org.slf4j:com.springsource.slf4j.api:1.6.1@jar'
@@ -21,7 +21,7 @@ dependencies {
providedCompile 'org.springframework:spring-core:3.0.6.RELEASE@jar'
compile 'org.springframework:spring-webmvc:3.0.6.RELEASE@jar'
- providedCompile 'org/red5:red5:1.0r4406@jar'
+ providedCompile 'org/red5:red5:1.0r4415@jar'
// Logging
@@ -29,7 +29,6 @@ import org.red5.server.api.IContext
import org.red5.server.api.scope.{IScope, IBroadcastScope}
import org.red5.server.api.so.ISharedObject
import org.red5.server.net.rtmp.event.VideoData;
-import org.red5.server.stream.BroadcastScope
import org.red5.server.stream.IProviderService
import org.red5.server.net.rtmp.message.Constants;
import org.apache.mina.core.buffer.IoBuffer
View
@@ -73,7 +73,7 @@ dependencies {
// Red5
- compile 'org/red5:red5:1.0r4406@jar'
+ compile 'org/red5:red5:1.0r4415@jar'
// Logging
compile 'org.slf4j:com.springsource.slf4j.api:1.6.1@jar'

0 comments on commit ad35b2a

Please sign in to comment.