From f8de22e00b32bd0cdfd9a3782f38f88a8f5bc17c Mon Sep 17 00:00:00 2001 From: Richard Alam Date: Thu, 14 Apr 2011 11:28:56 -0400 Subject: [PATCH] - fix merge conflict with video publish --- .../videoconf/views/PublishWindow.mxml | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml index dd8b8b32dd..eefddf1e2c 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml @@ -75,10 +75,6 @@ if (isPresenter()) showResControls(true); if (Camera.names.length > 1) showVideoControls(true); if (!isPresenter() && Camera.names.length == 1) startPublishing(); -<<<<<<< HEAD - maximizeRestoreBtn.visible = false; -======= - addEventListener(MDIWindowEvent.RESIZE_END, onResizeEvent); addEventListener(MDIWindowEvent.RESIZE, onResizeEvent); addEventListener(MDIWindowEvent.MAXIMIZE, onMaximize); @@ -88,7 +84,6 @@ this.minHeight = _minHeight; maximizeRestoreBtn.visible = false; this.resizable = false; ->>>>>>> master } public function getPrefferedPosition():String{ @@ -143,27 +138,11 @@ } private function setResolution():void{ -<<<<<<< HEAD - if (cmbResolution.selectedLabel == "320x240"){ - camHeight = 240; - camWidth = 320; - } else if (cmbResolution.selectedLabel == "640x480"){ - camHeight = 480; - camWidth = 640; - } - /** - * Add timestamp to create a unique stream name. This way we can record - * stream without overwriting previously recorded streams. - */ - var curTime:Number = new Date().getTime(); - this.streamName = cmbResolution.selectedLabel.concat(this.streamName) + "-" + curTime; -======= var res:Array = cmbResolution.selectedLabel.split( "x" ); camWidth = Number(res[0]); camHeight = Number(res[1]); _nAspectRatio = (camWidth/camHeight); this.streamName = cmbResolution.selectedLabel.concat(this.streamName); ->>>>>>> master } public function set userrole(role:String):void{