Merge remote branch 'upstream/master' into access-hotfix

Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/LineButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/PanZoomButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/RectangleButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ScribbleButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TextButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/UndoButton.mxml

bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonService.java

@@ -0,0 +1,33 @@
+package org.bigbluebutton.conference;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.red5.server.api.Red5;
+
+public class BigBlueButtonService {
+	private ConnectionInvokerService connInvokerService;
+	
+	public void sendMessage(HashMap<String, Object> params) {
+		
+		Map<String, Object> messageToSend = new HashMap<String, Object>();
+		
+	    for (Iterator<String> it = params.keySet().iterator(); it.hasNext();) {
+	        String key = it.next();
+	        messageToSend.put(key, params.get(key));
+	    }
+	    		
+		ClientMessage m = new ClientMessage(ClientMessage.BROADCAST, getMeetingId(), (String) params.get("messageID"), messageToSend);
+		connInvokerService.sendMessage(m);
+	}
+	
+	private String getMeetingId(){
+		return Red5.getConnectionLocal().getScope().getName();
+	}
+	
+	public void setConnInvokerService(ConnectionInvokerService connInvokerService) {
+		this.connInvokerService = connInvokerService;
+	}
+	
+}

bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml

@@ -12,7 +12,11 @@
 		<property name="messagingService" ref="messagingService"></property>
 		<property name="conversionUpdatesMessageListener" ref="conversionUpdatesMessageListener"></property>
 	</bean>
-			
+	
+	<bean id="bigbluebutton.service" class="org.bigbluebutton.conference.BigBlueButtonService">
+      <property name="connInvokerService"> <ref bean="connInvokerService"/></property>
+    </bean>
+  		
 	<bean id="participantsHandler" class="org.bigbluebutton.conference.service.participants.ParticipantsHandler">
 		<property name="participantsApplication"> <ref local="participantsApplication"/></property>
 		<property name="recorderApplication"> <ref local="recorderApplication"/></property>

bigbluebutton-client/branding/README

@@ -0,0 +1,3 @@
+This is the directory where you should put your custom skinning/styling.
+
+

bigbluebutton-client/branding/default/README

@@ -0,0 +1 @@
+ This is the default BigBlueButton style.

bigbluebutton-client/branding/default/build.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- BigBlueButton Branding build.xml for use by Hudson builds.   -->
+<project name="BigBlueButton Branding" basedir="../.." default="branding" >
+	<property environment="env" />
+	<property name="DEBUG" value="true" />
+	<property name="BUILD_ENV" value="DEV" />
+	<property name="FLEX_HOME" value="${env.FLEX_HOME}" />
+	<property name="themeFile" value="BBBDefault.css" />
+	<property name="BASE_DIR" value="${basedir}" />
+	<property name="SRC_DIR" value="${BASE_DIR}/src" />
+		
+	<property name="OUTPUT_DIR" value="${BASE_DIR}/bin" />
+	<taskdef resource="flexTasks.tasks" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
+	
+	<target name="init-ant-contrib">
+		<property name="ant-contrib.jar" location="${BASE_DIR}/build/lib/ant-contrib-0.6.jar"/>
+		<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="${ant-contrib.jar}"/>
+	</target>
+	  	
+	<target name="branding" depends="init-ant-contrib">
+		<sequential>
+			<mxmlc file="${BASE_DIR}/branding/default/style/css/${themeFile}" 
+				output="${OUTPUT_DIR}/branding/css/${themeFile}.swf" 
+				debug="${DEBUG}" 
+				mxml.compatibility-version="3.0.0" 
+				swf-version="13" 
+				optimize="true">
+			</mxmlc>
+		</sequential>
+	</target>
+</project>

bigbluebutton-client/branding/default/style/css/BBBDefault.css

@@ -0,0 +1,393 @@
+Application {
+  backgroundColor: #ffffff;
+}
+
+ApplicationControlBar {
+  highlightAlphas: 0.1, 0;
+  fillAlphas: 0, 0;
+  fillColors: #32343b, #32343b;
+  backgroundColor: #42444c;
+  backgroundAlpha: 1;
+  cornerRadius: 0;
+  dropShadowEnabled: true;
+  shadowDistance: 1;
+  shadowDirection: center;
+  dropShadowColor: #000000;
+}
+
+Panel {
+  borderColor: #dfdfdf;
+  borderAlpha: 1;
+  shadowDistance: 1;
+  dropShadowColor: #666666;
+  titleStyleName: "mypanelTitle";
+}
+
+.mypanelTitle {
+  color: #444444;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+.whiteboardToolbarStyle {
+  backgroundColor: #CCCCCC;
+  cornerRadius: 5;
+  borderStyle: solid;
+  borderThickness: 1;
+  paddingBottom: 3;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+}
+
+Button {
+  textIndent: 0;
+  paddingLeft: 5;
+  paddingRight: 5;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+DataGrid {
+  backgroundColor: #e1e2e5;
+  rollOverColor: #f3f3f3;
+  textRollOverColor: #5e5f63;
+  selectionColor: #e1e2e5;
+  color: #5e5f63;
+  textSelectedColor: #5e5f63;
+  dropShadowEnabled: false;
+  fontFamily: arial;
+  fontSize: 11;
+  headerStyleName: "mydataGridHeaderStyle";
+}
+
+.mydataGridHeaderStyle {
+  color: #5e5f63;
+  fontFamily: arial;
+  fontSize: 12;
+}
+
+
+.whiteboardUndoButtonStyle, .whiteboardCircleButtonStyle, .whiteboardClearButtonStyle,
+.whiteboardTriangleButtonStyle, .whiteboardTextButtonStyle, .whiteboardRectangleButtonStyle,
+.whiteboardPanZoomButtonStyle, .whiteboardLineButtonStyle, .whiteboardScribbleButtonStyle
+{
+  textIndent: 0;
+  paddingLeft: 0;
+  paddingRight: 0;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+.whiteboardUndoButtonStyle 
+{
+  icon: Embed('assets/images/undo.png');
+}
+
+.whiteboardCircleButtonStyle {
+  icon: Embed('assets/images/ellipse.png');  
+}
+
+.whiteboardClearButtonStyle {
+  icon: Embed('assets/images/delete.png');    
+}
+
+.whiteboardScribbleButtonStyle{
+  icon: Embed('assets/images/pencil.png');  
+}
+
+.whiteboardLineButtonStyle {
+  icon: Embed('assets/images/line.png');    
+}
+
+.whiteboardPanZoomButtonStyle {
+  icon: Embed('assets/images/hand.png');   
+}
+
+.whiteboardRectangleButtonStyle {
+  icon: Embed('assets/images/square.png');   
+}
+
+.whiteboardTextButtonStyle {
+  icon: Embed('assets/images/text.png');   
+}
+
+.whiteboardTriangleButtonStyle {
+  icon: Embed('assets/images/triangle.png');    
+}
+
+.presentationUploadButtonStyle, .presentationBackButtonStyle, .presentationForwardButtonStyle,
+.presentationFitToWidthButtonStyle, .presentationFitToPageButtonStyle 
+{
+  textIndent: 0;
+  paddingLeft: 10;
+  paddingRight: 10;
+  paddingTop: 5;
+  paddingBottom: 5;
+  highlightAlphas: 0.4, 0;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  color: #5e5f63;
+  textRollOverColor: #5e5f63;
+  textSelectedColor: #5e5f63;
+  borderColor: #b9babc;
+  themeColor: #aaaaaa;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+.presentationUploadButtonStyle {
+  icon:   Embed('assets/images/upload.png');   
+}
+
+.presentationBackButtonStyle {
+  icon:   Embed('assets/images/left-arrow.png'); 
+}
+
+.presentationForwardButtonStyle {
+  icon:   Embed('assets/images/right-arrow.png'); 
+}
+
+.presentationFitToWidthButtonStyle {
+  icon:   Embed('assets/images/fit-to-width.png'); 
+}
+
+.presentationFitToPageButtonStyle {
+  icon:   Embed('assets/images/fit-to-screen.png'); 
+}
+
+.presentationZoomSliderStyle{
+  labelOffset: 0;
+  thumbOffset: 3;
+  dataTipOffset: -1;
+  tickOffset: 2;
+  tickLength: 5;
+  tickThickness: 2;
+  tickColor: #6cccff;
+  showTrackHighlight: true;
+  invertThumbDirection: false;
+  borderColor: #b9babc;
+  trackColors: #aaaaaa, #aaaaaa;
+  themeColor: #aaaaaa;
+  fillAlphas: 1, 1, 1, 1;
+  fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
+  labelStyleName: "presentationZoomSliderLabelStyle";
+}
+
+.presentationZoomSliderLabelStyle {
+  color: #5e5f63;
+  fontFamily: Arial;
+}
+
+MDIWindow {
+  resizeCursorHorizontalXOffset: 2;	
+}
+
+.mdiWindowFocus, .mdiWindowNoFocus, .presentationWindowStyleNoFocus, .presentationWindowStyleFocus, .videoDockStyleNoFocus, .videoDockStyleFocus
+{
+  headerHeight: 26;
+  roundedBottomCorners: false;
+  backgroundAlpha: 1;
+  backgroundColor: #b9babc;
+  backgroundSize: '100%';
+  
+  borderStyle: solid;
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThickness: 1;
+  borderThicknessLeft: 1;
+  borderThicknessTop: 1;
+  borderThicknessBottom: 1;
+  borderThicknessRight: 1;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+  
+  cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
+  cornerResizeWidth: 2;
+  cornerResizeHeight: 2;
+  cornerResizePaddingRight: 2;
+  cornerResizePaddingBottom: 2;
+  
+  controlButtonWidth: 10;
+  controlButtonHeight: 10;
+  controlButtonGap: 4;
+}
+
+.presentationSlideViewStyle {
+  backgroundColor: #b9babc;
+}
+
+.presentationWindowControlsStyle {
+  paddingBottom: 5;
+  paddingTop: 3;
+  paddingLeft: 3;
+  paddingRight: 3;
+  bottom: 5;
+  cornerRadius: 0;
+  dropShadowEnabled: false;
+}
+
+.videoViewStyleNoFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoViewStyleFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoPublishStyleNoFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoPublishStyleFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoAvatarStyleNoFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.videoAvatarStyleFocus 
+{
+  borderColor: #b9babc;
+  borderAlpha: 1;
+  borderThicknessLeft: 5;
+  borderThicknessTop: 5;
+  borderThicknessBottom: 5;
+  borderThicknessRight: 5;
+  roundedBottomCorners: true;
+  cornerRadius: 5;
+  headerHeight: 20;
+  backgroundColor: #b9babc;
+  dropShadowEnabled: false;
+  titleStyleName: "mypanelTitle";
+}
+
+.mypanelTitle {
+  color: #5e5f63;
+  fontFamily: Arial;
+  fontSize: 12;
+}
+
+.closeBtnFocus, .closeBtnNoFocus
+{
+  upSkin:        Embed('assets/images/3_closeButton.png');
+  overSkin:      Embed('assets/images/3_closeButton.png');
+  downSkin:      Embed('assets/images/3_closeButton.png');
+  disabledSkin:  Embed('assets/images/3_closeButton.png');
+}
+
+
+.increaseBtnFocus, .increaseBtnNoFocus
+{
+  upSkin:        Embed('assets/images/3_increaseButton.png');
+  overSkin:      Embed('assets/images/3_increaseButton.png');
+  downSkin:      Embed('assets/images/3_increaseButton.png');
+  disabledSkin:  Embed('assets/images/3_increaseButton.png');
+}
+
+.decreaseBtnFocus, .decreaseBtnNoFocus  
+{
+  upSkin:        Embed('assets/images/3_decreaseButton.png');
+  overSkin:      Embed('assets/images/3_decreaseButton.png');
+  downSkin:      Embed('assets/images/3_decreaseButton.png');
+  disabledSkin:  Embed('assets/images/3_decreaseButton.png');
+}
+
+.minimizeBtnFocus 
+{
+  upSkin:        Embed('assets/images/3_minimizeButton.png');
+  overSkin:      Embed('assets/images/3_minimizeButton.png');
+  downSkin:      Embed('assets/images/3_minimizeButton.png');
+  disabledSkin:  Embed('assets/images/3_minimizeButton.png');
+}
+
+
+.resizeHndlr 
+{
+  upSkin:        Embed('assets/images/resizeHandler.png');
+  overSkin:      Embed('assets/images/resizeHandler.png');
+  downSkin:      Embed('assets/images/resizeHandler.png');
+  disabledSkin:  Embed('assets/images/resizeHandler.png');
+}

bigbluebutton-client/branding/default/style/css/assets/images/icons-license.txt

@@ -0,0 +1,38 @@
+Silk icon set 1.3
+
+_________________________________________
+Mark James
+http://www.famfamfam.com/lab/icons/silk/
+_________________________________________
+
+This work is licensed under a
+Creative Commons Attribution 2.5 License.
+[ http://creativecommons.org/licenses/by/2.5/ ]
+
+This means you may use it for any purpose,
+and make any changes you like.
+All I ask is that you include a link back
+to this page in your credits.
+
+Are you using this icon set? Send me an email
+(including a link or picture if available) to
+mjames@gmail.com
+
+Any other questions about this icon set please
+contact mjames@gmail.com
+
+==================================================
+Diagona Icons
+
+Copyright (C) 2007 Yusuke Kamiyamane. All rights reserved.
+The icons are licensed under a Creative Commons Attribution
+3.0 license. <http://creativecommons.org/licenses/by/3.0/>
+
+If you can't or don't want to provide a link back, please
+purchase a royalty-free license.
+<http://p.yusukekamiyamane.com/>
+
+I'm unavailable for custom icon design work. But your
+suggestions are always welcome!
+<mailto:p@yusukekamiyamane.com>
+====================

bigbluebutton-client/build.xml

@@ -8,6 +8,8 @@
     	<property name="FLEX_HOME" value="${env.FLEX_HOME}" />
     	<property name="LOCALE_DIR" value="${FLEX_HOME}/frameworks/locale"/>
     	<property name="BASE_DIR" value="${basedir}" />
+      <property name="themeFile" value="BBBDefault.css"/>
+	
 	     <property name="RESOURCES_DIR" value="${BASE_DIR}/resources" />	
 	<property name="PROD_RESOURCES_DIR" value="${RESOURCES_DIR}/prod" />	
 	<property name="SRC_DIR" value="${BASE_DIR}/src" />
@@ -17,6 +19,7 @@
 
 	<!-- Declare module names here -->
 	<property name="BBB_MAIN" value="BigBlueButton" />
+	<property name="BROADCAST" value="BroadcastModule" />
 	<property name="CHAT" value="ChatModule" />
 	<property name="VIEWERS" value="ViewersModule" />
 	<property name="LISTENERS" value="ListenersModule" />
@@ -67,7 +70,7 @@
 		
 	<target name="branding" depends="init-ant-contrib">
 		<sequential>
-			<mxmlc file="${SRC_DIR}/branding/css/${themeFile}" 
+			<mxmlc file="${BASE_DIR}/branding/default/style/css/${themeFile}" 
 				output="${OUTPUT_DIR}/branding/css/${themeFile}.swf" 
 				debug="${DEBUG}" 
 				mxml.compatibility-version="3.0.0" 
@@ -160,7 +163,11 @@
 			<fileset dir="${BASE_DIR}/src/org/bigbluebutton/common/assets/images/" />
 		</copy>		
 	</target>
-	
+
+  <target name="build-broadcast" description="Compile Broadcast Module" >
+    <build-module src="${SRC_DIR}" target="${BROADCAST}" />
+  </target>
+  	
 	<target name="build-chat" description="Compile Chat Module">
 		<build-module src="${SRC_DIR}" target="${CHAT}" />
 	</target>
@@ -230,7 +237,7 @@
 	
 	<!-- just a grouping of modules to compile -->
 	<target name="build-main-chat-viewers-listeners-present" 
-			depends="build-bbb-main, build-chat, build-viewers, build-listeners, build-present, build-layout"
+			depends="build-bbb-main, build-chat, build-viewers, build-listeners, build-present, build-layout, build-broadcast"
 			description="Compile main, chat, viewers, listeners, present modules">
 	</target>
 	
@@ -452,7 +459,7 @@
 	                                        build-webcam-preview-standalone, build-webcam-view-standalone, compile-bbb" 
 			description="Build BBB client skipping compiling of locales"/>	
 	<target name="clean-build-all" depends="clean, init-ant-contrib, generate-html-wrapper, compile-deskshare-standalone, 
-	                                         build-webcam-preview-standalone, build-webcam-view-standalone, compile-bbb" 
+	                                         build-webcam-preview-standalone, build-webcam-view-standalone, compile-bbb, branding" 
 			description="Build BBB client including locales"/>
 	<target name="modules" depends="init-ant-contrib, generate-html-wrapper, compile-deskshare-standalone, 
 	                                         build-webcam-preview-standalone, build-webcam-view-standalone, compile-bbb"

bigbluebutton-client/resources/config.xml.template

@@ -6,7 +6,7 @@
     <porttest host="HOST" application="video" timeout="10000"/>    
     <application uri="rtmp://HOST/bigbluebutton" host="http://HOST/bigbluebutton/api/enter" />
     <language userSelectionEnabled="true" />
-    <skinning enabled="false" url="branding/css/theme.css.swf" />
+    <skinning enabled="true" url="http://192.168.153.128/client/branding/css/BBBDefault.css.swf" />
     <layout showLogButton="false" showVideoLayout="false" showResetLayout="true" defaultLayout="Default"
             showToolbar="true" showFooter="true" showHelpButton="true" showLogoutWindow="true"/>
             
@@ -101,6 +101,7 @@
 			uri="rtmp://HOST/bigbluebutton" 
 			dependsOn="VideoconfModule, ViewersModule"
 			autoDock="true"
+			showControls="true"
 			maximizeWindow="false"
 			position="bottom-right"
 			width="172"
@@ -115,6 +116,7 @@
 			layoutConfig="http://HOST/client/conf/layout.xml"
 			enableEdit="true"
 		/>
+<<<<<<< HEAD
 
 		<!-- new module in development: 
 		<module name="DynamicInfoModule" url="http://HOST/client/DynamicInfoModule.swf?v=4105" 
@@ -134,5 +136,18 @@
 			dependsOn="ViewersModule"
 		/>-->
 		
+=======
+<!--
+    <module name="BroadcastModule" url="http://HOST/client/BroadcastModule.swf?v=VERSION"
+      uri="rtmp://HOST/bigbluebutton"
+      streamsUri="http://HOST/streams.xml"
+      position="top-left"
+      showStreams="true"
+      autoPlay="false"
+      dependsOn="ViewersModule"
+    />
+-->
+    		
+>>>>>>> upstream/master
 	</modules>
 </config>

bigbluebutton-client/resources/prod/layout.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <layouts>
   <layout name="Video Chat">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
     <window name="ViewersWindow" minimized="true" order="3" hidden="true" />
     <window name="VideoDock" width="1" height="1" x="0" y="0" order="0"/>
     <window name="ChatWindow" width="0.303125" height="0.9955703211517165" x="0.3229166666666667" y="0.9656699889258029" order="4" hidden="true" />
@@ -8,6 +9,7 @@
     <window name="ListenersWindow" minimized="true" hidden="true" order="2"/>
   </layout>
   <layout name="Default"  default="true">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
     <window name="ViewersWindow" width="0.1772793053545586" height="0.33643617021276595" x="0" y="0" />
     <window name="ListenersWindow" width="0.1772793053545586" height="0.33643617021276595" x="0" y="0.34308510638297873" />
     <window name="PresentationWindow" width="0.5137481910274964" height="0.9946808510638298" x="0.18017366136034732" y="0" />
@@ -15,6 +17,7 @@
     <window name="ChatWindow" width="0.3031837916063676" height="0.9960106382978723" x="0.6968162083936325" y="0" />
   </layout>
   <layout name="Meeting">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
     <window name="VideoDock" width="0.6570188133140377" height="0.9960106382978723" x="0" y="0" />
     <window name="ChatWindow" width="0.3393632416787265" height="0.5305851063829787" x="0.658465991316932" y="0" />
     <window name="ListenersWindow" hidden="true" />
@@ -22,6 +25,7 @@
     <window name="PresentationWindow" width="0.34008683068017365" height="0.4601063829787234" x="0.658465991316932" y="0.535904255319149" />
   </layout>
   <layout name="Webinar">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
     <window name="ViewersWindow" minimized="true" />
     <window name="VideoDock" width="0.2923611111111111" height="0.4640957446808511" x="0.7048611111111112" y="0.535904255319149" />
     <window name="ListenersWindow" minimized="true" />
@@ -29,6 +33,7 @@
     <window name="ChatWindow" width="0.2923611111111111" height="0.5305851063829787" x="0.7048611111111112" y="0" />
   </layout>
   <layout name="Lecture assistant">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
     <window name="ChatWindow" width="0.4597222222222222" height="0.9958677685950413" x="0.2263888888888889" y="0" />
     <window name="ListenersWindow" width="0.2222222222222222" height="0.4765840220385675" x="0" y="0.5179063360881543" />
     <window name="ViewersWindow" width="0.22152777777777777" height="0.5055096418732782" x="0" y="0" />
@@ -36,6 +41,7 @@
     <window name="VideoDock" width="0.30972222222222223" height="0.4256198347107438" x="0.6902777777777778" y="0.568870523415978" />
   </layout>	
   <layout name="Lecture">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
     <window name="ViewersWindow" hidden="true" />
     <window name="VideoDock" width="0.2923611111111111" height="0.4640957446808511" x="0.7048611111111112" y="0.535904255319149" />
     <window name="ListenersWindow" hidden="true" />
@@ -43,6 +49,7 @@
     <window name="ChatWindow" width="0.2923611111111111" height="0.5305851063829787" x="0.7048611111111112" y="0" />
   </layout>	
   <layout name="Lecture" role="presenter">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
     <window name="ChatWindow" hidden="true" />
     <window name="ListenersWindow" hidden="true" />
     <window name="ViewersWindow" hidden="true" />
@@ -50,24 +57,35 @@
     <window name="VideoDock" hidden="true" />
   </layout>	
   <layout name="Lecture" role="moderator">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
     <window name="ChatWindow" width="0.4597222222222222" height="0.9958677685950413" x="0.2263888888888889" y="0" />
     <window name="ListenersWindow" width="0.2222222222222222" height="0.4765840220385675" x="0" y="0.5179063360881543" />
     <window name="ViewersWindow" width="0.22152777777777777" height="0.5055096418732782" x="0" y="0" />
     <window name="PresentationWindow" width="0.3104166666666667" height="0.5537190082644629" x="0.6895833333333333" y="0" />
     <window name="VideoDock" width="0.30972222222222223" height="0.4256198347107438" x="0.6902777777777778" y="0.568870523415978" />
   </layout>	
-    <layout name="S2SPresentation">
-    <window name="ChatWindow" hidden="true"/>
-    <window name="ListenersWindow" hidden="true" />
-    <window name="ViewersWindow" hidden="true"/>
-    <window name="PresentationWindow" width="1" height="1" x="0" y="0" />
-    <window name="VideoDock" hidden="true"/>
+  <layout name="S2SPresentation">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="ChatWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="ListenersWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="ViewersWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="PresentationWindow" width="1" height="1" x="0" y="0" draggable="false" resizable="false"/>
+    <window name="VideoDock" hidden="true" draggable="false" resizable="false"/>
   </layout>
-    <layout name="S2SVideoChat">
-    <window name="ViewersWindow" hidden="true" />
-    <window name="VideoDock" width="1" height="1" x="0" y="0"/>
-    <window name="ChatWindow" hidden="true" />
-    <window name="PresentationWindow" hidden="true" />
-    <window name="ListenersWindow" hidden="true"/>
+  <layout name="S2SVideoChat">
+    <window name="BroadcastWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="ViewersWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="VideoDock" width="1" height="1" x="0" y="0" draggable="false" resizable="false"/>
+    <window name="ChatWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="PresentationWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="ListenersWindow" hidden="true" draggable="false" resizable="false"/>
+  </layout>
+  <layout name="Broadcast">
+    <window name="BroadcastWindow" hidden="false" width="0.7" height="0.9" x="0" y="0" draggable="false" resizable="false"/>
+    <window name="ViewersWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="VideoDock" hidden="true" draggable="false" resizable="false"/>
+    <window name="ChatWindow" width="0.3" height="1" x="0.7" y="0" draggable="false" resizable="false"/>
+    <window name="PresentationWindow" hidden="true" draggable="false" resizable="false"/>
+    <window name="ListenersWindow" hidden="true" draggable="false" resizable="false"/>
   </layout>
 </layouts>

bigbluebutton-client/resources/streams.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" ?>
+<streams>
+    <stream url="rtmp://192.168.153.128/oflaDemo" id="hobbit_vp6" name="The Hobbit"/>
+    <stream url="rtmp://192.168.153.128/oflaDemo" id="startrekintodarkness_vp6" name="Star Trek"/>
+</streams>

bigbluebutton-client/src/BigBlueButton.mxml

@@ -25,12 +25,11 @@
   xmlns:apimap="org.bigbluebutton.main.api.maps.*"
   xmlns:coreMap="org.bigbluebutton.core.controllers.maps.*"
   xmlns:mate="http://mate.asfusion.com/"
-  xmlns:m="library://melomel/2010"
   pageTitle="BigBlueButton" 
   layout="absolute" preinitialize="init()"
   preloader="org.bigbluebutton.main.model.BigBlueButtonPreloader"
   applicationComplete="hotkeyCapture()">
-  
+ 
   <mx:Script>
     <![CDATA[
       import com.asfusion.mate.events.Dispatcher;    
@@ -134,12 +133,12 @@
 		keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.logout') as String)] = ShortcutEvent.LOGOUT;
 		keyCombos[modifier+(ResourceUtil.getInstance().getString('bbb.shortcutkey.raiseHand') as String)] = ShortcutEvent.RAISE_HAND;
 	}
-
-    private function hotkeyCapture():void{
-      LogUtil.debug("Entering hotkeyCapture");
+	
+    public function hotkeyCapture():void{
+      trace("Entering hotkeyCapture");
       stage.addEventListener(KeyboardEvent.KEY_DOWN, handleKeyDown);
       ResourceUtil.getInstance().addEventListener(Event.CHANGE, localeChanged); // Listen for locale changing
-      LogUtil.debug("Leaving hotkeyCapture");
+      trace("Leaving hotkeyCapture");
     }
 
 	// Handle general-access hotkeys, regardless of what window the user is focused in
@@ -149,12 +148,9 @@
 	  
 	  var keyPress:String = (e.ctrlKey  ? "control+" : "") + (e.shiftKey ? "shift+"   : "") +
                             (e.altKey   ? "alt+"     : "") + e.keyCode;
-      
-      //LogUtil.debug("WATERFALL: keyPress is " + keyPress);
-	  //LogUtil.debug("WATERFALL: Your modifier + non-mod keys is " + modifier + e.keyCode);
-                              
+	
       if (keyCombos[keyPress]) {
-		LogUtil.debug("WATERFALL: keyCombo is " + keyCombos[keyPress]);
+        trace("Chad keypress " + keyPress);
         globalDispatcher.dispatchEvent(new ShortcutEvent(keyCombos[keyPress]));
       }
     }

bigbluebutton-client/src/BroadcastModule.mxml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  BigBlueButton open source conferencing system - http://www.bigbluebutton.org
+  
+  Copyright (c) 2010 BigBlueButton Inc. and by respective authors (see below).
+  
+  BigBlueButton is free software; you can redistribute it and/or modify it under the 
+  terms of the GNU Lesser General Public License as published by the Free Software 
+  Foundation; either version 2.1 of the License, or (at your option) any later 
+  version. 
+  
+  BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY 
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+  PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+  
+  You should have received a copy of the GNU Lesser General Public License along 
+  with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
+ 
+  $Id: $
+-->
+
+<mx:Module xmlns:mx="http://www.adobe.com/2006/mxml" 
+ 	xmlns:maps="org.bigbluebutton.modules.broadcast.maps.*"
+	xmlns:mate="http://mate.asfusion.com/"
+	implements="org.bigbluebutton.common.IBigBlueButtonModule"
+	creationComplete="onCreationComplete()">
+	
+	<maps:BroadcastEventMap id="broadcastEventMap" />
+	
+	<mx:Script>
+		<![CDATA[
+			import com.asfusion.mate.events.Dispatcher;			
+			import org.bigbluebutton.common.LogUtil;
+
+			private var _moduleName:String = "Broadcast Module";			
+			private var _attributes:Object;
+			private var dispatcher:Dispatcher = new Dispatcher();
+			
+			private function onCreationComplete():void {
+				LogUtil.debug("BrodcastModule Initialized");			
+			}
+			
+			public function get moduleName():String {
+				return _moduleName;
+			}
+
+			public function start(attributes:Object):void {	
+				LogUtil.debug("***Starting BroadcastModule");
+				dispatcher.dispatchEvent(new Event("BroadcastModuleStartEvent"));	
+			}
+		
+			public function stop():void {
+				LogUtil.debug("Stop Broadcast Module");
+				
+			}
+
+		]]>
+	</mx:Script>
+</mx:Module>

bigbluebutton-client/src/branding/css/Blue.css

@@ -1,173 +0,0 @@
-Application 
-{  
-   backgroundColors: #000000,#3f3f3f;
-   backgroundImage: Embed(source="assets/img/bk3.jpg");
-   backgroundSize: "100%";
-   backgroundGradientColors: #B4BFCF, #78829C;
-   themeColor: #0094C7;
-   backgroundGradientAlphas: 0.62, 0.26;
-}
-
-
-MDICanvas 
-{
-	backgroundColor: #0094C7;
-	backgroundAlpha: 0;
-}
-
-
-Button 
-{
-   highlightAlphas: 1, 0.33;
-   fillAlphas: 1, 0.16, 0.18, 1;
-   fillColors: #5f89b9, #697182, #ffffff, #eeeeee;
-}
-
-
-.mdiWindowFocus 
-{
-	headerHeight: 26;
-	roundedBottomCorners: true;
-	backgroundAlpha: 1;
-	backgroundColor: #FFFFFF;
-	backgroundImage: Embed(source="assets/swf/Blue.swf", symbol="Window_Background");
-	backgroundSize: '100%';
-	
-	borderStyle: solid;
-	borderColor: #ffffff;
-	borderAlpha: 1;
-	borderThickness: 2;
-	borderThicknessLeft: 0;
-	borderThicknessTop: 0;
-	borderThicknessBottom: 0;
-	borderThicknessRight: 0;
-	cornerRadius: 4;
-	dropShadowEnabled: false;
-	titleStyleName: "mypanelTitle";
-	
-	cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
-	cornerResizeWidth: 15;
-	cornerResizeHeight: 15;
-	cornerResizePaddingRight: 2;
-	cornerResizePaddingBottom: 2;
-	
-	controlButtonWidth: 10;
-	controlButtonHeight: 10;
-	controlButtonGap: 4;
-}
-
-.mdiWindowNoFocus 
-{
-	headerHeight: 26;
-	roundedBottomCorners: true;
-	backgroundAlpha: 0.5;
-	backgroundImage: Embed(source="assets/swf/Blue.swf", symbol="Window_Background");
-	backgroundSize: '100%';
-	
-	borderStyle: solid;
-	borderColor: #ffffff;
-	borderAlpha: 1;
-	borderThickness: 2;
-	borderThicknessLeft: 0;
-	borderThicknessTop: 0;
-	borderThicknessBottom: 0;
-	borderThicknessRight: 0;
-	cornerRadius: 4;
-	dropShadowEnabled: false;
-	titleStyleName: "mypanelTitle";
-	
-	cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
-	cornerResizeWidth: 15;
-	cornerResizeHeight: 15;
-	cornerResizePaddingRight: 2;
-	cornerResizePaddingBottom: 2;
-	
-	controlButtonWidth: 10;
-	controlButtonHeight: 10;
-	controlButtonGap: 4;
-}
-
-.mypanelTitle 
-{
-	fontFamily: Arial;
-	fontSize: 12;
-	fontWeight: bold;
-	color: #ffffff;
-}
-
-
-.closeBtnFocus
-{
-	upSkin:        Embed('assets/img/3_closeButton.png');
-	overSkin:      Embed('assets/img/3_closeButton.png');
-	downSkin:      Embed('assets/img/3_closeButton.png');
-	disabledSkin:  Embed('assets/img/3_closeButton.png');
-}
-
-.closeBtnNoFocus
-{
-	upSkin:        Embed('assets/img/3_closeButton.png');
-	overSkin:      Embed('assets/img/3_closeButton.png');
-	downSkin:      Embed('assets/img/3_closeButton.png');
-	disabledSkin:  Embed('assets/img/3_closeButton.png');
-}
-
-
-.increaseBtnFocus
-{
-	upSkin:        Embed('assets/img/3_increaseButton.png');
-	overSkin:      Embed('assets/img/3_increaseButton.png');
-	downSkin:      Embed('assets/img/3_increaseButton.png');
-	disabledSkin:  Embed('assets/img/3_increaseButton.png');
-}
-
-.increaseBtnNoFocus
-{
-	upSkin:        Embed('assets/img/3_increaseButton.png');
-	overSkin:      Embed('assets/img/3_increaseButton.png');
-	downSkin:      Embed('assets/img/3_increaseButton.png');
-	disabledSkin:  Embed('assets/img/3_increaseButton.png');
-}
-
-
-.decreaseBtnFocus 
-{
-	upSkin:        Embed('assets/img/3_decreaseButton.png');
-	overSkin:      Embed('assets/img/3_decreaseButton.png');
-	downSkin:      Embed('assets/img/3_decreaseButton.png');
-	disabledSkin:  Embed('assets/img/3_decreaseButton.png');
-}
-
-.decreaseBtnNoFocus 
-{
-	upSkin:        Embed('assets/img/3_decreaseButton.png');
-	overSkin:      Embed('assets/img/3_decreaseButton.png');
-	downSkin:      Embed('assets/img/3_decreaseButton.png');
-	disabledSkin:  Embed('assets/img/3_decreaseButton.png');
-}
-
-
-.minimizeBtnFocus 
-{
-	upSkin:        Embed('assets/img/3_minimizeButton.png');
-	overSkin:      Embed('assets/img/3_minimizeButton.png');
-	downSkin:      Embed('assets/img/3_minimizeButton.png');
-	disabledSkin:  Embed('assets/img/3_minimizeButton.png');
-}
-
-.minimizeBtnNoFocus 
-{
-	upSkin:        Embed('assets/img/3_minimizeButton.png');
-	overSkin:      Embed('assets/img/3_minimizeButton.png');
-	downSkin:      Embed('assets/img/3_minimizeButton.png');
-	disabledSkin:  Embed('assets/img/3_minimizeButton.png');
-}
-
-
-.resizeHndlr 
-{
-	upSkin:        Embed('assets/img/resizeHandler.png');
-	overSkin:      Embed('assets/img/resizeHandler.png');
-	downSkin:      Embed('assets/img/resizeHandler.png');
-	disabledSkin:  Embed('assets/img/resizeHandler.png');
-}

bigbluebutton-client/src/branding/css/BrushedMetal.css

@@ -1,100 +0,0 @@
-Application
-{
-	
-	backgroundImage: Embed(source="assets/img/BrushedMetalBack.jpg"); 
-	backgroundSize: "100%";
-   themeColor: #999999;
-    fontFamily: Arial;
-    paddingLeft:10; paddingRight:10; paddingTop:10; paddingBottom:10;
-}
-
-.mdiWindowFocus 
-{
-	borderStyle: solid;
-   borderColor: #FFFFFF;
-   borderAlpha: 0;
-   borderThickness: 1;
-   borderThicknessLeft: 5;
-   borderThicknessTop: 5;
-   borderThicknessBottom: 15;
-   borderThicknessRight: 5;
-   roundedBottomCorners: true;
-   cornerRadius: 5;
-   headerHeight: 27;
-   
-   backgroundAlpha: 1; 
-   backgroundColor: #FFFFFF;
-   
-	backgroundImage: Embed(source="assets/swf/BrushedMetal.swf", symbol="Window_Background");
-	backgroundSize: "100%";
-	
-   dropShadowEnabled: true;
-	
-	
-	cornerResizeImg: Embed(source="assets/swf/BrushedMetal.swf", symbol="Corner_Resize");
-	cornerResizeWidth: 12;
-	cornerResizeHeight: 12;
-	cornerResizePaddingRight: 2;
-	cornerResizePaddingBottom: 2;
-	
-	titleStyleName: "mypanelTitle";
-	titleBackgroundSkin: Embed(source="assets/swf/BrushedMetal.swf", symbol="header");
-	
-	controlButtonWidth: 10;
-	controlButtonHeight: 10;
-	controlButtonGap: 8;
-}
-
-.mdiWindowNoFocus 
-{
-	borderStyle: solid;
-   borderColor: #FFFFFF;
-   borderAlpha: 0;
-   borderThickness: 1;
-   borderThicknessLeft: 5;
-   borderThicknessTop: 5;
-   borderThicknessBottom: 15;
-   borderThicknessRight: 5;
-   roundedBottomCorners: true;
-   cornerRadius: 5;
-   headerHeight: 27;
-   
-
-	
-   
-   backgroundAlpha: 1; 
-   backgroundColor: #FFFFFF;
-   
-	backgroundImage: Embed(source="assets/swf/BrushedMetal.swf", symbol="Window_Background");
-	backgroundSize: "100%";
-	
-   dropShadowEnabled: true;
-	
-	
-	cornerResizeImg: Embed(source="assets/swf/BrushedMetal.swf", symbol="Corner_Resize");
-	cornerResizeWidth: 12;
-	cornerResizeHeight: 12;
-	cornerResizePaddingRight: 2;
-	cornerResizePaddingBottom: 2;
-	
-	titleStyleName: "mypanelTitle";
-	titleBackgroundSkin: Embed(source="assets/swf/BrushedMetal.swf", symbol="header");
-	
-	controlButtonWidth: 10;
-	controlButtonHeight: 10;
-	controlButtonGap: 8;
-}
-
-
-
-.mypanelTitle {
-	fontSize: 12;
-	fontWeight: bold;
-	color: #000000;
-}
-
-
-Button {
-   fillColors: #ffffff, #999999, #ffffff, #eeeeee;
-   themeColor: #999999;
-}

bigbluebutton-client/src/branding/css/MacOS9.css

@@ -1,83 +0,0 @@
-Application
-{
-	background-image: Embed(source="assets/img/wallpaperOS9.gif");
-}
-
-MDIWindow
-{
-	titleStyleName: "macTitle";
-}
-
-.macTitle
-{
-	fontFamily: Georgia;
-	fontSize: 12;
-	fontWeight: normal;
-	color: #000000;
-}
-
-.mdiWindowFocus
-{
-	borderColor: #CCCCCC;
-	borderAlpha: 1;
-	borderThicknessLeft: 2;
-	borderThicknessTop: 0;
-	borderThicknessBottom: 2;
-	borderThicknessRight: 2;
-	roundedBottomCorners: false;
-	cornerRadius: 5;
-	dropShadowEnabled: false;
-	headerHeight: 29;
-	backgroundAlpha: 1; 
-	backgroundColor: #FFFFFF;	
-	titleBackgroundSkin: Embed(source="assets/swf/WindowsAssets.swf", symbol="macHeaderFocus");
-}
-
-.mdiWindowNoFocus
-{
-	borderColor: #CCCCCC;
-	borderAlpha: 1;
-	borderThicknessLeft: 2;
-	borderThicknessTop: 0;
-	borderThicknessBottom: 2;
-	borderThicknessRight: 2;
-	roundedBottomCorners: false;
-	cornerRadius: 5;
-	dropShadowEnabled: false;
-	headerHeight: 29;
-	backgroundAlpha: 1; 
-	backgroundColor: #FFFFFF;
-	titleBackgroundSkin: Embed(source="assets/swf/WindowsAssets.swf", symbol="macHeaderNoFocus");
-}
-
-.mdiWindowMinimizeBtn
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnOS9");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnOS9");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnOS9");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnOS9");
-}
-
-.mdiWindowMaximizeBtn
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
-}
-
-.mdiWindowRestoreBtn
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="maxRestoreBtnOS9");
-}
-
-.mdiWindowCloseBtn
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnOS9");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnOS9");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnOS9");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnOS9");
-}

bigbluebutton-client/src/branding/css/WindowsXP_default.css

@@ -1,143 +0,0 @@
-/*
-Copyright (c) 2007 FlexLib Contributors.  See:
-    http://code.google.com/p/flexlib/wiki/ProjectContributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-Application
-{
-	background-image: Embed(source="assets/img/wallpaperWin.jpg");
-}
-
-MDIWindow
-{
-	titleStyleName: "winXPTitleStyle";
-	
-	minimizeBtnStyleNameNoFocus: "mdiWindowMinimizeBtnNoFocus";
-	maximizeBtnStyleNameNoFocus: "mdiWindowMaximizeBtnNoFocus";
-	restoreBtnStyleNameNoFocus: "mdiWindowRestoreBtnNoFocus";
-	closeBtnStyleNameNoFocus: "mdiWindowCloseBtnNoFocus";
-}
-
-.winXPTitleStyle
-{
-	fontFamily: Verdana;
-	fontSize: 12;
-	fontWeight: normal;
-	color: #FFFFFF;
-}
-
-.mdiWindowFocus
-{
-	borderColor: #0053E1;
-	borderAlpha: 1;
-	borderThicknessLeft: 2;
-	borderThicknessTop: 0;
-	borderThicknessBottom: 2;
-	borderThicknessRight: 2;
-	roundedBottomCorners: false;
-	cornerRadius: 5;
-	dropShadowEnabled: false;
-	headerHeight: 29;
-	backgroundAlpha: 1; 
-	backgroundColor: #FFFFFF;
-	titleBackgroundSkin: Embed(source="assets/swf/WindowsAssets.swf", symbol="headerBgDefault");
-}
-
-.mdiWindowNoFocus
-{
-	borderColor: #7B97E0;
-	borderAlpha: 1;
-	borderThicknessLeft: 2;
-	borderThicknessTop: 0;
-	borderThicknessBottom: 2;
-	borderThicknessRight: 2;
-	roundedBottomCorners: false;
-	cornerRadius: 5;
-	dropShadowEnabled: false;
-	headerHeight: 29;
-	backgroundAlpha: 1; 
-	backgroundColor: #FFFFFF;
-	titleBackgroundSkin: Embed(source="assets/swf/WindowsAssets.swf", symbol="headerBgDefaultNoFocus");
-	
-}
-
-.mdiWindowMinimizeBtn
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefault_up");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefault_over");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefault_down");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
-}
-
-.mdiWindowMinimizeBtnNoFocus
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="minimizeBtnDefaultNoFocus");
-}
-
-.mdiWindowMaximizeBtn
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefault_up");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefault_over");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefault_down");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
-}
-
-.mdiWindowMaximizeBtnNoFocus
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="maximizeBtnDefaultNoFocus");
-}
-
-.mdiWindowRestoreBtn
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefault_up");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefault_over");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefault_down");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
-}
-
-.mdiWindowRestoreBtnNoFocus
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="restoreBtnDefaultNoFocus");
-}
-
-.mdiWindowCloseBtn
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefault_up");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefault_over");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefault_down");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
-}
-
-.mdiWindowCloseBtnNoFocus
-{
-	upSkin:        Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
-	overSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
-	downSkin:      Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
-	disabledSkin:  Embed(source="assets/swf/WindowsAssets.swf", symbol="closeBtnDefaultNoFocus");
-}

bigbluebutton-client/src/branding/css/logo_basic.css

@@ -1,6 +0,0 @@
-/*The image for your logo is 200x200 pixels. No other size is currently supported so resize your logo accordingly. The logo will always appear in the lower right corner. */
-BrandingLogo
-{
-	backgroundImage: Embed(source="assets/img/BBBLogo.png");
-	backgroundSize: "100%";
-}

bigbluebutton-client/src/branding/css/theme.css

@@ -1,180 +0,0 @@
-Application 
-{  
-   backgroundColors: #000000,#3f3f3f;
-   backgroundImage: Embed(source="assets/img/bk3.jpg");
-   backgroundSize: "100%";
-   backgroundGradientColors: #B4BFCF, #78829C;
-   themeColor: #0094C7;
-   backgroundGradientAlphas: 0.62, 0.26;
-}
-
-/*The image for your logo is 200x200 pixels. No other size is currently supported so resize your logo accordingly. The logo will always appear in the lower right corner. */
-BrandingLogo
-{
-	backgroundImage: Embed(source="assets/img/BBBLogo.png");
-	backgroundSize: "100%";
-}
-
-
-MDICanvas 
-{
-	backgroundColor: #0094C7;
-	backgroundAlpha: 0;
-}
-
-
-Button 
-{
-   highlightAlphas: 1, 0.33;
-   fillAlphas: 1, 0.16, 0.18, 1;
-   fillColors: #5f89b9, #697182, #ffffff, #eeeeee;
-}
-
-
-.mdiWindowFocus 
-{
-	headerHeight: 26;
-	roundedBottomCorners: true;
-	backgroundAlpha: 1;
-	backgroundColor: #FFFFFF;
-	backgroundImage: Embed(source="assets/swf/Blue.swf", symbol="Window_Background");
-	backgroundSize: '100%';
-	
-	borderStyle: solid;
-	borderColor: #ffffff;
-	borderAlpha: 1;
-	borderThickness: 2;
-	borderThicknessLeft: 0;
-	borderThicknessTop: 0;
-	borderThicknessBottom: 0;
-	borderThicknessRight: 0;
-	cornerRadius: 4;
-	dropShadowEnabled: false;
-	titleStyleName: "mypanelTitle";
-	
-	cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
-	cornerResizeWidth: 15;
-	cornerResizeHeight: 15;
-	cornerResizePaddingRight: 2;
-	cornerResizePaddingBottom: 2;
-	
-	controlButtonWidth: 10;
-	controlButtonHeight: 10;
-	controlButtonGap: 4;
-}
-
-.mdiWindowNoFocus 
-{
-	headerHeight: 26;
-	roundedBottomCorners: true;
-	backgroundAlpha: 0.5;
-	backgroundImage: Embed(source="assets/swf/Blue.swf", symbol="Window_Background");
-	backgroundSize: '100%';
-	
-	borderStyle: solid;
-	borderColor: #ffffff;
-	borderAlpha: 1;
-	borderThickness: 2;
-	borderThicknessLeft: 0;
-	borderThicknessTop: 0;
-	borderThicknessBottom: 0;
-	borderThicknessRight: 0;
-	cornerRadius: 4;
-	dropShadowEnabled: false;
-	titleStyleName: "mypanelTitle";
-	
-	cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
-	cornerResizeWidth: 15;
-	cornerResizeHeight: 15;
-	cornerResizePaddingRight: 2;
-	cornerResizePaddingBottom: 2;
-	
-	controlButtonWidth: 10;
-	controlButtonHeight: 10;
-	controlButtonGap: 4;
-}
-
-.mypanelTitle 
-{
-	fontFamily: Arial;
-	fontSize: 12;
-	fontWeight: bold;
-	color: #ffffff;
-}
-
-
-.closeBtnFocus
-{
-	upSkin:        Embed('assets/img/3_closeButton.png');
-	overSkin:      Embed('assets/img/3_closeButton.png');
-	downSkin:      Embed('assets/img/3_closeButton.png');
-	disabledSkin:  Embed('assets/img/3_closeButton.png');
-}
-
-.closeBtnNoFocus
-{
-	upSkin:        Embed('assets/img/3_closeButton.png');
-	overSkin:      Embed('assets/img/3_closeButton.png');
-	downSkin:      Embed('assets/img/3_closeButton.png');
-	disabledSkin:  Embed('assets/img/3_closeButton.png');
-}
-
-
-.increaseBtnFocus
-{
-	upSkin:        Embed('assets/img/3_increaseButton.png');
-	overSkin:      Embed('assets/img/3_increaseButton.png');
-	downSkin:      Embed('assets/img/3_increaseButton.png');
-	disabledSkin:  Embed('assets/img/3_increaseButton.png');
-}
-
-.increaseBtnNoFocus
-{
-	upSkin:        Embed('assets/img/3_increaseButton.png');
-	overSkin:      Embed('assets/img/3_increaseButton.png');
-	downSkin:      Embed('assets/img/3_increaseButton.png');
-	disabledSkin:  Embed('assets/img/3_increaseButton.png');
-}
-
-
-.decreaseBtnFocus 
-{
-	upSkin:        Embed('assets/img/3_decreaseButton.png');
-	overSkin:      Embed('assets/img/3_decreaseButton.png');
-	downSkin:      Embed('assets/img/3_decreaseButton.png');
-	disabledSkin:  Embed('assets/img/3_decreaseButton.png');
-}
-
-.decreaseBtnNoFocus 
-{
-	upSkin:        Embed('assets/img/3_decreaseButton.png');
-	overSkin:      Embed('assets/img/3_decreaseButton.png');
-	downSkin:      Embed('assets/img/3_decreaseButton.png');
-	disabledSkin:  Embed('assets/img/3_decreaseButton.png');
-}
-
-
-.minimizeBtnFocus 
-{
-	upSkin:        Embed('assets/img/3_minimizeButton.png');
-	overSkin:      Embed('assets/img/3_minimizeButton.png');
-	downSkin:      Embed('assets/img/3_minimizeButton.png');
-	disabledSkin:  Embed('assets/img/3_minimizeButton.png');
-}
-
-.minimizeBtnNoFocus 
-{
-	upSkin:        Embed('assets/img/3_minimizeButton.png');
-	overSkin:      Embed('assets/img/3_minimizeButton.png');
-	downSkin:      Embed('assets/img/3_minimizeButton.png');
-	disabledSkin:  Embed('assets/img/3_minimizeButton.png');
-}
-
-
-.resizeHndlr 
-{
-	upSkin:        Embed('assets/img/resizeHandler.png');
-	overSkin:      Embed('assets/img/resizeHandler.png');
-	downSkin:      Embed('assets/img/resizeHandler.png');
-	disabledSkin:  Embed('assets/img/resizeHandler.png');
-}

bigbluebutton-client/src/org/bigbluebutton/common/Images.as

@@ -21,6 +21,24 @@ package org.bigbluebutton.common
 	[Bindable]
 	public class Images
 	{
+    [Embed(source="assets/images/webcam_kickuser.png")]
+    public var webcam_kickuser:Class;
+    
+    [Embed(source="assets/images/webcam_make_presenter.png")]
+    public var webcam_make_presenter:Class;
+    
+    [Embed(source="assets/images/webcam_mute.png")]
+    public var webcam_mute:Class;
+    
+    [Embed(source="assets/images/webcam_private_chat.png")]
+    public var webcam_private_chat:Class;
+    
+    [Embed(source="assets/images/webcam_unmute.png")]
+    public var webcam_unmute:Class;
+    
+    [Embed(source="assets/images/vdoc_bg.jpg")]
+    public var video_dock_bg:Class;
+        
     [Embed(source="assets/images/bandwidth.png")]
     public var bandwidth:Class;
     
@@ -100,7 +118,7 @@ package org.bigbluebutton.common
         public var sound:Class;                
 
         [Embed(source="assets/images/cancel.png")]
-        public var cancel_user:Class;    
+        public var cancel:Class;    
 
         [Embed(source="assets/images/user_go.png")]
         public var eject_user:Class;  
@@ -117,19 +135,19 @@ package org.bigbluebutton.common
         [Embed(source="assets/images/shape_square.png")]
         public var square_icon:Class;  
         
-        [Embed(source="assets/images/arrow_undo.png")] 
+        [Embed(source="assets/images/undo.png")] 
         public var undo_icon:Class;  
         
-        [Embed(source="assets/images/hand_icon.png")]
+        [Embed(source="assets/images/hand.png")]
         public var hand_icon:Class; 
         
-        [Embed(source="assets/images/scribble_icon.png")]
+        [Embed(source="assets/images/marker.png")]
         public var scribble_icon:Class; 
 
-        [Embed(source="assets/images/text_icon.png")]
+        [Embed(source="assets/images/text.png")]
         public var text_icon:Class; 
         
-        [Embed(source="assets/images/circle.png")]
+        [Embed(source="assets/images/ellipse.png")]
         public var circle_icon:Class; 
         
         [Embed(source="assets/images/arrow_out.png")]
@@ -153,7 +171,7 @@ package org.bigbluebutton.common
 		[Embed(source="assets/images/table.png")]
 		public var table:Class; 
 		
-		[Embed(source="assets/images/cancel.png")]
+		[Embed(source="assets/images/trash.png")]
 		public var delete_icon:Class; 
 
         [Embed(source="assets/images/arrow_right.png")]
@@ -232,7 +250,7 @@ package org.bigbluebutton.common
 		[Embed(source="assets/images/pointer_icon_small.png")]
 		public var select_icon:Class;	
 		
-		[Embed(source="assets/images/triangle_icon.png")]
+		[Embed(source="assets/images/triangle.png")]
 		public var triangle_icon:Class;	
 		
 		[Embed(source="assets/images/text_background_icon.png")]

bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as

@@ -1,14 +1,16 @@
 package org.bigbluebutton.main.api
 {
-  import com.asfusion.mate.events.Dispatcher; 
-  import flash.external.ExternalInterface;  
-  import mx.controls.Alert;  
+  import com.asfusion.mate.events.Dispatcher;
+  
+  import flash.external.ExternalInterface;
+  
+  import mx.controls.Alert;
+  
   import org.bigbluebutton.common.LogUtil;
   import org.bigbluebutton.core.EventConstants;
   import org.bigbluebutton.core.UsersUtil;
-  import org.bigbluebutton.core.events.AmIPresenterQueryEvent;
+  import org.bigbluebutton.core.events.AmIPresenterQueryEvent;
   import org.bigbluebutton.core.events.AmISharingWebcamQueryEvent;
-
   import org.bigbluebutton.core.events.CoreEvent;
   import org.bigbluebutton.core.managers.UserManager;
   import org.bigbluebutton.core.vo.CameraSettingsVO;
@@ -221,7 +223,9 @@ package org.bigbluebutton.main.api
     
     private function handleJoinVoiceRequest():void {
       trace("handleJoinVoiceRequest");
-      _dispatcher.dispatchEvent(new BBBEvent(BBBEvent.JOIN_VOICE_CONFERENCE));
+      var joinEvent:BBBEvent = new BBBEvent("JOIN_VOICE_CONFERENCE_EVENT");
+      joinEvent.payload['useMicrophone'] = true;
+      _dispatcher.dispatchEvent(joinEvent);
     }
     
     private function handleLeaveVoiceRequest():void {

bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml

@@ -254,26 +254,15 @@
 <!--
   <mx:Button label="DISCONNECT!" click="BBB.initConnectionManager().forceClose()" height="22" toolTip="Click to simulate disconnection" />
 -->
-	<!-- Shortcut Glossary Button -->
-	<mx:Button  label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn')}" 
-				click="onShortcutButtonClick()" 
-				height="22" 
-				toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn.toolTip')}"
-				tabIndex="{baseIndex+numButtons+26}"/>
-	<!-- Help Button -->
-	<mx:LinkButton id="helpBtn" 
-				   label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}" 
-				   visible="{showHelpBtn}" 
-				   click="onHelpButtonClicked()" 
-				   height="22"
-				   tabIndex="{baseIndex+numButtons+27}"/>
-	
-	<!-- Logout Button -->
-	<mx:Button label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.logoutBtn')}" 
-			   id="btnLogout" 
-			   toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.logoutBtn.toolTip')}" 
-			   right="10" 
-			   click="doLogout()" 
-			   height="22"
-			   tabIndex="{baseIndex+numButtons+28}"/>
+
+	<mx:Button label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn')}" styleName="shortcutButtonStyle"
+             click="onShortcutButtonClick()" height="22" 
+             toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.shortcutBtn.toolTip')}" 
+             tabIndex="{baseIndex+numButtons+26}" />
+	<mx:LinkButton id="helpBtn" label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.helpBtn')}" 
+                 visible="{showHelpBtn}" click="onHelpButtonClicked()" height="22" styleName="helpLinkButtonStyle"
+                 tabIndex="{baseIndex+numButtons+27}" />
+	<mx:Button label="{ResourceUtil.getInstance().getString('bbb.mainToolbar.logoutBtn')}" id="btnLogout" styleName="logoutButtonStyle"
+                 toolTip="{ResourceUtil.getInstance().getString('bbb.mainToolbar.logoutBtn.toolTip')}" right="10" click="doLogout()" height="22"
+                 tabIndex="{baseIndex+numButtons+28}" />
 </mx:ApplicationControlBar>

bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml

@@ -34,7 +34,7 @@
 			private var mic:Microphone;
 			private var playingAudio:Boolean = false;
 			private var images:Images = new Images();
-			[Bindable] private var cancelIcon:Class = images.delete_icon;
+			[Bindable] private var cancelIcon:Class = images.cancel;
 			
 			private function initDefaultMic():void {
 				mic = Microphone.getMicrophone();

bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/events/PlayStreamEvent.as

@@ -0,0 +1,12 @@
+package org.bigbluebutton.modules.broadcast.events
+{
+  import flash.events.Event;
+  
+  public class PlayStreamEvent extends Event
+  {
+    public function PlayStreamEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false)
+    {
+      super(type, bubbles, cancelable);
+    }
+  }
+}

bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/events/StreamsListLoadedEvent.as

@@ -0,0 +1,14 @@
+package org.bigbluebutton.modules.broadcast.events
+{
+  import flash.events.Event;
+  
+  public class StreamsListLoadedEvent extends Event
+  {
+    public static const STREAMS_LIST_LOADED:String = "broadcast streams list loaded event";
+    
+    public function StreamsListLoadedEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false)
+    {
+      super(type, bubbles, cancelable);
+    }
+  }
+}