Permalink
Browse files

- query presentation

  • Loading branch information...
1 parent b8d67e4 commit 1419234ad5dc70aae1b3845ed24d9c7f33430320 @ritzalam ritzalam committed Jun 29, 2012
Showing with 1,428 additions and 96 deletions.
  1. +4 −4 bigbluebutton-client/build.xml
  2. +1 −1 bigbluebutton-client/resources/config.xml.template
  3. +10 −5 bigbluebutton-client/src/BreakoutModule.mxml
  4. +5 −1 bigbluebutton-client/src/ChatModule.mxml
  5. +5 −1 bigbluebutton-client/src/ClassroomAudioModule.mxml
  6. +6 −2 bigbluebutton-client/src/DeskShareModule.mxml
  7. +5 −1 bigbluebutton-client/src/DynamicInfoModule.mxml
  8. +5 −1 bigbluebutton-client/src/ExampleChatModule.mxml
  9. +6 −1 bigbluebutton-client/src/ListenersModule.mxml
  10. +6 −2 bigbluebutton-client/src/PhoneModule.mxml
  11. +11 −56 bigbluebutton-client/src/PresentModule.mxml
  12. +5 −1 bigbluebutton-client/src/SettingsModule.mxml
  13. +6 −1 bigbluebutton-client/src/SharedNotesModule.mxml
  14. +5 −1 bigbluebutton-client/src/VideoconfModule.mxml
  15. +5 −1 bigbluebutton-client/src/VideodockModule.mxml
  16. +6 −2 bigbluebutton-client/src/ViewersModule.mxml
  17. +5 −1 bigbluebutton-client/src/WhiteboardModule.mxml
  18. +1 −1 bigbluebutton-client/src/org/bigbluebutton/common/IBigBlueButtonModule.as
  19. +11 −1 bigbluebutton-client/src/org/bigbluebutton/core/controllers/maps/BigBlueButtonAppEventMap.mxml
  20. +2 −0 bigbluebutton-client/src/org/bigbluebutton/core/model/ConfigModel.as
  21. +1 −1 bigbluebutton-client/src/org/bigbluebutton/core/model/MeetingModel.as
  22. +3 −0 bigbluebutton-client/src/org/bigbluebutton/core/model/ModuleModel.as
  23. +4 −0 bigbluebutton-client/src/org/bigbluebutton/core/services/UsersService.as
  24. +1 −1 bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentProxy.as
  25. +1 −9 bigbluebutton-client/src/org/bigbluebutton/modules/present/business/PresentationService.as
  26. +67 −0 ...luebutton-client/src/org/bigbluebutton/modules/present/controllers/maps/PresentationEventMap.mxml
  27. +25 −0 ...ton-client/src/org/bigbluebutton/modules/present/controllers/maps/PresentationEventMapDelegate.as
  28. +0 −1 bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/Slide.as
  29. +36 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/models/Page.as
  30. +9 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/models/Pages.as
  31. +39 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/models/Presentation.as
  32. +44 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/models/PresentationConfigModel.as
  33. +25 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/models/PresentationModel.as
  34. +19 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/models/Presentations.as
  35. +34 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/services/PageLoaderService.as
  36. +111 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/services/PresentationLoaderService.as
  37. +615 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/services/PresentationSOService.as
  38. +116 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/services/PresentationUploadService.as
  39. +34 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/services/ThumbnailLoaderService.as
  40. +125 −0 bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindowEventMap.mxml
  41. +9 −0 ...utton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindowEventMapDelegate.as
@@ -232,16 +232,16 @@
</target>
<!-- just a grouping of modules to compile -->
- <!-- build-bbb-main-test, , build-breakout -->
+ <!-- build-bbb-main-test, , build-breakout build-chat, build-listeners,-->
<target name="build-main-chat-viewers-listeners-present"
- depends="build-bbb-main, build-chat, build-viewers, build-listeners, build-present"
+ depends="build-bbb-main, build-viewers, build-present"
description="Compile main, chat, viewers, listeners, present, breakout modules">
</target>
<!-- just a grouping of modules to compile -->
- <!-- , build-dyn, build-classroom-audio, build-settings -->
+ <!-- , build-dyn, build-classroom-audio, build-settings build-phone, build-video, build-videodock, build-deskshare,-->
<target name="build-deskshare-phone-video-whiteboard-dyn"
- depends="build-deskshare, build-phone, build-video, build-videodock, build-whiteboard"
+ depends=" build-whiteboard"
description="Compile deskshare, phone, video, whiteboard, dynamic info modules">
</target>
@@ -77,7 +77,7 @@
<module name="PresentModule" url="PresentModule.swf?v=VERSION"
uri="rtmp://HOST/bigbluebutton"
- host="http://HOST"
+ presentationService="http://HOST/bigbluebutton/presentation"
showPresentWindow="true"
showWindowControls="true"
dependsOn="ViewersModule"
@@ -21,14 +21,15 @@
-->
<mx:Module xmlns:mx="http://www.adobe.com/2006/mxml" layout="absolute"
- implements="org.bigbluebutton.common.IBigBlueButtonModule" xmlns:maps="org.bigbluebutton.modules.breakout.maps.*"
+ implements="org.bigbluebutton.common.IBigBlueButtonModule"
+ xmlns:maps="org.bigbluebutton.modules.breakout.maps.*"
>
<mx:Script>
<![CDATA[
- import com.asfusion.mate.events.Dispatcher;
-
- import org.bigbluebutton.modules.breakout.events.StartBreakoutModule;
+ import com.asfusion.mate.events.Dispatcher;
+ import org.bigbluebutton.common.LogUtil;
+ import org.bigbluebutton.modules.breakout.events.StartBreakoutModule;
private var globalDispatcher:Dispatcher;
@@ -63,7 +64,11 @@
return _attributes.userrole as String;
}
- public function start(attributes:Object):void {
+ public function start():void{
+ LogUtil.debug("Breakout module starting.");
+ }
+
+ public function start1(attributes:Object):void {
_attributes = attributes;
globalDispatcher = new Dispatcher();
@@ -102,7 +102,11 @@
else return true;
}
- public function start(attributes:Object):void {
+ public function start():void {
+ LogUtil.debug("Staring Chat Module.");
+ }
+
+ public function start1(attributes:Object):void {
LogUtil.debug("chat attr: " + attributes.username);
_attributes = attributes;
LogUtil.debug("Dispatching StartChatModuleEvent");
View
@@ -99,7 +99,11 @@ $Id: $
else return false;
}
- public function start(attributes:Object):void {
+ public function start():void{
+ LogUtil.debug("Classroom module starting.");
+ }
+
+ public function start1(attributes:Object):void {
_attributes = attributes;
var startEvent:StartClassAudioEvent = new StartClassAudioEvent();
@@ -80,8 +80,12 @@
public function get role():String{
return _attributes.userrole as String;
}
-
- public function start(attributes:Object):void{
+
+ public function start():void{
+ LogUtil.debug("Deskshare module starting.");
+ }
+
+ public function start1(attributes:Object):void{
LogUtil.debug("desk share attr: " + attributes.username);
_attributes = attributes;
@@ -77,7 +77,11 @@
return _attributes.userrole as String;
}
- public function start(attributes:Object):void {
+ public function start():void{
+ LogUtil.debug("Dynamic info module starting.");
+ }
+
+ public function start1(attributes:Object):void {
_attributes = attributes;
// debugging code:
@@ -78,7 +78,11 @@
return _attributes.userrole as String;
}
- public function start(attributes:Object):void {
+ public function start():void{
+ LogUtil.debug("Example module starting.");
+ }
+
+ public function start1(attributes:Object):void {
this._attributes = attributes;
var window:ExampleChatWindow = new ExampleChatWindow();
window.moduleAttributes = _attributes;
@@ -105,7 +105,12 @@
LogUtil.debug("LISTENER-ROLE:" + _attributes.userrole);
return _attributes.userrole == "MODERATOR";
}
- public function start(attributes:Object):void {
+
+ public function start():void{
+ LogUtil.debug("Listeners module starting.");
+ }
+
+ public function start1(attributes:Object):void {
_attributes = attributes;
globalDispatcher = new Dispatcher();
@@ -86,8 +86,12 @@
public function get voicebridge():String {
return _attributes.voicebridge;
}
-
- public function start(attributes:Object):void {
+
+ public function start():void{
+ LogUtil.debug("Phone module starting.");
+ }
+
+ public function start1(attributes:Object):void {
LogUtil.debug("phone attr: " + attributes.username);
_attributes = attributes;
@@ -22,84 +22,39 @@
<mx:Module xmlns:mx="http://www.adobe.com/2006/mxml"
implements="org.bigbluebutton.common.IBigBlueButtonModule"
- creationComplete="onCreationComplete()" xmlns:maps="org.bigbluebutton.modules.present.maps.*">
+ xmlns:maps="org.bigbluebutton.modules.present.controllers.maps.*">
<mx:Script>
<![CDATA[
import com.asfusion.mate.events.Dispatcher;
-
- import mx.controls.Alert;
-
import org.bigbluebutton.common.LogUtil;
import org.bigbluebutton.modules.present.events.PresentModuleEvent;
import org.bigbluebutton.modules.present.maps.PresentEventMap;
private var globalDispatcher:Dispatcher = new Dispatcher();
private var _moduleName:String = "Presentation";
- private var _attributes:Object;
-
- private function onCreationComplete():void{
- }
public function get moduleName():String{
return _moduleName;
}
-
- public function get uri():String{
- if (_attributes.mode == "PLAYBACK")
- return _attributes.uri + "/" + _attributes.playbackRoom;
- return _attributes.uri + "/" + _attributes.room;
- }
-
- public function get username():String{
- return _attributes.username;
- }
-
- public function get connection():NetConnection{
- return _attributes.connection;
- }
-
- public function get mode():String{
- if (_attributes.mode == null){
- _attributes.mode = "LIVE";
- LogUtil.debug("Setting Present mode: " + _attributes.mode);
- }
- LogUtil.debug("Present mode: " + _attributes.mode);
- return _attributes.mode;
- }
-
- public function get userid():Number{
- return _attributes.userid as Number;
- }
-
- public function get role():String{
- return _attributes.userrole as String;
- }
-
- public function start(attributes:Object):void{
- LogUtil.debug("present attr: " + attributes.username);
- _attributes = attributes;
-
- var e:PresentModuleEvent = new PresentModuleEvent(PresentModuleEvent.START_MODULE);
- e.data = attributes;
- globalDispatcher.dispatchEvent(e);
- }
+
+ public function start():void{
+ LogUtil.debug("Present module starting.");
+ var e:PresentModuleEvent = new PresentModuleEvent(PresentModuleEvent.START_MODULE);
+ // e.data = attributes;
+ globalDispatcher.dispatchEvent(e);
+ }
+
+
public function stop():void{
var e:PresentModuleEvent = new PresentModuleEvent(PresentModuleEvent.STOP_MODULE);
globalDispatcher.dispatchEvent(e);
}
- public function getRoom():String{
- return _attributes.room;
- }
-
- public function getRed5ServerUri():String{
- return _attributes.uri;
- }
]]>
</mx:Script>
- <maps:PresentEventMap id="eventMap" />
+ <maps:PresentationEventMap id="eventMap" />
</mx:Module>
@@ -68,7 +68,11 @@ $Id: $
return _attributes.userrole as String;
}
- public function start(attributes:Object):void {
+ public function start():void{
+ LogUtil.debug("Settings module starting.");
+ }
+
+ public function start1(attributes:Object):void {
_attributes = attributes;
globalDispatcher = new Dispatcher();
Requirements.setRequirements(attributes);
View
@@ -84,8 +84,13 @@
public function get role():String {
return _attributes.userrole as String;
}
+
+ public function start():void{
+ LogUtil.debug("Shared notes module starting.");
+ }
+
- public function start(attributes:Object):void {
+ public function start1(attributes:Object):void {
LogUtil.debug("notes attr: " + attributes.username);
_attributes = attributes;
SharedNotesWindow.document = _attributes.room;
@@ -78,7 +78,11 @@
else return false;
}
- public function start(attributes:Object):void {
+ public function start():void{
+ LogUtil.debug("Video module starting.");
+ }
+
+ public function start1(attributes:Object):void {
LogUtil.debug("Videoconf attr: " + attributes.username);
_attributes = attributes;
proxy = new VideoProxy(uri);
@@ -15,7 +15,11 @@
return _moduleName;
}
- public function start(attributes:Object):void {
+ public function start():void{
+ LogUtil.debug("Video dock module starting.");
+ }
+
+ public function start1(attributes:Object):void {
LogUtil.debug("Videodock attr: " + attributes.username);
eventMap.startModule();
@@ -186,8 +186,12 @@
if (_attributes.allowKickUser == "true") return true;
else return false;
}
-
- public function start(attributes:Object):void {
+
+ public function start():void{
+ LogUtil.debug("Viewers module starting.");
+ }
+
+ public function start1(attributes:Object):void {
_attributes = attributes;
var now:Date = new Date();
_playbackRoom = now.getTime().toString();
@@ -63,7 +63,11 @@
return _attributes.userrole as String;
}
- public function start(attributes:Object):void {
+ public function start():void{
+ LogUtil.debug("Whiteboard module starting.");
+ }
+
+ public function start1(attributes:Object):void {
LogUtil.debug("highlighter attr: " + attributes.username);
_attributes = attributes;
globalDispatcher = new Dispatcher();
@@ -38,7 +38,7 @@ package org.bigbluebutton.common
* the client's config.xml file for your module will be passed to the module as well. The attributes object is dynamic
* however and should not be cast into any other class.
*/
- function start(attributes:Object):void;
+ function start():void;
function stop():void;
}
}
@@ -24,6 +24,7 @@
<mx:Script>
<![CDATA[
import org.bigbluebutton.core.controllers.events.ConfigLoadEvent;
+ import org.bigbluebutton.core.controllers.events.GotAllUsersEvent;
import org.bigbluebutton.core.controllers.events.LocaleEvent;
import org.bigbluebutton.core.controllers.events.ModuleLoadedEvent;
import org.bigbluebutton.core.controllers.events.UserAuthenticatedEvent;
@@ -37,6 +38,7 @@
import org.bigbluebutton.core.services.LocaleLoaderService;
import org.bigbluebutton.core.services.Red5BBBAppConnectionService;
import org.bigbluebutton.core.services.UsersService;
+ import org.bigbluebutton.main.events.BBBEvent;
]]>
</mx:Script>
<!--
@@ -78,12 +80,20 @@
</EventHandlers>
<EventHandlers type="{UserAuthenticatedEvent.USER_AUTHENTICATED_EVENT}">
- <MethodInvoker generator="{Red5BBBAppConnectionService}" method="connect"/>
+ <MethodInvoker generator="{Red5BBBAppConnectionService}" method="connect"/>
</EventHandlers>
+ <EventHandlers type="{GotAllUsersEvent.GOT_ALL_USERS_EVENT}">
+ <MethodInvoker generator="{ModuleModel}" method="startAllModules"/>
+ </EventHandlers>
+
<EventHandlers type="{UsersConnectionEvent.CONNECTION_SUCCESS}">
<MethodInvoker generator="{UsersService}" method="getAllUsers"/>
</EventHandlers>
+
+ <EventHandlers type="{BBBEvent.PRESENTATION_CONVERTED}">
+ <MethodInvoker generator="{UsersService}" method="presentationConverted"/>
+ </EventHandlers>
<EventHandlers type="{ConfigLoadEvent.CONFIG_LOADED_EVENT}">
<MethodInvoker generator="{ConfigModel}" method="setConfig" arguments="{event.config}"/>
@@ -1,5 +1,6 @@
package org.bigbluebutton.core.model
{
+ import org.bigbluebutton.common.LogUtil;
public class ConfigModel
{
@@ -84,6 +85,7 @@ package org.bigbluebutton.core.model
if (isModulePresent(moduleName)) {
return new XML(_config.modules.module.(@name.toUpperCase() == moduleName.toUpperCase()).toXMLString());
}
+ LogUtil.debug("Cannot find module " + moduleName);
return null;
}
}
Oops, something went wrong.

0 comments on commit 1419234

Please sign in to comment.