diff options
author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2013-08-12 14:52:56 +0300 |
---|---|---|
committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2013-08-12 14:52:56 +0300 |
commit | d82d7b43e50aa940125d49ff52df4c66b8374254 (patch) | |
tree | 27bfaa38ab4aa05d8eeac76f9036fec69dc67ab4 /src/net/java/sip/communicator/impl/gui/main/call/CallManager.java | |
parent | 2ccb1feffa96c65f9e386951ad123ba199fd1271 (diff) | |
download | jitsi-d82d7b43e50aa940125d49ff52df4c66b8374254.zip jitsi-d82d7b43e50aa940125d49ff52df4c66b8374254.tar.gz jitsi-d82d7b43e50aa940125d49ff52df4c66b8374254.tar.bz2 |
Fixes issues with the switching between webcam and desktop streaming/sharing in (one-to-one, Jitsi-hosted conference and conferences utilizing the Jitsi VideoBridge server-side technology) video calls.
Diffstat (limited to 'src/net/java/sip/communicator/impl/gui/main/call/CallManager.java')
-rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/call/CallManager.java | 35 |
1 files changed, 20 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 692ba3d..fe7f82c 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 @@ -2935,40 +2935,45 @@ public class CallManager @Override public void run() { - OperationSetVideoTelephony telephony - = call.getProtocolProvider() - .getOperationSet(OperationSetVideoTelephony.class); + OperationSetVideoTelephony videoTelephony + = call.getProtocolProvider().getOperationSet( + OperationSetVideoTelephony.class); boolean enableSucceeded = false; - if (telephony != null) + if (videoTelephony != null) { // First make sure the desktop sharing is disabled. if (enable && isDesktopSharingEnabled(call)) { JFrame frame = DesktopSharingFrame.getFrameForCall(call); - if(frame != null) + if (frame != null) frame.dispose(); } try { - telephony.setLocalVideoAllowed(call, enable); + videoTelephony.setLocalVideoAllowed(call, enable); enableSucceeded = true; } catch (OperationFailedException ex) { logger.error( - "Failed to toggle the streaming of local video.", - ex); - ResourceManagementService resources - = GuiActivator.getResources(); - String title = resources.getI18NString( - "service.gui.LOCAL_VIDEO_ERROR_TITLE"); - String message = resources.getI18NString( - "service.gui.LOCAL_VIDEO_ERROR_MESSAGE"); + "Failed to toggle the streaming of local video.", + ex); + + ResourceManagementService r = GuiActivator.getResources(); + String title + = r.getI18NString( + "service.gui.LOCAL_VIDEO_ERROR_TITLE"); + String message + = r.getI18NString( + "service.gui.LOCAL_VIDEO_ERROR_MESSAGE"); + GuiActivator.getAlertUIService().showAlertPopup( - title, message, ex); + title, + message, + ex); } } |