BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
@deniszgonjanin 2011-03-04 17:36:10 -05:00
commit 46eae2e4ec
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bigbluebutton-client/build.xml
View File

@ -26,6 +26,7 @@
<property name="WHITEBOARD" value="WhiteboardModule" /> <property name="WHITEBOARD" value="WhiteboardModule" />
<property name="DYN_INFO" value="DynamicInfoModule" /> <property name="DYN_INFO" value="DynamicInfoModule" />
<property name="BREAKOUT" value="BreakoutModule" /> <property name="BREAKOUT" value="BreakoutModule" />
<property name="CLASSROOM_AUDIO" value="ClassroomAudioModule" />
<property name="AVAILABLE_LOCALES" value="az_AZ,bg_BG,cs_CZ,da_DK,de_DE,el_GR,en_US,es_ES,es_LA,fa_IR,fr_FR,fr_CA,hu_HU,it_IT,ja_JP,lv_LV,lt_LT,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,sv_SE,th_TH,tr_TR,vi_VN,uk_UA,zh_CN,zh_TW"/> <property name="AVAILABLE_LOCALES" value="az_AZ,bg_BG,cs_CZ,da_DK,de_DE,el_GR,en_US,es_ES,es_LA,fa_IR,fr_FR,fr_CA,hu_HU,it_IT,ja_JP,lv_LV,lt_LT,nb_NO,nl_NL,pl_PL,pt_BR,pt_PT,ro_RO,ru_RU,sv_SE,th_TH,tr_TR,vi_VN,uk_UA,zh_CN,zh_TW"/>
@ -162,6 +163,10 @@
</copy> </copy>
</target> </target>
<target name="build-classroom-audio" description="Compile Classroom Audio Module">
<build-module src="${SRC_DIR}" target="${CLASSROOM_AUDIO}" />
</target>
<target name="build-video" description="Compile Video Module"> <target name="build-video" description="Compile Video Module">
<build-module src="${SRC_DIR}" target="${VIDEO}" /> <build-module src="${SRC_DIR}" target="${VIDEO}" />
</target> </target>
@ -182,7 +187,7 @@
<!-- just a grouping of modules to compile --> <!-- just a grouping of modules to compile -->
<target name="build-deskshare-phone-video-whiteboard-dyn" <target name="build-deskshare-phone-video-whiteboard-dyn"
depends="build-deskshare, build-phone, build-video, build-whiteboard, build-dyn" depends="build-deskshare, build-phone, build-video, build-whiteboard, build-dyn, build-classroom-audio"
description="Compile deskshare, phone, video, whiteboard, dynamic info modules"> description="Compile deskshare, phone, video, whiteboard, dynamic info modules">
</target> </target>

5
bigbluebutton-client/resources/config.xml.template
View File

@ -40,6 +40,11 @@
dependsOn="ViewersModule" dependsOn="ViewersModule"
/> />
<!--<module name="ClassroomAudioModule" url="ClassroomAudioModule.swf?v=VERSION"
uri="rtmp://HOST/sip"
dependsOn="ViewersModule"
/>-->
<!--<module name="ClassroomAudioModule" url="ClassroomAudioModule.swf?v=VERSION" <!--<module name="ClassroomAudioModule" url="ClassroomAudioModule.swf?v=VERSION"
uri="rtmp://HOST/sip" uri="rtmp://HOST/sip"
pushToTalkEnabled="true" pushToTalkEnabled="true"