From 74a86657775cd22694e93aa7f421adc4ed5e1de6 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Mon, 8 Nov 2010 16:42:25 -0500
Subject: [PATCH] - don't resize deskshare preview window when region is
smaller than preview window
---
.../freeswitch/conf/sip_profiles/external.xml | 6 +++++-
.../view/components/DesktopPublishWindow.mxml | 17 ++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/bbb-voice-conference/config/freeswitch/conf/sip_profiles/external.xml b/bbb-voice-conference/config/freeswitch/conf/sip_profiles/external.xml
index 8f1076364c..1629390d4a 100644
--- a/bbb-voice-conference/config/freeswitch/conf/sip_profiles/external.xml
+++ b/bbb-voice-conference/config/freeswitch/conf/sip_profiles/external.xml
@@ -59,7 +59,11 @@
<param name="sip-ip" value="$${local_ip_v4}"/>
<param name="ext-rtp-ip" value="auto-nat"/>
<param name="ext-sip-ip" value="auto-nat"/>
- <param name="rtp-timeout-sec" value="300"/>
+ <!--
+ Set the RTP timeout for 3 hours to prevent FS from hanging up bbb clients
+ who are muted and not sending any audio.
+ -->
+ <param name="rtp-timeout-sec" value="10800"/>
<param name="rtp-hold-timeout-sec" value="1800"/>
<!--<param name="enable-3pcc" value="true"/>-->
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
index f5bee1a45c..70dc58f080 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
@@ -26,7 +26,7 @@
xmlns:mate="http://mate.asfusion.com/"
xmlns:dspub="flexlib.mdi.containers.*"
creationComplete="onCreationComplete()"
- backgroundImage="{bbbLogo}"
+ verticalScrollPolicy="off" horizontalScrollPolicy="off"
width="320" height="240"
title="{ResourceUtil.getInstance().getString('bbb.desktopPublish.title')}"
resizable="false">
@@ -39,6 +39,7 @@
<mx:Script>
<![CDATA[
+ import flexlib.scheduling.scheduleClasses.BackgroundItem;
import com.asfusion.mate.events.Dispatcher;
import flexlib.mdi.events.MDIWindowEvent;
@@ -193,12 +194,12 @@
var vidW:Number = captureWidth;
var vidH:Number = captureHeight;
- // Don't scale is capture dimension is smaller than window.
+ // Don't scale if capture dimension is smaller than window.
if ((captureWidth > this.width - VID_WIDTH_PAD) && (captureHeight > this.height - VID_HEIGHT_PAD)) {
- vidW = this.width - VID_WIDTH_PAD;
- vidH = this.height - VID_HEIGHT_PAD;
- }
-
+ vidW = this.width - VID_WIDTH_PAD;
+ vidH = this.height - VID_HEIGHT_PAD;
+ }
+
LogUtil.debug("deskshare preview[" + captureWidth + "," + captureHeight + "][" + vidW + "," + vidH + "]");
video = new Video(vidW, vidH);
video.width = vidW;
@@ -210,9 +211,7 @@
videoHolder.addChild(cursorImg);
cursor.visible = false;
this.addChild(videoHolder);
- this.width = video.width + VID_WIDTH_PAD;
- this.height = video.height + VID_HEIGHT_PAD;
-
+
ns = new NetStream(nc);
ns.addEventListener(AsyncErrorEvent.ASYNC_ERROR, onAsyncError);
ns.addEventListener( NetStatusEvent.NET_STATUS, onNetStatus );
--
GitLab