From 5cd26f3ec91cee3d0c9bf41082c6d6b932407542 Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov Date: Wed, 16 Jan 2013 18:30:34 +0000 Subject: [PATCH] Restores black background in video calls (which got recently broken/removed). --- lib/installer-exclude/libjitsi.jar | Bin 1311891 -> 1312044 bytes .../gui/main/call/OneToOneCallPeerPanel.java | 21 ------- .../conference/VideoConferenceCallPanel.java | 54 ++++++------------ 3 files changed, 19 insertions(+), 56 deletions(-) diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar index ab6e360a95ae797ecb2ac7760af2cf84f5560b0e..88137aa0fafe2aa127db8393ea236ef476871910 100644 GIT binary patch delta 22075 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 diff --git a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java index b664dc5a5..cbea0b333 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java @@ -15,7 +15,6 @@ import javax.swing.text.*; import net.java.sip.communicator.impl.gui.*; -import net.java.sip.communicator.impl.gui.main.call.conference.*; import net.java.sip.communicator.impl.gui.utils.*; import net.java.sip.communicator.service.protocol.*; import net.java.sip.communicator.service.protocol.event.*; @@ -1376,26 +1375,6 @@ private void updateViewFromModelInEventDispatchThread() this.remoteVideo = remoteVideo; } } - - /* - * If video is depicted, it will usually look better when it is - * displayed on a black background. - */ - if (VideoConferenceCallPanel.VIDEO_CONTAINER_BACKGROUND != null) - { - if ((this.localVideo == null) && (this.remoteVideo == null)) - { - center.setBackground( - VideoConferenceCallPanel - .VIDEO_CONTAINER_BACKGROUND); - center.setOpaque(true); - } - else - { - center.setBackground(null); - center.setOpaque(false); - } - } } } } diff --git a/src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java index 356ab8c74..2f4c2c110 100644 --- a/src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java +++ b/src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java @@ -48,13 +48,6 @@ public class VideoConferenceCallPanel */ private static final boolean SHOW_TOOLBARS = true; - /** - * The default Color to be set as the background of - * VideoContainer. For example, video usually looks better when - * displayed on a black background. - */ - public static final Color VIDEO_CONTAINER_BACKGROUND = Color.BLACK; - /** * The facility which aids this instance with the video-related information. */ @@ -256,13 +249,6 @@ public void paintComponent(Graphics g) private VideoContainer createVideoContainer() { VideoContainer videoContainer = new VideoContainer(null, true); - - if (VIDEO_CONTAINER_BACKGROUND != null) - { - videoContainer.setBackground(VIDEO_CONTAINER_BACKGROUND); - videoContainer.setOpaque(true); - } - GridBagConstraints videoContainerGridBagConstraints = new GridBagConstraints(); @@ -616,35 +602,33 @@ protected ConferenceCallPeerRenderer updateViewFromModel( OperationSetVideoTelephony videoTelephony = aCall.getProtocolProvider().getOperationSet( OperationSetVideoTelephony.class); + boolean localVideoIsVisible + = (videoTelephony != null) + && uiVideoHandler.isLocalVideoVisible(); while (callPeerIter.hasNext()) { callPeer = callPeerIter.next(); - /* - * If there is no videoTelephony, no local video will be - * available and we will represent the local peer/user with - * the Call of the first CallPeer. - */ - if (videoTelephony == null) - break; - - try + if (localVideoIsVisible) { - video - = videoTelephony.getLocalVisualComponent(callPeer); - } - catch (OperationFailedException ofe) - { - logger.error( - "Failed to retrieve the local video" - + " for display", - ofe); + try + { + video + = videoTelephony.getLocalVisualComponent( + callPeer); + } + catch (OperationFailedException ofe) + { + logger.error( + "Failed to retrieve the local video" + + " for display", + ofe); + } + if (video != null) + break; } - if (video != null) - break; } - if (video != null) break; }