Add possibility to initiate directly videocall and desktop streaming session in protocol service. Note that GUI need to be modified in order to propose this feature to users.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java b/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java
index a1a3462..70ac420 100644
--- a/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/DeviceConfigurationComboBoxModel.java
@@ -12,6 +12,7 @@ import javax.media.*;
 import javax.swing.*;

 import javax.swing.event.*;

 

+import net.java.sip.communicator.service.neomedia.*;

 import net.java.sip.communicator.impl.neomedia.device.*;

 

 /**

@@ -125,7 +126,7 @@ public class DeviceConfigurationComboBoxModel
     {

         if (deviceConfiguration == null)

             throw new IllegalArgumentException("deviceConfiguration");

-        if ((type != AUDIO_CAPTURE) && (type != AUDIO_NOTIFY) && 

+        if ((type != AUDIO_CAPTURE) && (type != AUDIO_NOTIFY) &&

             (type != AUDIO_PLAYBACK) &&

             (type != AUDIO) && (type != VIDEO))

             throw new IllegalArgumentException("type");

@@ -186,7 +187,8 @@ public class DeviceConfigurationComboBoxModel
             infos = deviceConfiguration.getAvailableAudioPlaybackDevices();

             break;

         case VIDEO:

-            infos = deviceConfiguration.getAvailableVideoCaptureDevices();

+            infos = deviceConfiguration.getAvailableVideoCaptureDevices(

+                    MediaUseCase.CALL);

             break;

         default:

             throw new IllegalStateException("type");

@@ -221,7 +223,7 @@ public class DeviceConfigurationComboBoxModel
             info = deviceConfiguration.getAudioPlaybackDevice();

             break;

         case VIDEO:

-            info = deviceConfiguration.getVideoCaptureDevice();

+            info = deviceConfiguration.getVideoCaptureDevice(MediaUseCase.ANY);

             break;

         default:

             throw new IllegalStateException("type");