diff options
author | Damian Minkov <damencho@jitsi.org> | 2014-03-20 15:21:27 +0200 |
---|---|---|
committer | Damian Minkov <damencho@jitsi.org> | 2014-03-20 15:21:27 +0200 |
commit | 35ef27e5c83cd296ead9357dfd7731816a6e3610 (patch) | |
tree | 1bfd666f9d63b7c7fcdacf83fc3de516a0cd706b | |
parent | 507e754af7a33da3069110c90fb652f2b5975837 (diff) | |
download | jitsi-35ef27e5c83cd296ead9357dfd7731816a6e3610.zip jitsi-35ef27e5c83cd296ead9357dfd7731816a6e3610.tar.gz jitsi-35ef27e5c83cd296ead9357dfd7731816a6e3610.tar.bz2 |
Uses OperationSetDesktopStreaming when checking for desktop sharing, and uses OperationSetDesktopSharingServer only when checking or enable/disable remote control.
4 files changed, 14 insertions, 15 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java index 6d2c80a..4f3f34b 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java @@ -822,9 +822,9 @@ public class CallManager */ public static boolean isDesktopSharingEnabled(Call call) { - OperationSetDesktopSharingServer desktopOpSet + OperationSetDesktopStreaming desktopOpSet = call.getProtocolProvider().getOperationSet( - OperationSetDesktopSharingServer.class); + OperationSetDesktopStreaming.class); if (desktopOpSet != null && desktopOpSet.isLocalVideoAllowed(call)) @@ -844,9 +844,9 @@ public class CallManager */ public static boolean isRegionDesktopSharingEnabled(Call call) { - OperationSetDesktopSharingServer desktopOpSet + OperationSetDesktopStreaming desktopOpSet = call.getProtocolProvider().getOperationSet( - OperationSetDesktopSharingServer.class); + OperationSetDesktopStreaming.class); if (desktopOpSet != null && desktopOpSet.isPartialStreaming(call)) @@ -2776,13 +2776,13 @@ public class CallManager @Override public void run() { - OperationSetDesktopSharingServer desktopSharingOpSet + OperationSetDesktopStreaming desktopSharingOpSet = protocolProvider.getOperationSet( - OperationSetDesktopSharingServer.class); + OperationSetDesktopStreaming.class); /* * XXX If we are here and we just discover that - * OperationSetDesktopSharingServer is not supported, then we're + * OperationSetDesktopStreaming is not supported, then we're * already in trouble - we've already started a whole new thread * just to check that a reference is null. */ @@ -3676,8 +3676,7 @@ public class CallManager { createVideoCall(protocolProviderService, contact, uiContact); } - else if (opSetClass.equals( - OperationSetDesktopSharingServer.class)) + else if (opSetClass.equals(OperationSetDesktopStreaming.class)) { createDesktopSharing( protocolProviderService, contact, uiContact); @@ -3859,7 +3858,7 @@ public class CallManager /** * Obtain operation set checking the params. * @param isVideo if <tt>true</tt> use OperationSetVideoTelephony. - * @param isDesktop if <tt>true</tt> use OperationSetDesktopSharingServer. + * @param isDesktop if <tt>true</tt> use OperationSetDesktopStreaming. * @return the operation set, default is OperationSetBasicTelephony. */ private static Class<? extends OperationSet> getOperationSetForCall( @@ -3868,7 +3867,7 @@ public class CallManager if(isVideo) { if(isDesktop) - return OperationSetDesktopSharingServer.class; + return OperationSetDesktopStreaming.class; else return OperationSetVideoTelephony.class; } diff --git a/src/net/java/sip/communicator/impl/gui/main/call/DesktopSharingFrame.java b/src/net/java/sip/communicator/impl/gui/main/call/DesktopSharingFrame.java index 590e0db..3b16f56 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/DesktopSharingFrame.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/DesktopSharingFrame.java @@ -654,9 +654,9 @@ public class DesktopSharingFrame public void componentMoved(ComponentEvent e) { - OperationSetDesktopSharingServer desktopOpSet + OperationSetDesktopStreaming desktopOpSet = call.getProtocolProvider().getOperationSet( - OperationSetDesktopSharingServer.class); + OperationSetDesktopStreaming.class); if (desktopOpSet == null) return; diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java index 49c475c..59c6ca9 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java @@ -672,7 +672,7 @@ public class MainToolBar if(isVideo) { if(isDesktopSharing) - opSetClass = OperationSetDesktopSharingServer.class; + opSetClass = OperationSetDesktopStreaming.class; else opSetClass = OperationSetVideoTelephony.class; } diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java index b06095f..ccf87b2 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java @@ -1007,7 +1007,7 @@ public class ContactListTreeCellRenderer UIContactDetail desktopContact = uiContact.getDefaultContactDetail( - OperationSetDesktopSharingServer.class); + OperationSetDesktopStreaming.class); if (desktopContact != null || (contactPhoneUtil != null |