Skip to content

Commit 0380083

Browse files
ritzalamritzalam
committed
Merge branch 'master' into upgrade-to-red5-r4573
2 parents eadd1e3 + f58fa12 commit 0380083

File tree

72 files changed

+2394
-841
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2394
-841
lines changed

‎bigbluebutton-client/.actionScriptProperties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@
6161
</buildCSSFiles>
6262
<flashCatalyst validateFlashCatalystCompatibility="false"/>
6363
</actionScriptProperties>
64+

‎bigbluebutton-client/.flexProperties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
3+

‎bigbluebutton-client/README

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,33 @@
11
see http://code.google.com/p/bigbluebutton
22

33
Developing the client
4-
1. Copy src/conf/config.xml.dev to src/cong/config.xml
4+
1. Copy src/conf/config.xml.dev to src/cong/config.xml
5+
6+
Implementing Tab Order:
7+
The default tab order (necessary for accessibility) is hard-coded into these modules and the main toolbars, and is as follows:
8+
Main Toolbar
9+
Desktop sharing (if open)
10+
Webcam publishing (if open)
11+
Viewers list window
12+
Listeners list window
13+
Webcam window
14+
Presentation window
15+
Whiteboard toolbar
16+
Chat window
17+
Bottom Toolbar
18+
19+
If you want to change the tab order for BigBlueButton , check resources/config.xml.template and it to src/conf/config.xml.
20+
Certain modules must have the baseTabIndex property, and for the default tab order, their values should be as follows:
21+
22+
101: DeskShareModule (Desktop sharing module)
23+
101: VideoconfModule (Webcam publishing window)
24+
201: ViewersModule (Viewers list window)
25+
301: ListenersModule (Listeners list window)
26+
401: VideodockModule (Webcam window)
27+
501: PresentModule (Presentation window)
28+
601: WhiteboardModule (Whiteboard toolbar)
29+
701: ChatModule (Chat window)
30+
31+
The 100-value separation guarantees enough space for a sufficient number of elements in each module. The Main Toolbar's
32+
base index is 1, the bottom toolbar's base index is 100,000, but you shouldn't need to change them anyway.
33+
Deskshare and Webcam publishing have the same base index, that is not an error.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle {
5353
textRollOverColor: #5e5f63;
5454
textSelectedColor: #5e5f63;
5555
borderColor: #b9babc;
56-
themeColor: #aaaaaa;
56+
themeColor: haloBlue;
5757
fontFamily: Arial;
5858
fontSize: 12;
5959
}
@@ -103,7 +103,7 @@ DataGrid {
103103
textRollOverColor: #5e5f63;
104104
textSelectedColor: #5e5f63;
105105
borderColor: #b9babc;
106-
themeColor: #aaaaaa;
106+
themeColor: haloBlue;
107107
fontFamily: Arial;
108108
fontSize: 12;
109109
}
@@ -160,7 +160,7 @@ DataGrid {
160160
textRollOverColor: #5e5f63;
161161
textSelectedColor: #5e5f63;
162162
borderColor: #b9babc;
163-
themeColor: #aaaaaa;
163+
themeColor: haloBlue;
164164
fontFamily: Arial;
165165
fontSize: 12;
166166
}
@@ -197,7 +197,7 @@ DataGrid {
197197
invertThumbDirection: false;
198198
borderColor: #b9babc;
199199
trackColors: #aaaaaa, #aaaaaa;
200-
themeColor: #aaaaaa;
200+
themeColor: haloBlue;
201201
fillAlphas: 1, 1, 1, 1;
202202
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
203203
labelStyleName: "presentationZoomSliderLabelStyle";

‎bigbluebutton-client/libs/flexlib.swc

151 Bytes
Binary file not shown.

‎bigbluebutton-client/locale/en_US/bbbResources.properties

Lines changed: 174 additions & 41 deletions
Large diffs are not rendered by default.

‎bigbluebutton-client/resources/config.xml.template

Lines changed: 149 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,149 @@
1-
<?xml version="1.0" ?>
2-
<config>
3-
<localeversion suppressWarning="false">0.8</localeversion>
4-
<version>VERSION</version>
5-
<help url="http://HOST/help.html"/>
6-
<porttest host="HOST" application="video" timeout="10000"/>
7-
<application uri="rtmp://HOST/bigbluebutton" host="http://HOST/bigbluebutton/api/enter" />
8-
<language userSelectionEnabled="true" />
9-
<skinning enabled="true" url="http://HOST/client/branding/css/BBBDefault.css.swf" />
10-
<layout showLogButton="false" showVideoLayout="false" showResetLayout="true" defaultLayout="Default"
11-
showToolbar="true" showFooter="true" showHelpButton="true" showLogoutWindow="true"/>
12-
13-
<modules>
14-
15-
<module name="ChatModule" url="http://HOST/client/ChatModule.swf?v=VERSION"
16-
uri="rtmp://HOST/bigbluebutton"
17-
dependsOn="ViewersModule"
18-
translationOn="false"
19-
translationEnabled="false"
20-
privateEnabled="true"
21-
position="top-right"
22-
/>
23-
24-
<module name="ViewersModule" url="http://HOST/client/ViewersModule.swf?v=VERSION"
25-
uri="rtmp://HOST/bigbluebutton"
26-
host="http://HOST/bigbluebutton/api/enter"
27-
allowKickUser="false"
28-
/>
29-
30-
<module name="ListenersModule" url="http://HOST/client/ListenersModule.swf?v=VERSION"
31-
uri="rtmp://HOST/bigbluebutton"
32-
recordingHost="http://HOST"
33-
position="bottom-left"
34-
/>
35-
36-
<!--
37-
<module name="ParticipantsModule" url="http://HOST/client/ParticipantsModule.swf?v=VERSION"
38-
uri="rtmp://HOST/bigbluebutton"
39-
/>
40-
-->
41-
42-
<module name="DeskShareModule"
43-
url="http://HOST/client/DeskShareModule.swf?v=VERSION"
44-
uri="rtmp://HOST/deskShare"
45-
autoStart="false"
46-
/>
47-
48-
<module name="PhoneModule" url="http://HOST/client/PhoneModule.swf?v=VERSION"
49-
uri="rtmp://HOST/sip"
50-
autoJoin="true"
51-
skipCheck="false"
52-
showButton="true"
53-
enabledEchoCancel="true"
54-
dependsOn="ViewersModule"
55-
/>
56-
57-
<module name="VideoconfModule" url="http://HOST/client/VideoconfModule.swf?v=VERSION"
58-
uri="rtmp://HOST/video"
59-
dependson = "ViewersModule"
60-
videoQuality = "100"
61-
presenterShareOnly = "false"
62-
controlsForPresenter = "false"
63-
resolutions = "320x240,640x480,1280x720"
64-
autoStart = "false"
65-
showButton = "true"
66-
showCloseButton = "true"
67-
publishWindowVisible = "true"
68-
viewerWindowMaxed = "false"
69-
viewerWindowLocation = "top"
70-
camKeyFrameInterval = "30"
71-
camModeFps = "10"
72-
camQualityBandwidth = "0"
73-
camQualityPicture = "90"
74-
smoothVideo="false"
75-
applyConvolutionFilter="false"
76-
convolutionFilter="-1, 0, -1, 0, 6, 0, -1, 0, -1"
77-
filterBias="0"
78-
filterDivisor="4"
79-
enableH264 = "true"
80-
h264Level = "2.1"
81-
h264Profile = "main"
82-
displayAvatar = "false"
83-
/>
84-
85-
<module name="WhiteboardModule" url="http://HOST/client/WhiteboardModule.swf?v=VERSION"
86-
uri="rtmp://HOST/bigbluebutton"
87-
dependsOn="PresentModule"
88-
/>
89-
90-
<!--
91-
<module name="PollingModule" url="http://HOST/client/PollingModule.swf?v=VERSION"
92-
uri="rtmp://HOST/bigbluebutton"
93-
dependsOn="PresentModule"
94-
/>
95-
-->
96-
97-
<module name="PresentModule" url="http://HOST/client/PresentModule.swf?v=VERSION"
98-
uri="rtmp://HOST/bigbluebutton"
99-
host="http://HOST"
100-
showPresentWindow="true"
101-
showWindowControls="true"
102-
dependsOn="ViewersModule"
103-
/>
104-
105-
<module name="VideodockModule" url="http://HOST/client/VideodockModule.swf?v=VERSION"
106-
uri="rtmp://HOST/bigbluebutton"
107-
dependsOn="VideoconfModule, ViewersModule"
108-
autoDock="true"
109-
showControls="true"
110-
maximizeWindow="false"
111-
position="bottom-right"
112-
width="172"
113-
height="179"
114-
layout="smart"
115-
oneAlwaysBigger="false"
116-
/>
117-
118-
<module name="LayoutModule" url="http://HOST/client/LayoutModule.swf?v=VERSION"
119-
uri="rtmp://HOST/bigbluebutton"
120-
layoutConfig="http://HOST/client/conf/layout.xml"
121-
enableEdit="true"
122-
/>
123-
124-
<!--
125-
<module name="NotesModule" url="http://HOST/client/NotesModule.swf?v=VERSION"
126-
saveURL="http://HOST"
127-
position="top-left"
128-
/>
129-
130-
<module name="BroadcastModule" url="http://HOST/client/BroadcastModule.swf?v=VERSION"
131-
uri="rtmp://HOST/bigbluebutton"
132-
streamsUri="http://HOST/streams.xml"
133-
position="top-left"
134-
showStreams="true"
135-
autoPlay="false"
136-
dependsOn="ViewersModule"
137-
/>
138-
-->
139-
140-
</modules>
141-
</config>
1+
<?xml version="1.0" ?>
2+
<config>
3+
<localeversion suppressWarning="false">0.8</localeversion>
4+
<version>VERSION</version>
5+
<help url="http://HOST/help.html"/>
6+
<porttest host="HOST" application="video" timeout="10000"/>
7+
<application uri="rtmp://HOST/bigbluebutton" host="http://HOST/bigbluebutton/api/enter" />
8+
<language userSelectionEnabled="true" />
9+
<skinning enabled="true" url="http://HOST/client/branding/css/BBBDefault.css.swf" />
10+
<shortcutKeys userSelectionEnabled="true" />
11+
<layout showLogButton="false" showVideoLayout="false" showResetLayout="true" defaultLayout="Default"
12+
showToolbar="true" showFooter="true" showHelpButton="true" showLogoutWindow="true"/>
13+
14+
<modules>
15+
16+
<module name="ChatModule" url="http://HOST/client/ChatModule.swf?v=VERSION"
17+
uri="rtmp://HOST/bigbluebutton"
18+
dependsOn="ViewersModule"
19+
translationOn="false"
20+
translationEnabled="false"
21+
privateEnabled="true"
22+
position="top-right"
23+
baseTabIndex="701"
24+
/>
25+
26+
<module name="ViewersModule" url="http://HOST/client/ViewersModule.swf?v=VERSION"
27+
uri="rtmp://HOST/bigbluebutton"
28+
host="http://HOST/bigbluebutton/api/enter"
29+
allowKickUser="false"
30+
baseTabIndex="201"
31+
/>
32+
33+
<module name="ListenersModule" url="http://HOST/client/ListenersModule.swf?v=VERSION"
34+
uri="rtmp://HOST/bigbluebutton"
35+
recordingHost="http://HOST"
36+
position="bottom-left"
37+
baseTabIndex="301"
38+
/>
39+
40+
<!--
41+
<module name="ParticipantsModule" url="http://HOST/client/ParticipantsModule.swf?v=VERSION"
42+
uri="rtmp://HOST/bigbluebutton"
43+
/>
44+
-->
45+
46+
<module name="DeskShareModule"
47+
url="http://HOST/client/DeskShareModule.swf?v=4105"
48+
uri="rtmp://HOST/deskShare"
49+
autoStart="false"
50+
baseTabIndex="101"
51+
/>
52+
53+
<module name="PhoneModule" url="http://HOST/client/PhoneModule.swf?v=VERSION"
54+
uri="rtmp://HOST/sip"
55+
autoJoin="true"
56+
skipCheck="false"
57+
showButton="true"
58+
enabledEchoCancel="true"
59+
dependsOn="ViewersModule"
60+
/>
61+
62+
<module name="VideoconfModule" url="http://HOST/client/VideoconfModule.swf?v=VERSION"
63+
uri="rtmp://HOST/video"
64+
dependson = "ViewersModule"
65+
videoQuality = "100"
66+
presenterShareOnly = "false"
67+
controlsForPresenter = "false"
68+
resolutions = "320x240,640x480,1280x720"
69+
autoStart = "false"
70+
showButton = "true"
71+
showCloseButton = "true"
72+
publishWindowVisible = "true"
73+
viewerWindowMaxed = "false"
74+
viewerWindowLocation = "top"
75+
camKeyFrameInterval = "30"
76+
camModeFps = "10"
77+
camQualityBandwidth = "0"
78+
camQualityPicture = "90"
79+
smoothVideo="false"
80+
applyConvolutionFilter="false"
81+
convolutionFilter="-1, 0, -1, 0, 6, 0, -1, 0, -1"
82+
filterBias="0"
83+
filterDivisor="4"
84+
enableH264 = "true"
85+
h264Level = "2.1"
86+
h264Profile = "main"
87+
displayAvatar = "false"
88+
/>
89+
90+
<module name="WhiteboardModule" url="http://HOST/client/WhiteboardModule.swf?v=4105"
91+
uri="rtmp://HOST/bigbluebutton"
92+
dependsOn="PresentModule"
93+
baseTabIndex="601"
94+
/>
95+
96+
<!--
97+
<module name="PollingModule" url="http://HOST/client/PollingModule.swf?v=VERSION"
98+
uri="rtmp://HOST/bigbluebutton"
99+
dependsOn="PresentModule"
100+
/>
101+
-->
102+
103+
<module name="PresentModule" url="http://HOST/client/PresentModule.swf?v=VERSION"
104+
uri="rtmp://HOST/bigbluebutton"
105+
host="http://HOST"
106+
showPresentWindow="true"
107+
showWindowControls="true"
108+
dependsOn="ViewersModule"
109+
baseTabIndex="501"
110+
/>
111+
112+
<module name="VideodockModule" url="http://HOST/client/VideodockModule.swf?v=VERSION"
113+
uri="rtmp://HOST/bigbluebutton"
114+
dependsOn="VideoconfModule, ViewersModule"
115+
autoDock="true"
116+
showControls="true"
117+
maximizeWindow="false"
118+
position="bottom-right"
119+
width="172"
120+
height="179"
121+
layout="smart"
122+
oneAlwaysBigger="false"
123+
baseTabIndex="401"
124+
/>
125+
126+
<module name="LayoutModule" url="http://HOST/client/LayoutModule.swf?v=VERSION"
127+
uri="rtmp://HOST/bigbluebutton"
128+
layoutConfig="http://HOST/client/conf/layout.xml"
129+
enableEdit="true"
130+
/>
131+
132+
<!--
133+
<module name="NotesModule" url="http://HOST/client/NotesModule.swf?v=VERSION"
134+
saveURL="http://HOST"
135+
position="top-left"
136+
/>
137+
138+
<module name="BroadcastModule" url="http://HOST/client/BroadcastModule.swf?v=VERSION"
139+
uri="rtmp://HOST/bigbluebutton"
140+
streamsUri="http://HOST/streams.xml"
141+
position="top-left"
142+
showStreams="true"
143+
autoPlay="false"
144+
dependsOn="ViewersModule"
145+
/>
146+
-->
147+
148+
</modules>
149+
</config>

0 commit comments

Comments
 (0)