You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/02/02 11:29:57 UTC
svn commit: r1239519 [2/2] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ WebContent/openmeetings/
WebContent/openmeetings/swf10/ WebContent/openmeetings/swf10/base/
WebContent/openmeetings/swf10/base/components/ WebContent/open...
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1239519&r1=1239518&r2=1239519&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Thu Feb 2 10:29:47 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1239519&r1=1239518&r2=1239519&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Thu Feb 2 10:29:47 2012
@@ -23,7 +23,7 @@ This File is auto-generated by the Langu
to add new Languages or modify/customize it use the LanguageEditor
see http://code.google.com/p/openmeetings/wiki/LanguageEditor for Details
###############################################-->
-<language>
+<language>
<string id="1" name="conference">
<value>Conference</value>
</string>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/base
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/base?rev=1239519&view=auto
==============================================================================
(empty)
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1239519&r1=1239518&r2=1239519&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Thu Feb 2 10:29:47 2012
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,50 +25,64 @@
<!--
##########################################################
these properties will be overwritten by config.xml -->
-
-<!--- URL/IP to use for the Server 192.168.178.28
- inno02.fh-pforzheim.de macbook 192.168.2.103
- 192.168.2.102 bxlug.homelinux.org 213.219.160.72
- if this value is empty it will try to connect to the
+
+<attribute name="vid_lc_name" value="" type="String"/>
+
+<attribute name="lc"/>
+
+<attribute name="rtmp_lc_name" value="" type="String"/>
+
+<attribute name="rtmp_lc"/>
+
+<attribute name="videoComp_lc_name" value="" type="String"/>
+
+<attribute name="videoComp_lc_callback_name" value="" type="String"/>
+
+<attribute name="videoComp_lc"/>
+
+<!--- URL/IP to use for the Server 192.168.178.28
+ inno02.fh-pforzheim.de macbook 192.168.2.103
+ 192.168.2.102 bxlug.homelinux.org 213.219.160.72
+ if this value is empty it will try to connect to the
domain-name it has been loading from
-->
<attribute name="rtmphostlocal" value="" type="string" />
<!---
- Port to use for the Server
- To this port the default server lookup is done
-
- You can find all this configuraiton in your red5-Config in: $RED5_HOME/conf/red5.properties
+ Port to use for the Server
+ To this port the default server lookup is done
+
+ You can find all this configuraiton in your red5-Config in: $RED5_HOME/conf/red5.properties
-->
<attribute name="rtmpport" value="1935" type="string" />
<!---
- Port to use for the Server
- To this port the fallback is done once the default rtmport failed
- this should workaround 99% of all firewalls
+ Port to use for the Server
+ To this port the fallback is done once the default rtmport failed
+ this should workaround 99% of all firewalls
-->
<attribute name="rtmpTunnelport" value="8088" type="string" />
<!---
- Port to use for the Server
- This port is used to connec to the http-servlet
- of the red5-servlet
+ Port to use for the Server
+ This port is used to connec to the http-servlet
+ of the red5-servlet
-->
<attribute name="red5httpport" value="5080" type="string" />
<attribute name="useSSL" value="false" type="boolean" />
<attribute name="rtmpsslport" value="443" type="string" />
-
+
<!---
- These colors are the main colors and style the whole application
+ These colors are the main colors and style the hole application
-->
<attribute name="baseColorScheme" value="lightsteelblue" type="string" />
-<attribute name="basebgcolorizer" value="" type="string" />
-<attribute name="baseMousecolorizer" value="" type="string" />
-<attribute name="baseMouseOvercolorizer" value="" type="string" />
-<attribute name="userbgcolorizer" value="0x3F5B9E" type="string" />
-<attribute name="userMousecolorizer" value="0xC4D5E6" type="string" />
-<attribute name="userMouseOvercolorizer" value="0xC4D5E6" type="string" />
+<attribute name="basebgcolorizer" value="" type="string" />
+<attribute name="baseMousecolorizer" value="" type="string" />
+<attribute name="baseMouseOvercolorizer" value="" type="string" />
+<attribute name="userbgcolorizer" value="0x3F5B9E" type="string" />
+<attribute name="userMousecolorizer" value="0xC4D5E6" type="string" />
+<attribute name="userMouseOvercolorizer" value="0xC4D5E6" type="string" />
<attribute name="bgColorMenu" value="0xEEF0EB" type="string" />
<attribute name="fontColorHeader" value="0x000000" type="string" />
@@ -84,7 +98,7 @@ these properties will be overwritten by
<attribute name="showAudioVideoTest" value="true" type="boolean" />
<!--
- Id of the Recording that is played when access the Recordings Player via Direct Link URL
+ Id of the Recording that is played when access the Recordings Player via Direct Link URL
-->
<attribute name="roomRecordingId" value="0" type="number" />
@@ -123,11 +137,6 @@ these properties will be overwritten by
<attribute name="drawAllowStatus" value="null"/>
-<!-- this attribute holds an object of type RoomClient
-the LAST RoomClient Object that has been changed the giveExclusiveAudio status
--->
-<attribute name="exclusiveAudioAllowStatus" value="null"/>
-
<!--
this value indicates if this user is allowed to draw to the Whiteboard
If this user is currently Moderator => he ALWAYS can draw to whiteboard
@@ -167,9 +176,9 @@ the LAST RoomClient Object that has been
-swagner
-->
<attribute name="_nc" value="null" />
-
+
<attribute name="vaquality" value="best" type="string" />
-
+
<!--
<attribute name="moderatorStreamID" value="" type="string" />
<attribute name="moderatorationObject" value="" type="string" />
@@ -184,9 +193,9 @@ the LAST RoomClient Object that has been
<attribute name="loadingmessage" value="" type="string" />
<!---
- The state of the Application
- At the beginning you should choose how many users are allowed to
- login simultaniously
+ The state of the Application
+ At the beginning you should choose how many users are allowed to
+ login simultaniously
-->
<attribute name="islogedin" value="false" type="boolean" />
@@ -199,8 +208,8 @@ the LAST RoomClient Object that has been
<attribute name="foldersequence" value="null" />
<attribute name="uploadmoduleimgfolder" value="" type="string" />
<!---
- Can be either 2 or 4
- But theoretically there is no limit
+ Can be either 2 or 4
+ But theoretically there is no limit
-->
<attribute name="numberofallowedpartners" value="0" type="number" />
@@ -226,7 +235,7 @@ the LAST RoomClient Object that has been
<attribute name="roomTypesInitValues" value="null" />
<!--- Audio-Video Quality Settings
- overwritten by values from the config.xml
+ overwritten by values from the config.xml
-->
<attribute name="framesPerSecond" value="30" type="number" />
<attribute name="bandwidthNeededNormal" value="16384" type="number" />
@@ -235,7 +244,7 @@ the LAST RoomClient Object that has been
<attribute name="camQualityBest" value="75" type="number" />
<attribute name="microphoneRateNormal" value="22" type="number" />
<attribute name="microphoneRateBest" value="44" type="number" />
-
+
<!--- Reference to the current active drawarea -->
<attribute name="_drawarea" value="null" />
@@ -255,8 +264,8 @@ the LAST RoomClient Object that has been
<!--- User porperties -->
<attribute name="currentusercolor" value="0" type="number" />
<attribute name="currentuserpos" value="0" type="number" />
-
-<attribute name="currentModApply" value="null" />
+
+<attribute name="currentModApply" value="null" />
<attribute name="sessionObject" value="null" />
<attribute name="sessionId" value="" type="string" />
@@ -285,7 +294,7 @@ the LAST RoomClient Object that has been
<attribute name="remoteUserSid" value="" type="string" />
<!--- attributes for direct room access via remoteUser
- This is using the advanced methods to prevent abuse
+ This is using the advanced methods to prevent abuse
-->
<attribute name="secureRemoteUserLogin" value="false" type="boolean" />
<attribute name="secureHash" value="" type="string" />
@@ -315,10 +324,10 @@ and some more references to temp-objects
<attribute name="isrtl" value="false" type="boolean" />
<!---
- Attributes for browser panel size.
- Those attributes are used to determine size of browser class (modules/conference/browser/conferenecBrowser.lzx)
- in base/mainMethods.lzx.
- 2008 Apr 9 commented by onokeiji@gmail.com
+ Attributes for browser panel size.
+ Those attributes are used to determine size of browser class (modules/conference/browser/conferenecBrowser.lzx)
+ in base/mainMethods.lzx.
+ 2008 Apr 9 commented by onokeiji@gmail.com
-->
<attribute name="browserPanelWidth" value="600"/>
<attribute name="browserPanelHeight" value="500"/>
@@ -370,8 +379,6 @@ and some more references to temp-objects
<attribute name="isAllowedToRemoteControl" value="false" type="boolean" />
-<attribute name="isAllowedToGiveExclusiveAudio" value="false" type="boolean" />
-
<attribute name="lzCalendarInfoTab" value="null"/>
<attribute name="roomJumpId" value="0" type="number" />
@@ -379,14 +386,14 @@ and some more references to temp-objects
<attribute name="userContacts" value="null" />
<!--
- Loads a User profile page directly instead of loading the Dashboard
- cuser is a hash that can be found in the UserContacts Table
- -->
+ Loads a User profile page directly instead of loading the Dashboard
+ cuser is a hash that can be found in the UserContacts Table
+ -->
<attribute name="cuser" value="" type="string"/>
<!--
- Indicates if the user does accept or deny a user contact request
- -->
+ Indicates if the user does accept or deny a user contact request
+ -->
<attribute name="cuserStatus" value="none" type="string"/>
<!--
@@ -429,9 +436,4 @@ and some more references to temp-objects
<attribute name="currentMicName" value="" type="string"/>
<attribute name="currentCamName" value="" type="string"/>
-<attribute name="currentBaseConferenceRoom" value="null" />
-
-<!--F12-->
-<attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/>
-
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1239519&r1=1239518&r2=1239519&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Thu Feb 2 10:29:47 2012
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -110,12 +110,12 @@
this.setAttribute('userMousecolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/baseMousecolorizer/text()'));
this.setAttribute('userMouseOvercolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/baseMouseOvercolorizer/text()'));
if (this.baseColorScheme == "lightsteelblue" &&
- (this.userbgcolorizer != "0x3F5B9E"
- || this.baseMousecolorizer != "0xC4D5E6"
- || this.baseMouseOvercolorizer != "0xC4D5E6"))
+ (this.userbgcolorizer != "0x3F5B9E"
+ || this.baseMousecolorizer != "0xC4D5E6"
+ || this.baseMouseOvercolorizer != "0xC4D5E6"))
{
- this.setAttribute('baseColorScheme', "userdefined");
- }
+ this.setAttribute('baseColorScheme', "userdefined");
+ }
this.setColorStyle(this.baseColorScheme);
this.setAttribute('currentappname',canvas.myConfigSet.getPointer().xpathQuery('config/currentappname/text()'));
@@ -176,7 +176,29 @@
this.setAttribute('protocol',canvas.myConfigSet.getPointer().xpathQuery('config/protocol/text()'));
- this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
+ this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
+
+ var pMap = {};
+ if($debug) Debug.write("Param query: ", _url.substr(_url.indexOf("?")+1));
+ var params:Array = _url.substr(_url.indexOf('?')+1).split('&');
+ for(var i:Number=0; i<params.length; i++ ) {
+ if($debug) Debug.write(params[i]);
+ var tokens:Array = params[i].split('=');
+ pMap[tokens[0]] = tokens[1];
+ if($debug) Debug.write("param: ", tokens[0], "=", tokens[1]);
+ }
+
+ if($debug) Debug.write("Params: ", pMap);
+
+ this.setAttribute('lc_SID', pMap['lcSID']);
+ this.setAttribute('vid_lc_name', this.lc_SID + "__videoLC");
+ this.setAttribute('rtmp_lc_name', this.lc_SID + "__rtmpLC");
+ this.setAttribute('videoComp_lc_name', this.lc_SID + "__streamLC");
+ this.setAttribute('videoComp_lc_callback_name', this.lc_SID + "__streamLC_cback");
+
+ var videoComp_lc = new LocalConnection();
+ videoComp_lc.connect(this.videoComp_lc_name);
+ this.setAttribute('videoComp_lc', videoComp_lc);
mainBaseText.setAttribute('text',canvas.currentappname);
@@ -262,9 +284,9 @@
//Lookup additional actions
var tAccept = lz.Browser.getInitArg('tAccept');
if (tAccept != undefined) {
- canvas.cuserStatus = tAccept;
+ canvas.cuserStatus = tAccept;
} else {
- canvas.cuserStatus = "none";
+ canvas.cuserStatus = "none";
}
}
@@ -363,7 +385,7 @@
} else if (stringSub=='importFile') {
//new lz.uploadWindow(canvas.main_content._content.inner,{x:60,uploadmodule:canvas.uploadmoduleimg,isOnlyImage:true});
- new lz.uploadWindowExplorer(canvas.main_content._content.inner,{
+ new lz.uploadWindowExplorer(canvas.main_content._content.inner,{
x:60,uploadmodule:canvas.uploadmoduleimg,
parentFolderId:0,
isOwner:false,
@@ -371,7 +393,7 @@
isOnlyImage:true,
servletName:'FileExplorerUploadHandler'
});
-
+
} else if (stringSub=='applyForMod') {
if ($debug) Debug.info("Apply For Mod through doActionmenu");
//new lz.applyForModeration(canvas.main_content._content.inner);
@@ -392,7 +414,7 @@
if ($debug) Debug.write( "is browser[browserPanelWidth] ? ", browserPanelWidth );
if ($debug) Debug.write( "is browser[browserPanelHeight] ? ", browserPanelHeight );
- //ãã©ã¦ã¶ã®ã¤ã³ã¹ã¿ã³ã¹ã確èªãã¦ãããã°éãããªããã°ä½æãã
+ //ãÆâãÆ©ãâ¦ãâ¶ã�®ãâ¤ãƳãâ¹ãâ¿ãƳãâ¹ãââ確èª�ã�âã�¦ãâ¬ï¿½Ã£ï¿½âãâÅã�°éââ¹Ã£ï¿½ï¿½Ã£â¬âã�ªã�âãâÅã�°ä½ÅæË�ã�â¢Ã£ââ¹
if( !canvas.conferenceBrowserIsinited ){
if ($debug) Debug.write( "if this" );
new lz.conferenceBrowser( canvas.main_content._content.inner,{
@@ -409,7 +431,7 @@
}
}
} else if( stringSub == "browser_close" ){
- // éãã¦ãããã©ã¦ã¶ãã¢ãã¡ã¼ã·ã§ã³ã§ç§»åãããhieght=0
+ // éââ¹Ã£ï¿½âã�¦ã�âãââ¹Ã£ÆâãÆ©ãâ¦ãâ¶ãââãâ¢ãÆâ¹Ã£Æ¡ãƼãâ·ãƧãƳã�§ç§»åâ¹â¢Ã£ï¿½â¢Ã£ââ¹Ã£â¬â¬hieght=0
Debug.write( "is browser[close] ? ", canvas.main_content._content.inner.conferenceBrowser );
with( canvas.main_content._content.inner ){
if( conferenceBrowser != undefined ){
@@ -455,7 +477,7 @@
<netRemoteCallHib name="getVotes" funcname="pollservice.getVotes" remotecontext="$once{ canvas.thishib }" >
<handler name="ondata" args="value">
- new lz.resultPollWin(canvas.main_content._content.inner, {roomPoll: value});
+ new lz.resultPollWin(canvas.main_content._content.inner, {roomPoll: value});
</handler>
</netRemoteCallHib>
@@ -477,18 +499,18 @@
<handler name="ondata" args="value">
<![CDATA[
if (value!=null){
- if ($debug) Debug.write(":: getPoll: ", value);
+ if ($debug) Debug.write(":: getPoll: ", value);
new lz.answerPoll(
- canvas.main_content._content.inner
- , {
- createdBy: value.createdBy.login
- , pollDate: value.created
- , pollQuestion: value.pollQuestion
- , pollTypeId: value.pollType.pollTypesId
- , roomPollAnswerList: value.roomPollAnswerList
- , roomPollId: value.roomPollId
- , roomScopeName: value.roomScopeName
- }
+ canvas.main_content._content.inner
+ , {
+ createdBy: value.createdBy.login
+ , pollDate: value.created
+ , pollQuestion: value.pollQuestion
+ , pollTypeId: value.pollType.pollTypesId
+ , roomPollAnswerList: value.roomPollAnswerList
+ , roomPollId: value.roomPollId
+ , roomScopeName: value.roomScopeName
+ }
);
}
]]>
@@ -797,17 +819,8 @@ if (cItem == null) {
]]>
</method>
-<method name="setExclusiveAudioAllowStatus" args="roomClientObj">
- <![CDATA[
- if ($debug) Debug.write("giveExclusiveAudioStatus changes ###### ");
- if (roomClientObj.publicSID==canvas.publicSID) {
- canvas.setAttribute("isAllowedToGiveExclusiveAudio",roomClientObj.canGiveAudio);
- }
- ]]>
-</method>
-
<method name="setMuteStatus" args="roomClientObj">
- <![CDATA[
+ <![CDATA[
if ($debug) Debug.write("setMuteStatus changes ###### ",roomClientObj.micMuted);
//Check for self status
if (roomClientObj.publicSID==canvas.publicSID) {
@@ -928,31 +941,31 @@ if (cItem == null) {
</method>
<method name="initSharedObject">
- if (canvas.sharedObject == null) {
- if($debug) Debug.write("canvas.initSharedObject sharedObject IS null");
- canvas.sharedObject = new lz.sharedObject();
- canvas.sharedObject.getLocal('userdata');
+ if (canvas.sharedObject == null) {
+ if($debug) Debug.write("canvas.initSharedObject sharedObject IS null");
+ canvas.sharedObject = new lz.sharedObject();
+ canvas.sharedObject.getLocal('userdata');
}
</method>
<method name="getUserData">
- canvas.initSharedObject();
+ canvas.initSharedObject();
var g = canvas.sharedObject.getData('userdata');
if (g==null) {
- if($debug) Debug.write("sharedObject.getData IS null");
- g = new Array();
+ if($debug) Debug.write("sharedObject.getData IS null");
+ g = new Array();
}
return g;
</method>
<method name="setUserData" args="g">
- canvas.initSharedObject();
+ canvas.initSharedObject();
canvas.sharedObject.setData('userdata', g);
canvas.sharedObject.flush();
</method>
<method name="setColorStyle" args="value">
- var val = value;
+ var val = value;
if (val == "mediumseagreen"){
canvas.setAttribute('basebgcolorizer',"0x3CB371");
canvas.setAttribute('baseMousecolorizer',"0x66CC8E");
@@ -982,7 +995,7 @@ if (cItem == null) {
canvas.setAttribute('baseMousecolorizer', canvas.userMousecolorizer);
canvas.setAttribute('baseMouseOvercolorizer', canvas.userMouseOvercolorizer);
} else {
- val = null;
+ val = null;
}
return val;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1239519&r1=1239518&r2=1239519&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Thu Feb 2 10:29:47 2012
@@ -1,6 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<canvas debug="false" width="100%" height="100%" title="OpenMeetings">
-
+ <debug fontsize="11" oninit="Debug.showInternalProperties = true" />
<!--
If you use maindebug.lzx, main.lzx with debug=true is loaded.
h.kuze 2008.3.26
@@ -40,6 +59,7 @@
canvas.setDefaultContextMenu(cmenu);
cmenu.hideBuiltInItems();
if($debug) Debug.write("main.lzx/oninit:",this);
+ canvas.lc = new LocalConnection();
</handler>
@@ -59,6 +79,7 @@
<view name="inner" />
<method name="clearAll">
<![CDATA[
+ canvas.lc.send(canvas.vid_lc_name, "clearAll");
if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll(): ",this.inner,this.inner.subviews.length);
var baseContent = this.inner.subviews[0].close();
for (var eg in this.inner.subviews) {
@@ -156,4 +177,4 @@
<screenSharingContainer name="_screens" />
-</canvas>
+</canvas>
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx?rev=1239519&r1=1239518&r2=1239519&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx Thu Feb 2 10:29:47 2012
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -60,6 +60,7 @@
canvas.setDefaultContextMenu(cmenu);
cmenu.hideBuiltInItems();
if($debug) Debug.write("main.lzx/oninit:",this);
+ canvas.lc = new LocalConnection();
</handler>
@@ -79,6 +80,7 @@
<view name="inner" />
<method name="clearAll">
<![CDATA[
+ canvas.lc.send(canvas.vid_lc_name, "clearAll");
if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll(): ",this.inner,this.inner.subviews.length);
var baseContent = this.inner.subviews[0].close();
for (var eg in this.inner.subviews) {
@@ -156,7 +158,7 @@
</view>
<view name="_moderatormenu" y="0" x="0" width="100%" height="20">
- <method name="removeAll">
+ <method name="removeAll">
<![CDATA[
if($debug) Debug.write("main.lzx/_moderatormenu.removeAll(): ");
while (this.subviews.length > 0) {
@@ -176,4 +178,4 @@
<screenSharingContainer name="_screens" />
-</canvas>
+</canvas>
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1239519&r1=1239518&r2=1239519&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java Thu Feb 2 10:29:47 2012
@@ -44,7 +44,6 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.persistence.beans.calendar.Appointment;
import org.openmeetings.app.persistence.beans.calendar.MeetingMember;
import org.openmeetings.app.persistence.beans.recording.RoomClient;
-import org.openmeetings.app.persistence.beans.rooms.RoomTypes;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.FLVRecorderService;
@@ -1076,7 +1075,7 @@ public class ScopeApplicationAdapter ext
IConnection current = Red5.getConnectionLocal();
// String streamid = current.getClient().getId();
- RoomClient currentClient = this.clientListManager
+ RoomClient currentClient = this.clientListManager
.getClientByPublicSID(publicSID);
if (currentClient == null) {
@@ -1086,9 +1085,9 @@ public class ScopeApplicationAdapter ext
currentClient.setIsBroadcasting(value);
currentClient.setInterviewPodId(interviewPodId);
- // Put the mod-flag to true for this client
- this.clientListManager.updateClientByStreamId(
- currentClient.getStreamid(), currentClient);
+ // Put the mod-flag to true for this client
+ this.clientListManager.updateClientByStreamId(
+ currentClient.getStreamid(), currentClient);
// Notify all clients of the same scope (room)
Collection<Set<IConnection>> conCollection = current.getScope()