From dd8014c1223414a11660abafd663bab20bb09953 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Sun, 28 Apr 2013 20:10:22 +0000
Subject: [PATCH]  - fix problem where webcam button is not showing up when
 user is using RTMPT

---
 bigbluebutton-client/src/VideoconfModule.mxml          | 10 +++++-----
 .../modules/videoconf/events/VideoModuleStartEvent.as  |  2 ++
 .../modules/videoconf/maps/VideoEventMap.mxml          |  2 +-
 .../modules/videoconf/maps/VideoEventMapDelegate.as    |  7 +++++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bigbluebutton-client/src/VideoconfModule.mxml b/bigbluebutton-client/src/VideoconfModule.mxml
index 522a94627e0d..a54d585f2945 100755
--- a/bigbluebutton-client/src/VideoconfModule.mxml
+++ b/bigbluebutton-client/src/VideoconfModule.mxml
@@ -45,10 +45,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 		
 			public function get uri():String {
-				if (_attributes.mode == "PLAYBACK") {										
-					return _attributes.uri + "/" + _attributes.playbackRoom;
-				} 
-				
 				return _attributes.uri + "/" + _attributes.room;
 			}
 			
@@ -89,8 +85,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 			public function start(attributes:Object):void {	
         trace("Starting Video Module");
+        _attributes = attributes;
+        
         var globalDispatcher:Dispatcher = new Dispatcher();
-        globalDispatcher.dispatchEvent(new VideoModuleStartEvent(VideoModuleStartEvent.START));
+        var event:VideoModuleStartEvent = new VideoModuleStartEvent(VideoModuleStartEvent.START);
+        event.uri = uri;
+        globalDispatcher.dispatchEvent(event);
 			}
 		
 			public function stop():void {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/events/VideoModuleStartEvent.as b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/events/VideoModuleStartEvent.as
index f82f2a746cae..6f394e3c084d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/events/VideoModuleStartEvent.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/events/VideoModuleStartEvent.as
@@ -24,6 +24,8 @@ package org.bigbluebutton.modules.videoconf.events
   {
     public static const START:String = "video module start event";
     
+    public var uri:String;
+    
     public function VideoModuleStartEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false)
     {
       super(type, bubbles, cancelable);
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
index 79ea6504d87a..4fd2d36e38dc 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
@@ -43,7 +43,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	
   <EventHandlers type="{VideoModuleStartEvent.START}">
     <ObjectBuilder generator="{VideoEventMapDelegate}" cache="global" constructorArguments="{scope.dispatcher}"/>
-    <MethodInvoker generator="{VideoEventMapDelegate}" method="start"/>
+    <MethodInvoker generator="{VideoEventMapDelegate}" method="start" arguments="{event.uri}"/>
   </EventHandlers>
  
   <EventHandlers type="{VideoModuleStopEvent.STOP}">
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
index 1025f70f6d0c..8516f3e3ceeb 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
@@ -59,6 +59,8 @@ package org.bigbluebutton.modules.videoconf.maps
   public class VideoEventMapDelegate
   {
     private var options:VideoConfOptions = new VideoConfOptions();
+    private var uri:String;
+    
     private var webcamWindows:WindowManager = new WindowManager();
     
     private var button:ToolbarButton;
@@ -78,8 +80,9 @@ package org.bigbluebutton.modules.videoconf.maps
       return UsersUtil.getMyUsername();
     }
     
-    public function start():void {
+    public function start(uri:String):void {
       trace("VideoEventMapDelegate:: [" + me + "] Video Module Started.");
+      this.uri = uri;
     }
     
     public function stop():void {
@@ -258,7 +261,7 @@ package org.bigbluebutton.modules.videoconf.maps
     }
     
     public function connectToVideoApp():void {
-      proxy = new VideoProxy(options.uri + "/" + UsersUtil.getInternalMeetingID());
+      proxy = new VideoProxy(uri + "/" + UsersUtil.getInternalMeetingID());
       proxy.connect();
     }