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 2011/12/21 13:12:46 UTC
svn commit: r1221690 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ WebContent/openmeetings/ WebContent/src/base/
WebContent/src/modules/conference/conference/
WebContent/src/modules/conference/flexibleConferenceRoom/ WebContent...
Author: sebawagner
Date: Wed Dec 21 12:12:44 2011
New Revision: 1221690
URL: http://svn.apache.org/viewvc?rev=1221690&view=rev
Log:
OPENMEETINGS-4 Microphone rooms I made some changes to the code:
You've placed the bottom bar in the video view on y="${this.height}" so that it does not cover the webcam video, however I would prefer having the views inside the width and height of the view instead of attaching it to the bottom. It seems to me like otherwise the drop-shadow of the video-pods doesn't work as it is calced/based on the width/height of the video-pod's view.
So I changed:
videoObjectBroadcast.lzx
videoObjectPlayBroadcast.lzx
method: setDefaultVideoSize(w,h)
to calc additionally the bottom bar size into the resulting video size
setDefaultVideoSize(w,h) is triggered by editRecordStream.lzx Line 135
By using that we don't need "_resizeviewMicro" view and only use the resizeview
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Wed Dec 21 12:12:44 2011
@@ -4306,4 +4306,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Wed Dec 21 12:12:44 2011
@@ -4304,4 +4304,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Wed Dec 21 12:12:44 2011
@@ -4311,4 +4311,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Wed Dec 21 12:12:44 2011
@@ -4304,4 +4304,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Wed Dec 21 12:12:44 2011
@@ -4301,4 +4301,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>You have the right to give exclusive audio. Click here to make yourself exclusive audio (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Wed Dec 21 12:12:44 2011
@@ -4304,4 +4304,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Wed Dec 21 12:12:44 2011
@@ -4378,4 +4378,10 @@ transmitowania gÅosu i obrazu wideo.<
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Wed Dec 21 12:12:44 2011
@@ -4311,4 +4311,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Wed Dec 21 12:12:44 2011
@@ -4313,4 +4313,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Wed Dec 21 12:12:44 2011
@@ -4304,4 +4304,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Wed Dec 21 12:12:44 2011
@@ -4305,4 +4305,10 @@ see http://code.google.com/p/openmeeting
<string id="1433" name="exclusive_audio_action">
<value>Give exclusive audio to me (alternatively click on your video pod or press F12)</value>
</string>
+ <string id="1434" name="micro is on">
+ <value>Microphone is on!</value>
+ </string>
+ <string id="1435" name="micro is off">
+ <value>Microphone is muted</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml Wed Dec 21 12:12:44 2011
@@ -319,6 +319,16 @@ of the red5-servlet
<interviewRoomModule>interviewConferenceRoom</interviewRoomModule>
<!-- #############################################
+ Restricted Microphones Room
+ -->
+<restrictedMicrophonesRoomModule>restrictedMicrophonesRoom</restrictedMicrophonesRoomModule>
+
+<!-- #############################################
+ Conference Microphones Room
+ -->
+<conferenceMicrophonesRoomModule>conferenceMicrophonesRoom</conferenceMicrophonesRoomModule>
+
+<!-- #############################################
Event Room Modules
-->
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd Wed Dec 21 12:12:44 2011
@@ -51,6 +51,8 @@
<xs:element ref="eventRoomModule"/>
<xs:element ref="restrictedRoomModule"/>
<xs:element ref="interviewRoomModule"/>
+ <xs:element ref="restrictedMicrophonesRoomModule"/>
+ <xs:element ref="conferenceMicrophonesRoomModule"/>
<xs:element ref="recordModule"/>
<xs:element ref="userSettingsModule"/>
</xs:sequence>
@@ -120,6 +122,8 @@
<xs:element name="eventRoomModule" type="xs:NCName"/>
<xs:element name="restrictedRoomModule" type="xs:NCName"/>
<xs:element name="interviewRoomModule" type="xs:NCName"/>
+ <xs:element name="restrictedMicrophonesRoomModule" type="xs:NCName"/>
+ <xs:element name="conferenceMicrophonesRoomModule" type="xs:NCName"/>
<xs:element name="recordModule" type="xs:NCName"/>
<xs:element name="userSettingsModule" type="xs:NCName"/>
</xs:schema>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx Wed Dec 21 12:12:44 2011
@@ -91,6 +91,16 @@ these properties can be overwritten by c
<attribute name="interviewRoomModule" value="interviewConferenceRoom" type="string" />
<!-- #############################################
+ Restricted Microphones Room
+ -->
+<attribute name="restrictedMicrophonesRoomModule" value="restrictedMicrophonesRoom" type="string" />
+
+<!-- #############################################
+ Conference Microphones Room
+ -->
+<attribute name="conferenceMicrophonesRoomModule" value="conferenceMicrophonesRoom" type="string" />
+
+<!-- #############################################
Event Room Modules
-->
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx Wed Dec 21 12:12:44 2011
@@ -133,6 +133,10 @@
this.roomClassName = canvas.interviewRoomModule;
} else if (this.roomType == 5) {
this.roomClassName = canvas.customRoomModule;
+ } else if (this.roomType == 6) {
+ this.roomClassName = canvas.restrictedMicrophonesRoomModule;
+ } else if (this.roomType == 7) {
+ this.roomClassName = canvas.conferenceMicrophonesRoomModule;
} else {
if ($debug) Debug.warn("Not known RoomType: ",this.roomType);
}
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx?rev=1221690&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx Wed Dec 21 12:12:44 2011
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="conferenceMicrophonesRoom" extends="baseConferenceRoom">
+
+ <handler name="oninit">
+
+ if (this.roomobj.hideTopBar == null || !this.roomobj.hideTopBar) {
+ new lz.conferenceMenubar(canvas._conferencemenu);
+ canvas._conferencemenu.setAttribute('visibility','visible');
+ } else {
+ canvas._mainbgcontentNavi.setAttribute('height',0);
+ canvas.setAttribute('naviHeight',0);
+ canvas.setAttribute('naviHeightDelta',0);
+ canvas._conferencemenu.setAttribute('visibility','hidden');
+ canvas._mainbgcontentNavi.setAttribute('visibility','hidden');
+ }
+
+ new lz.moderationPanel(canvas._moderatormenu,{
+ name:'_moderationPanel',align:'right',
+ allowUserQuestions:this.roomobj.allowUserQuestions,
+ roomName:this.roomobj.name
+ });
+
+ //,{x:this.roomobj.moderationPanelXPosition}
+
+ if(roomobj.appointment){
+ canvas.appointmentNotificationPopUp =
+ new lz.appointmentNotificationPopUp(canvas.conferenceView,{
+ name:'appDetail', roomobj:this.roomobj });
+ } else{
+ if ($debug) Debug.write("no appointed meeting");
+ }
+
+ if (this.roomobj.isDemoRoom) {
+ if (this.roomobj.demoTime != null) {
+ if ($debug) Debug.warn("THIS IS A DEMO ROOM THAT SHOULD CLOSE AFTER SEC: ",this.roomobj.demoTime);
+ this.meetingTimer = new lz.meetingTimer(canvas,{refObj:this,roomobj:this.roomobj});
+ }
+ }
+
+ canvas.currentBaseConferenceRoom = this;
+
+ this._chatPanelStrict.toggleopen();
+
+ </handler>
+
+ <handler name="ontabcontentleave">
+ if ($debug) Debug.write("################# ontabcontentleave:",this);
+
+ canvas.currentBaseConferenceRoom = null;
+
+ //reset the right to draw on WHiteboard as the RoomClient Object will be destroyed also
+ //on server-Side the canDraw status will be false again when you relogin the same room
+ canvas.isAllowedToDraw = true;
+
+ _mainScrollBar.setAttribute("visibility","visible");
+
+ if (canvas._videocontainer!=null){
+ canvas._videocontainer.resetAllValues();
+ canvas._videocontainer = null;
+ }
+ if (canvas._chatcontent!=null){
+ canvas._chatcontent = null;
+ }
+ if (canvas._mymod!=null){
+ canvas._mymod = null;
+ }
+
+ if (this.meetingTimer != null) {
+ this.meetingTimer.close();
+ }
+
+ if (canvas._drawarea.letterObjectIsActive){
+ canvas._drawarea.currentletterObj.destroy();
+ }
+
+ if (canvas.currentFileExplorer != null) {
+ canvas.currentFileExplorer = null;
+ }
+
+ if (canvas.currentActivityList != null) {
+ canvas.currentActivityList = null;
+ }
+
+ canvas._screens.clearAllSessions();
+ this.logicalRoomLeave.doCall();
+ if ($debug) Debug.write("############ this.logicalRoomLeave ",this.logicalRoomLeave);
+ </handler>
+
+ <netRemoteCallHib name="logicalRoomLeave" funcname="logicalRoomLeave" remotecontext="$once{ canvas.thishib }" >
+ <handler name="ondata" args="value">
+ if ($debug) Debug.write("############# logicalRoomLeave: ",value);
+ //this.parent.destroy();
+ canvas.thishib.reconnectAfterRoomleft = true;
+ canvas.thishib.reconnectedRoomInstance = this.parent;
+
+ // Reconnect User to default Scope
+ canvas.thishib.userScope = "hibernate";
+ var src = hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ canvas.thishib.setAttribute('src',src);
+ canvas.thishib.disconnect();
+ canvas._mainbgcontentNavi.setAttribute('height',canvas.naviHeight);
+ canvas.setAttribute('naviHeightDelta',canvas.naviHeight);
+ canvas._conferencemenu.removeAll();
+ canvas._conferencemenu.setAttribute('visibility','hidden');
+ </handler>
+ </netRemoteCallHib>
+
+ <conferenceRoomSidebar name="_sidePanel" />
+
+ <baseTabChatPanel name="_chatPanelStrict" labelid="616"
+ height="200" x="${ parent._sidePanel.width }"
+ y="${ canvas.height - (this.height) - 28 }"
+ width="${ canvas.width - parent._sidePanel.width }" />
+
+ <fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
+ y="0" x="${ parent._sidePanel.width }" restricted="true"
+ width="${ canvas.width - parent._sidePanel.width }"
+ height="${ canvas.height - (parent._chatPanelStrict.height) - 28 }" />
+
+ <!--
+ ###############################
+ This is the container for all Videos
+ -->
+ <commonVideoViewContent name="_videoviewcontent" />
+
+</class>
+
+</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/library.lzx Wed Dec 21 12:12:44 2011
@@ -20,5 +20,7 @@
<include href="flexibleEventRoom.lzx" />
<include href="restrictedConferenceRoom.lzx" />
<include href="interviewConferenceRoom.lzx" />
+ <include href="restrictedMicrophonesRoom.lzx" />
+ <include href="conferenceMicrophonesRoom.lzx" />
</library>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx?rev=1221690&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx Wed Dec 21 12:12:44 2011
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="restrictedMicrophonesRoom" extends="baseConferenceRoom">
+
+ <handler name="oninit">
+ new lz.restrictedConferenceMenubar(canvas._conferencemenu);
+
+ new lz.moderationPanel(canvas._conferencemenu,{
+ name:'_moderationPanel',align:'right',
+ allowUserQuestions:this.roomobj.allowUserQuestions
+ });
+
+ canvas._conferencemenu.setAttribute('visibility','visible');
+
+ if ($debug) Debug.write("this.roomobj ",this.roomobj);
+
+ if(this.roomobj.appointment){
+ canvas.appointmentNotificationPopUp =
+ new lz.appointmentNotificationPopUp(canvas.conferenceView,{
+ name:'appDetail', roomobj:this.roomobj });
+ } else{
+ if ($debug) Debug.write("no appointed meeting");
+ }
+
+ if (this.roomobj.isDemoRoom) {
+ if (this.roomobj.demoTime != null) {
+ if ($debug) Debug.warn("THIS IS A DEMO ROOM THAT SHOULD CLOSE AFTER SEC: ",this.roomobj.demoTime);
+ this.meetingTimer = new lz.meetingTimer(canvas,{refObj:this,roomobj:this.roomobj});
+ }
+ }
+
+ this._chatPanelStrict.toggleopen();
+
+ canvas.currentBaseConferenceRoom = this;
+
+ canvas._videocontainer.setAttribute("allowUserQuestions",this.roomobj.allowUserQuestions);
+
+ </handler>
+
+ <handler name="ontabcontentleave">
+ if ($debug) Debug.write("################# ontabcontentleave:",this);
+
+ canvas.currentBaseConferenceRoom = null;
+
+ //reset the right to draw on WHiteboard as the RoomClient Object will be destroyed also
+ //on server-Side the canDraw status will be false again when you relogin the same room
+ canvas.isAllowedToDraw = true;
+
+ _mainScrollBar.setAttribute("visibility","visible");
+
+ if (canvas._videocontainer!=null){
+ canvas._videocontainer.resetAllValues();
+ canvas._videocontainer = null;
+ }
+ if (canvas._chatcontent!=null){
+ canvas._chatcontent = null;
+ }
+ if (canvas._mymod!=null){
+ canvas._mymod = null;
+ }
+
+ if (this.meetingTimer != null) {
+ this.meetingTimer.close();
+ }
+
+ if (canvas._drawarea.letterObjectIsActive){
+ canvas._drawarea.currentletterObj.destroy();
+ }
+
+ if (canvas.currentFileExplorer != null) {
+ canvas.currentFileExplorer = null;
+ }
+
+ if (canvas.currentActivityList != null) {
+ canvas.currentActivityList = null;
+ }
+
+ canvas._screens.clearAllSessions();
+ this.logicalRoomLeave.doCall();
+ if ($debug) Debug.write("############ this.logicalRoomLeave ",this.logicalRoomLeave);
+ </handler>
+
+ <netRemoteCallHib name="logicalRoomLeave" funcname="logicalRoomLeave" remotecontext="$once{ canvas.thishib }" >
+ <handler name="ondata" args="value">
+ if ($debug) Debug.write("############# logicalRoomLeave: ",value);
+ //this.parent.destroy();
+ canvas.thishib.reconnectAfterRoomleft = true;
+ canvas.thishib.reconnectedRoomInstance = this.parent;
+
+ // Reconnect User to default Scope
+ canvas.thishib.userScope = "hibernate";
+ var src = hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
+ canvas.thishib.setAttribute('src',src);
+ canvas.thishib.disconnect();
+ canvas._mainbgcontentNavi.setAttribute('height',canvas.naviHeight);
+ canvas.setAttribute('naviHeightDelta',canvas.naviHeight);
+ canvas._conferencemenu.removeAll();
+ canvas._conferencemenu.setAttribute('visibility','hidden');
+ </handler>
+ </netRemoteCallHib>
+
+ <restrictedRoomSidebar name="_sidePanel" restricted="true"
+ listType="eventUserListTableWithNames" />
+
+ <baseTabChatPanel name="_chatPanelStrict" labelid="616"
+ height="200" x="${ parent._sidePanel.width }"
+ y="${ canvas.height - (this.height) - 28 }"
+ width="${ canvas.width - parent._sidePanel.width }" />
+
+ <fixedFileExplorerWhiteboardPanel name="_whiteboard" labelid="615"
+ y="0" x="${ parent._sidePanel.width }" restricted="true"
+ width="${ canvas.width - parent._sidePanel.width }"
+ height="${ canvas.height - (parent._chatPanelStrict.height) - 28 }" />
+
+ <!--
+ ###############################
+ This is the container for all Videos
+ -->
+ <commonVideoViewContent name="_videoviewcontent" />
+
+</class>
+
+</library>
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListInner.lzx Wed Dec 21 12:12:44 2011
@@ -307,6 +307,7 @@
list.subviews[i].setAttribute("canDraw",records[i].canDraw);
list.subviews[i].setAttribute("canShare",records[i].canShare);
list.subviews[i].setAttribute("canRemote",records[i].canRemote);
+ list.subviews[i].setAttribute("canGiveAudio",records[i].canGiveAudio);
list.subviews[i].setAttribute("micMuted",records[i].micMuted);
list.subviews[i].setAttribute("isMod",records[i].isMod);
list.subviews[i].isBroadcasting = records[i].isBroadcasting;
@@ -333,6 +334,7 @@
list.subviews[i].setAttribute("canDraw",false);
list.subviews[i].setAttribute("canShare",false);
list.subviews[i].setAttribute("canRemote",false);
+ list.subviews[i].setAttribute("canGiveAudio",false);
list.subviews[i].setAttribute("micMuted",false);
list.subviews[i].setAttribute("isMod",false);
list.subviews[i].isBroadcasting = false;
@@ -395,6 +397,7 @@
item.setAttribute("canDraw",this.renderList[item.itemId].canDraw);
item.setAttribute("canShare",this.renderList[item.itemId].canShare);
item.setAttribute("canRemote",this.renderList[item.itemId].canRemote);
+ item.setAttribute("canGiveAudio",this.renderList[item.itemId].canGiveAudio);
item.setAttribute("micMuted",this.renderList[item.itemId].micMuted);
item.isBroadcasting = this.renderList[item.itemId].isBroadcasting;
item.setAttribute("isMod",this.renderList[item.itemId].isMod);
@@ -429,6 +432,7 @@
item.setAttribute("canDraw",false);
item.setAttribute("canShare",false);
item.setAttribute("canRemote",false);
+ item.setAttribute("canGiveAudio",false);
item.setAttribute("micMuted",false);
item.setAttribute("isMod",false);
item.isBroadcasting = false;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx Wed Dec 21 12:12:44 2011
@@ -10,6 +10,7 @@
<attribute name="canDraw" value="false" type="boolean" />
<attribute name="canShare" value="false" type="boolean" />
<attribute name="canRemote" value="false" type="boolean" />
+ <attribute name="canGiveAudio" value="false" type="boolean" />
<attribute name="isBroadcasting" value="false" type="boolean" />
<attribute name="micMuted" value="false" type="boolean" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/baseVideoObject.lzx Wed Dec 21 12:12:44 2011
@@ -51,6 +51,8 @@
<attribute name="isShowMicMute" value="false" type="boolean"/>
<attribute name="isMutedByModerator" value="false" type="boolean"/>
+
+ <attribute name="isMicrophonesRoom" value="false" type="boolean"/>
<handler name="onisremote" args="r">
this.isremote = r;
@@ -65,6 +67,7 @@
this._toolbar._showusercontext.setAttribute("visibility","hidden");
this._toolbar._minimize.setAttribute("visibility","hidden");
this._resizeview.setAttribute("visibility","hidden");
+ this._innerbottom.setAttribute("visibility","hidden");
return;
}
@@ -73,9 +76,9 @@
this._toolbar._minimize.setAttribute("visibility","hidden");
this._resizeview.setAttribute("visibility","hidden");
this._toolbar.setAttribute("visibility","hidden");
- this._resizeview.setAttribute("visibility","hidden");
- this._loudness.setAttribute("visibility","hidden");
+ //this._loudness.setAttribute("visibility","hidden");
this._innertop.setAttribute("visibility","hidden");
+ this._innerbottom.setAttribute("visibility","hidden");
//return;
}
@@ -90,11 +93,32 @@
this._toolbar._resync._tip.setAttribute("labelid",610);
}
this._giveExclusiveAudioView.bringToFront();
+
+ var roomType = canvas.currentRoomObject.roomtype;
+ this.isMicrophonesRoom = ('true' == roomType.microphones);
+ if (isMicrophonesRoom) {
+ this._innertop.setAttribute("bgcolor", "0xFF6600");
+ this._innerbottom.setAttribute("bgcolor", "0xFF6600");
+ } else {
+ this._innerbottom.setAttribute("visibility", "hidden");
+ }
]]>
-
</handler>
+ <netRemoteCallHib name="getMicMutedByPublicSID" funcname="getMicMutedByPublicSID" remotecontext="${ canvas.thishib }">
+ <netparam><method name="getValue">return parent.parent.publicSID;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ var rcl = new Object();
+ rcl.publicSID = parent.publicSID;
+ rcl.micMuted = value;
+ canvas.setMuteStatus(rcl);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
<handler name="ony">
<![CDATA[
@@ -330,12 +354,16 @@
if (this.subviews[eg].name != "_toolbar"
&& this.subviews[eg].name != "_innertop"
&& this.subviews[eg].name != "_loudness"
- && this.subviews[eg].name != "_micView") {
+ && this.subviews[eg].name != "_micView"
+ && this.subviews[eg].name != "_innerbottom"
+ && this.subviews[eg].name != "_resizeview") {
this.subviews[eg].setAttribute("visibility","visible");
}
}
-
+ if (isMicrophonesRoom) {
+ this._innerbottom.setAttribute("visibility", "visible");
+ }
this.respectRatio = true;
}
@@ -359,9 +387,18 @@
lz.Cursor.unlock();
</handler>
</text>
- </view>
+ </view>
+
+ <view name="_innerbottom" width="${parent.width }" y="${parent.height - 18 }"
+ height="18" bgcolor="$once{ canvas.basebgcolorizer }">
+ <text text="${canvas.getLabelName(1434)}"
+ width="${ parent.width-2 }" fgcolor="white"
+ name="title"
+ fontsize="9"/>
+ </view>
- <view name="_loudness" x="1" y="${parent.height - 20}">
+ <view name="_loudness" x="1"
+ y="${parent.height - 20 - ((parent._innerbottom.visible) ? 18 : 0) }">
<view x="2" y="2" name="loudness" resource="speaking" opacity="0.2"
onmouseover="" onmouseout="" >
<labelTooltip inittwice="true" labelid="372" />
@@ -378,8 +415,7 @@
</view>
-->
- <view name="_resizeview" x="${ this.parent.width - 17 }"
- y="${ this.parent.height - 17 }"
+ <view name="_resizeview" x="${ this.parent.width - 16 }" valign="bottom"
resource="explorer_resize_rsc" cursor="explorer_resizemouse_rsc"
onmousedown="this.parent.doResize(true)"
onmouseup="this.parent.doResize(false)" >
@@ -631,9 +667,21 @@
if (micMuted) {
this._toolbar._mute._tip.setAttribute("labelid","1406");
this._toolbar._mute._itemRsc.setAttribute('frame',2);
+ if (isMicrophonesRoom) {
+ var label = canvas.getLabelName(1435);
+ this._innertop.setAttribute('bgcolor', canvas.basebgcolorizer);
+ this._innerbottom.setAttribute('bgcolor', canvas.basebgcolorizer);
+ this._innerbottom.title.setAttribute('text', label);
+ }
} else {
this._toolbar._mute._tip.setAttribute("labelid","1405");
this._toolbar._mute._itemRsc.setAttribute('frame',1);
+ if (isMicrophonesRoom) {
+ var label = canvas.getLabelName(1434);
+ this._innertop.setAttribute('bgcolor', "0xFF6600");
+ this._innerbottom.setAttribute('bgcolor', "0xFF6600");
+ this._innerbottom.title.setAttribute('text', label);
+ }
}
]]>
</method>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectBroadcast.lzx Wed Dec 21 12:12:44 2011
@@ -15,12 +15,11 @@
<attribute name="videoInsetX" value="2" type="number" />
<attribute name="videoInsetY" value="21" type="number" />
+ <attribute name="bottomBarWidth" value="0" type="number" />
<handler name="oninit">
<![CDATA[
- //Display widget defined in mother class
- this.syncuser.bringToFront()
- this._loudness.bringToFront();
+ this._loudness.bringToFront();
this.showuser.bringToFront();
this._resizeview.bringToFront();
]]>
@@ -31,12 +30,17 @@
-->
<method name="setDefaultVideoSize" args="w,h">
this.setAttribute("width",w+this.videoInsetX);
- this.setAttribute("height",h+this.videoInsetY);
+ var roomType = canvas.currentRoomObject.roomtype;
+ this.isMicrophonesRoom = ('true' == roomType.microphones);
+ if (isMicrophonesRoom) {
+ this.setAttribute("bottomBarWidth",this._innertop.height);
+ }
+ this.setAttribute("height",h+this.videoInsetY+this.bottomBarWidth);
</method>
<view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
y="$once{ parent.videoInsetY-1 }"
- height="${parent.height-parent.videoInsetY}"
+ height="${parent.height-parent.videoInsetY-parent.bottomBarWidth}"
width="${parent.width-parent.videoInsetX}">
<view name="r" resource="chatbgitem" x="1" y="2" stretches="both"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/video/videoObjectPlayBroadcast.lzx Wed Dec 21 12:12:44 2011
@@ -15,13 +15,12 @@
<attribute name="videoInsetX" value="2" type="number" />
<attribute name="videoInsetY" value="21" type="number" />
+ <attribute name="bottomBarWidth" value="0" type="number" />
<handler name="oninit">
<![CDATA[
if ($debug) Debug.write("Init videoObjectPlayBroadcast ",this.name);
-
//Display widget defined in mother class
- this.syncuser.bringToFront()
this._loudness.bringToFront();
this.showuser.bringToFront();
this._resizeview.bringToFront();
@@ -33,12 +32,19 @@
-->
<method name="setDefaultVideoSize" args="w,h">
this.setAttribute("width",w+this.videoInsetX);
- this.setAttribute("height",h+this.videoInsetY);
+
+ var roomType = canvas.currentRoomObject.roomtype;
+ this.isMicrophonesRoom = ('true' == roomType.microphones);
+ if (isMicrophonesRoom) {
+ this.setAttribute("bottomBarWidth",this._innertop.height);
+ }
+
+ this.setAttribute("height",h+this.videoInsetY+this.bottomBarWidth);
</method>
<view name="_chatvideoinner" x="$once{ parent.videoInsetX-1 }"
y="$once{ parent.videoInsetY-1 }"
- height="${parent.height-parent.videoInsetY}"
+ height="${parent.height-parent.videoInsetY-parent.bottomBarWidth}"
width="${parent.width-parent.videoInsetX}" >
<attribute name="initH"/>
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java Wed Dec 21 12:12:44 2011
@@ -67,12 +67,13 @@ public class Roommanagement {
* @param name
* @return ID of new created roomtype or null
*/
- public Long addRoomType(String name) {
+ public Long addRoomType(String name, Boolean microphones) {
try {
RoomTypes rtype = new RoomTypes();
rtype.setName(name);
rtype.setStarttime(new Date());
rtype.setDeleted("false");
+ rtype.setMicrophones(microphones.toString());
rtype = em.merge(rtype);
long returnId = rtype.getRoomtypes_id();
return returnId;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java Wed Dec 21 12:12:44 2011
@@ -496,19 +496,25 @@ public class ImportInitvalues {
public void loadDefaultRooms(boolean createRooms) {
- long conference_Id = roommanagement.addRoomType("conference");
+ long conference_Id = roommanagement.addRoomType("conference", false);
log.debug("conference_Id: " + conference_Id);
- long audience_Id = roommanagement.addRoomType("audience");
+ long audience_Id = roommanagement.addRoomType("audience", false);
log.debug("audience_Id: " + audience_Id);
- long restricted_Id = roommanagement.addRoomType("restricted");
+ long restricted_Id = roommanagement.addRoomType("restricted", false);
log.debug("restricted_Id: " + restricted_Id);
- long interview_Id = roommanagement.addRoomType("interview");
+ long interview_Id = roommanagement.addRoomType("interview", false);
log.debug("interview_Id: " + interview_Id);
- long custom_Id = roommanagement.addRoomType("custom");
+ long custom_Id = roommanagement.addRoomType("custom", false);
log.debug("custom_Id: " + custom_Id);
+
+ long restr_micro_Id = roommanagement.addRoomType("restricted microphones", true);
+ log.debug("restr_micro_Id: " + restr_micro_Id);
+
+ long conf_micro_Id = roommanagement.addRoomType("conference microphones", true);
+ log.debug("conf_micro_Id: " + conf_micro_Id);
if (createRooms) {
roommanagement.addRoom(3, "public Interview Room", interview_Id, "",
@@ -531,6 +537,14 @@ public class ImportInitvalues {
roommanagement.addRoom(3, "public Restricted Room", restricted_Id, "",
new Long(100), true, null, false, false, null, false, null,
true, false, false, "", "", "", null, null, null, false);
+
+ roommanagement.addRoom(3, "restricted Microphones Room", restr_micro_Id, "",
+ new Long(100), true, null, false, false, null, false, null,
+ true, false, false, "", "", "", null, null, null, false);
+
+ roommanagement.addRoom(3, "conference Microphones Room", conf_micro_Id, "",
+ new Long(32), true, null, false, false, null, false, null,
+ true, false, false, "", "", "", null, null, null, false);
long room2 = roommanagement.addRoom(3, "private Conference Room",
conference_Id, "", new Long(32), false, null, false, false,
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/rooms/RoomTypes.java Wed Dec 21 12:12:44 2011
@@ -28,6 +28,8 @@ public class RoomTypes implements Serial
private String name;
@Column(name = "deleted")
private String deleted;
+ @Column(name = "microphones")
+ private String microphones;
public String getName() {
@@ -64,4 +66,12 @@ public class RoomTypes implements Serial
public void setDeleted(String deleted) {
this.deleted = deleted;
}
+
+ public String getMicrophones() {
+ return microphones;
+ }
+
+ public void setMicrophones(String microphones) {
+ this.microphones = microphones;
+ }
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java?rev=1221690&r1=1221689&r2=1221690&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/WhiteBoardService.java Wed Dec 21 12:12:44 2011
@@ -334,22 +334,12 @@ public class WhiteBoardService implement
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkUserLevel(user_level)) {
-
if (currentClient.getIsMod()) {
RoomClient rcl = this.clientListManager
.getClientByPublicSID(publicSID);
if (rcl != null) {
- rcl.setCanGiveAudio(canGiveAudio);
- this.clientListManager.updateClientByStreamId(
- rcl.getStreamid(), rcl);
-
- HashMap<Integer, Object> newMessage = new HashMap<Integer, Object>();
- newMessage.put(0, "updateGiveAudioStatus");
- newMessage.put(1, rcl);
- this.scopeApplicationAdapter
- .sendMessageWithClient(newMessage);
-
+ setCanGiveAudio(rcl, canGiveAudio);
} else {
return false;
}
@@ -364,6 +354,18 @@ public class WhiteBoardService implement
return null;
}
+ public void setCanGiveAudio(RoomClient rcl, boolean canGiveAudio) {
+ rcl.setCanGiveAudio(canGiveAudio);
+ this.clientListManager.updateClientByStreamId(
+ rcl.getStreamid(), rcl);
+
+ HashMap<Integer, Object> newMessage = new HashMap<Integer, Object>();
+ newMessage.put(0, "updateGiveAudioStatus");
+ newMessage.put(1, rcl);
+ this.scopeApplicationAdapter
+ .sendMessageWithClient(newMessage);
+ }
+
public WhiteboardSyncLockObject startNewSyncprocess() {
try {
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=1221690&r1=1221689&r2=1221690&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 Wed Dec 21 12:12:44 2011
@@ -26,6 +26,7 @@ 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;
@@ -1378,6 +1379,30 @@ public class ScopeApplicationAdapter ext
return 0L;
}
+ public synchronized Boolean getMicMutedByPublicSID(String publicSID) {
+ try {
+ log.debug("*..*getMicMutedByPublicSID publicSID: " + publicSID);
+
+ IConnection current = Red5.getConnectionLocal();
+ RoomClient currentClient = this.clientListManager.getClientByPublicSID(publicSID);
+ if (currentClient == null) {
+ return true;
+ }
+
+ //Put the mod-flag to true for this client
+ Boolean muted = currentClient.getMicMuted();
+ log.debug("*..*getMicMutedByPublicSID hasFloor: " + muted);
+ if (null == muted) {
+ muted = true;
+ }
+
+ return muted;
+ } catch (Exception err) {
+ log.error("[getMicMutedByPublicSID]",err);
+ }
+ return true;
+ }
+
/**
* Invoked by a User whenever he want to become moderator this is needed,
* cause if the room has no moderator yet there is no-one he can ask to get
@@ -1621,6 +1646,12 @@ public class ScopeApplicationAdapter ext
this.clientListManager.updateClientByStreamId(streamid,
currentClient);
+ Rooms room = roommanagement.getRoomById(room_id);
+ RoomTypes type = room.getRoomtype();
+ if (type.getMicrophones().equals( Boolean.TRUE.toString() )) {
+ whiteBoardService.setCanGiveAudio(currentClient, true);
+ }
+
// Log the User
conferenceLogDao.addConferenceLog("roomEnter",
currentClient.getUser_id(), streamid, room_id,
@@ -1640,8 +1671,6 @@ public class ScopeApplicationAdapter ext
.getRoomClients(room_id);
// appointed meeting or moderated Room?
- Rooms room = roommanagement.getRoomById(room_id);
-
// Check Max Users first
if (room.getNumberOfPartizipants() != null
&& clientListRoom.size() > room.getNumberOfPartizipants()) {