- a bit of cleanup

bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/transcoder/PcmToNellyTranscoder.java

@@ -77,15 +77,15 @@ public class PcmToNellyTranscoder implements Transcoder {
     	float[] decodingBuffer = new float[codedBuffer.length];
         int decodedBytes = audioCodec.codecToPcm(codedBuffer, decodingBuffer);
 
-//        log.debug("encodedBytes = " + decodedBytes + ", incomingDecodedFrameSize = " +
+//        log.debug("incoming = " + codedBuffer.length + ", encodedBytes = " + decodedBytes + ", incomingDecodedFrameSize = " +
 //                audioCodec.getIncomingDecodedFrameSize() + "." );
 
         if (decodedBytes == audioCodec.getIncomingDecodedFrameSize()) {
             forwardAudioToFlashPlayer(decodingBuffer);
-        }
-        else {
+        } else {
             log.warn("Failure decoding buffer." );
         }    	
+        
     }
     
     private void pushAudio(byte[] audio) {
@@ -118,22 +118,17 @@ public class PcmToNellyTranscoder implements Transcoder {
      */
 	public void transcode(byte[] asaoBuffer, int offset, int num,
 			byte[] transcodedData, int dataOffset, RtpStreamSender rtpSender) {
-		// TODO Auto-generated method stub
-		
 	}
 
 	public int getCodecId() {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	public int getOutgoingEncodedFrameSize() {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 
 	public int getOutgoingPacketization() {
-		// TODO Auto-generated method stub
 		return 0;
 	}
 }

bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallManager.java

@@ -12,8 +12,8 @@ public class CallManager {
 		return calls.put(ca.getCallId(), ca);
 	}
 	
-	public CallAgent remove(CallAgent ca) {
-		return calls.remove(ca.getCallId());
+	public CallAgent remove(String id) {
+		return calls.remove(id);
 	}
 	
 	public CallAgent get(String id) {

bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/OptionMethodListener.java

@@ -12,7 +12,6 @@ public class OptionMethodListener implements SipProviderListener {
 	protected static Logger log = Red5LoggerFactory.getLogger( OptionMethodListener.class, "sip" );
 	
 	public void onReceivedMessage(SipProvider sip_provider, Message message) {
-		// TODO Auto-generated method stub
 		if (message.isOption()) {
 			log.debug("Received OPTION message");
 			Message response = MessageFactory.createResponse(message, 200, "OK", message.getFromHeader().getNameAddress());

bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java

@@ -145,7 +145,7 @@ public class SipPeer implements SipRegisterAgentListener {
     public void hangup(String clientId) {
     	log.debug( "SIPUser hangup" );
 
-    	CallAgent ca = callManager.get(clientId);
+    	CallAgent ca = callManager.remove(clientId);
         if (ca != null) {
            ca.hangup();
         }