Ongoing work on cross protocol conference calls. Adds missing portaudio hotplug patch.

1 files changed, 42 insertions, 2 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
index 2105b98..3614908 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
@@ -126,18 +126,21 @@ public class OperationSetBasicTelephonyJabberImpl
      *
      * @param callee the address of the callee who we should invite to a new
      * <tt>Call</tt>
+     * @param group <tt>CallGroup</tt> from which the <tt>Call</tt> will belong
      * @return a newly created <tt>Call</tt>. The specified <tt>callee</tt> is
      * available in the <tt>Call</tt> as a <tt>CallPeer</tt>
      * @throws OperationFailedException with the corresponding code if we fail
      * to create the call
      * @see OperationSetBasicTelephony#createCall(String)
      */
-    public Call createCall(String callee)
+    public Call createCall(String callee, CallGroup group)
         throws OperationFailedException
     {
         CallJabberImpl call = new CallJabberImpl(this);
         CallPeer callPeer = null;
 
+        call.setCallGroup(group);
+
         callPeer = createOutgoingCall(call, callee);
         if (callPeer == null)
         {
@@ -161,6 +164,43 @@ public class OperationSetBasicTelephonyJabberImpl
      *
      * @param callee the address of the callee who we should invite to a new
      * call
+     * @param group <tt>CallGroup</tt> from which the <tt>Call</tt> will belong
+     * @return a newly created <tt>Call</tt>. The specified <tt>callee</tt> is
+     * available in the <tt>Call</tt> as a <tt>CallPeer</tt>
+     * @throws OperationFailedException with the corresponding code if we fail
+     * to create the call
+     * @see OperationSetBasicTelephony#createCall(Contact)
+     */
+    public Call createCall(Contact callee, CallGroup group)
+            throws OperationFailedException
+    {
+        return createCall(callee.getAddress(), group);
+    }
+
+    /**
+     * Creates a new <tt>Call</tt> and invites a specific <tt>CallPeer</tt> to
+     * it given by her <tt>String</tt> URI.
+     *
+     * @param callee the address of the callee who we should invite to a new
+     * <tt>Call</tt>
+     * @return a newly created <tt>Call</tt>. The specified <tt>callee</tt> is
+     * available in the <tt>Call</tt> as a <tt>CallPeer</tt>
+     * @throws OperationFailedException with the corresponding code if we fail
+     * to create the call
+     * @see OperationSetBasicTelephony#createCall(String)
+     */
+    public Call createCall(String callee)
+        throws OperationFailedException
+    {
+        return createCall(callee, null);
+    }
+
+    /**
+     * Creates a new <tt>Call</tt> and invites a specific <tt>CallPeer</tt>
+     * to it given by her <tt>Contact</tt>.
+     *
+     * @param callee the address of the callee who we should invite to a new
+     * call
      * @return a newly created <tt>Call</tt>. The specified <tt>callee</tt> is
      * available in the <tt>Call</tt> as a <tt>CallPeer</tt>
      * @throws OperationFailedException with the corresponding code if we fail
@@ -170,7 +210,7 @@ public class OperationSetBasicTelephonyJabberImpl
     public Call createCall(Contact callee)
             throws OperationFailedException
     {
-        return createCall(callee.getAddress());
+        return createCall(callee.getAddress(), null);
     }
 
     /**