First steps on modifying SIP to use the neomedia package

src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java

@@ -106,10 +106,13 @@ public class CallPeerSipImpl
     private final OperationSetBasicTelephonySipImpl parentOpSet;
 
     /**
-     * The <tt>CallSession</tt> that the media service has created for this
-     * call.
+     * The media handler class handles all media management for a single
+     * <tt>CallPeer</tt>. This includes initializing and configuring streams,
+     * generating SDP, handling ICE, etc. One instance of <tt>CallPeer</tt> always
+     * corresponds to exactly one instance of <tt>CallPeerMediaHandler</tt> and
+     * both classes are only separated for reasons of readability.
      */
-    private CallSession mediaCallSession = null;
+    private final CallPeerMediaHandler mediaHandler;
 
     /**
      * Creates a new call peer with address <tt>peerAddress</tt>.
@@ -130,6 +133,8 @@ public CallPeerSipImpl(Address     peerAddress,
         this.parentOpSet = owningCall.getParentOperationSet();
         this.messageFactory = getProtocolProvider().getMessageFactory();
 
+        this.mediaHandler = new CallPeerMediaHandler(this);
+
         setDialog(containingTransaction.getDialog());
         setLatestInviteTransaction(containingTransaction);
         setJainSipProvider(sourceProvider);
@@ -594,30 +599,6 @@ private void attachSdpAnswer(Response response)
                 .createContentTypeHeader("application", "sdp"));
     }
 
-    /**
-     * Sets the <tt>CallSession</tt> that the media service has created for this
-     * call peer.
-     *
-     * @param callSession the <tt>CallSession</tt> that the media service has
-     * created for this <tt>CallPeer</tt>.
-     */
-    public void setMediaCallSession(CallSession callSession)
-    {
-        this.mediaCallSession = callSession;
-    }
-
-    /**
-     * Returns the <tt>CallSession</tt> that the media service has created for
-     * this peer.
-     *
-     * @return the <tt>CallSession</tt> that the media service has created for
-     * this peer or <tt>null</tt> if no call session has been created so far.
-     */
-    public CallSession getMediaCallSession()
-    {
-        return this.mediaCallSession;
-    }
-
     /**
      * Updates the media flags for this peer according to the value of the SDP
      * field.
@@ -1622,4 +1603,21 @@ public void handleAuthenticationChallenge(ClientTransaction retryTran)
         setLatestInviteTransaction(retryTran);
         setJainSipProvider(jainSipProvider);
     }
+
+    /**
+     * Returns a reference to the <tt>CallPeerMediaHandler</tt> used by this
+     * peer. The media handler class handles all media management for a single
+     * <tt>CallPeer</tt>. This includes initializing and configuring streams,
+     * generating SDP, handling ICE, etc. One instance of <tt>CallPeer</tt>
+     * always corresponds to exactly one instance of
+     * <tt>CallPeerMediaHandler</tt> and both classes are only separated for
+     * reasons of readability.
+     *
+     * @return a reference to the <tt>CallPeerMediaHandler</tt> instance that
+     * this peer uses for media related tips and tricks.
+     */
+    private CallPeerMediaHandler getMediaHandler()
+    {
+        return mediaHandler;
+    }
 }