- move callback to inform client that call has ended

spidercpsf · Aug 28, 2014 · bd2f709 · bd2f709
1 parent 8c7b134
commit bd2f709
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/RtpStreamReceiver.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/RtpStreamReceiver.java
@@ -115,7 +115,6 @@ public void receiveRtpPackets() {
         	}
         }
         log.debug("Rtp Receiver stopped. Packet Received = " + packetReceivedCounter + "." );
-        if (listener != null) listener.onStoppedReceiving();
     }
 
     private boolean shouldDropDelayedPacket(RtpPacket rtpPacket) {

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
@@ -87,9 +87,13 @@ public void stop() {
 			if (log.isDebugEnabled()) log.debug("Stopped audioBroadcastStream for {}", listenStreamName);
 			audioBroadcastStream.close();
 		    if (log.isDebugEnabled()) log.debug("Closed audioBroadcastStream for {}", listenStreamName);
-		} else
+		} else {
 			if (log.isDebugEnabled()) log.debug("audioBroadcastStream is null, couldn't stop");
-	    if (log.isDebugEnabled()) log.debug("Stream(s) stopped");
+		}
+
+	   if (log.isDebugEnabled()) log.debug("Stream(s) stopped");
+
+	    if (observer != null) observer.onStreamStopped();
 	}
 
 	public void start() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,7 +115,6 @@ public void receiveRtpPackets() { @@
             	}
             }
             log.debug("Rtp Receiver stopped. Packet Received = " + packetReceivedCounter + "." );
-            if (listener != null) listener.onStoppedReceiving();
         }
         private boolean shouldDropDelayedPacket(RtpPacket rtpPacket) {
@@ Expand Down @@