You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/04/02 09:39:14 UTC

svn commit: r1463415 - in /openmeetings: branches/2.1/WebContent/src/ branches/2.1/WebContent/src/base/ branches/2.1/WebContent/src/base/hibernate/ branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/ branches/2.1/docs/ branches/2.1/s...

Author: solomax
Date: Tue Apr  2 07:39:13 2013
New Revision: 1463415

URL: http://svn.apache.org/r1463415
Log:
[OPENMEETINGS-589] mute/unmute hot key is added

Removed:
    openmeetings/branches/2.1/WebContent/src/embed-compressed.js
    openmeetings/trunk/singlewebapp/WebContent/src/embed-compressed.js
Modified:
    openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx
    openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx
    openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
    openmeetings/branches/2.1/docs/HotKeys.html
    openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java
    openmeetings/branches/2.1/src/org/apache/openmeetings/remote/MainService.java
    openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
    openmeetings/branches/2.1/xdocs/HotKeys.xml
    openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
    openmeetings/trunk/singlewebapp/docs/HotKeys.html
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
    openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml

Modified: openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/2.1/WebContent/src/base/hibernate/hibRtmpConnection.lzx Tue Apr  2 07:39:13 2013
@@ -668,34 +668,38 @@
             parent.getGeneralOptions.doCall();
         </handler>  
     </netRemoteCallHib>
-    
-    <netRemoteCallHib name="getGeneralOptions" funcname="xmlcrm.getGeneralOptions" >
-        <handler name="ondata" args="value">
-            <![CDATA[
-                if (canvas.thishib.loaderVar != null) {
-                  canvas.thishib.loaderVar.setProgress();
-                }
-                if ($debug) Debug.write("getGeneralOptions: ", value.length, value);
-                if (value != null) {
-                	if (value.length > 0) {
-	                    //if ($debug) Debug.write("Give exclusive audio keycode is: ", value[0].conf_value);
-	                    canvas.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY', value[0].conf_value);
-                    }
-					if (value.length > 1) {
-	                    if ($debug) Debug.write("red5sip.enable is: ", value[1].conf_value);
-	                    canvas.setAttribute('RED5_SIP_ENABLE', value[1].conf_value);
-                    }
-                    if (value.length > 2) {
-	                    if ($debug) Debug.write("max_upload_size is: ", value[2].conf_value);
-	                    canvas.setAttribute('MAX_UPLOAD_SIZE', value[2].conf_value);
-                    }
-                } else {
-                   if ($debug) Debug.warn("xmlcrm.getGeneralOptions empty!");
-                }
-                parent.getUserSalutations.doCall();
-            ]]>
-        </handler>
-    </netRemoteCallHib>
+
+	<netRemoteCallHib name="getGeneralOptions" funcname="xmlcrm.getGeneralOptions">
+		<handler name="ondata" args="value">
+		<![CDATA[
+			if (canvas.thishib.loaderVar != null) {
+				canvas.thishib.loaderVar.setProgress();
+			}
+			if ($debug) Debug.write("getGeneralOptions: ", value.length, value);
+			if (value != null) {
+				if (value.length > 0) {
+					//if ($debug) Debug.write("Give exclusive audio keycode is: ", value[0].conf_value);
+					canvas.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY', value[0].conf_value);
+				}
+				if (value.length > 1) {
+					if ($debug) Debug.write("red5sip.enable is: ", value[1].conf_value);
+					canvas.setAttribute('RED5_SIP_ENABLE', value[1].conf_value);
+				}
+				if (value.length > 2) {
+					if ($debug) Debug.write("max_upload_size is: ", value[2].conf_value);
+					canvas.setAttribute('MAX_UPLOAD_SIZE', value[2].conf_value);
+				}
+				if (value.length > 3) {
+					if ($debug) Debug.write("Mute/unmute keycode is: ", value[3].conf_value);
+					canvas.setAttribute('MUTE_AUDIO_KEY', value[3].conf_value);
+				}
+			} else {
+				if ($debug) Debug.warn("xmlcrm.getGeneralOptions empty!");
+			}
+			parent.getUserSalutations.doCall();
+		]]>
+		</handler>
+	</netRemoteCallHib>
     
     <netRemoteCallHib name="setCurrentUserOrganization" funcname="xmlcrm.setCurrentUserOrganization">
         <netparam><method name="getValue">return canvas.sessionId;</method></netparam>

Modified: openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx (original)
+++ openmeetings/branches/2.1/WebContent/src/base/mainAttributes.lzx Tue Apr  2 07:39:13 2013
@@ -470,6 +470,7 @@ and some more references to temp-objects
 
 <attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/> <!-- F12 --> 
 <attribute name="ARRANGE_WINDOWS_KEY" value="119"/> <!-- F8 --> 
+<attribute name="MUTE_AUDIO_KEY" value="118"/> <!-- F7 --> 
 
 <!-- 
 	Indicates if the Red5 SIP Integration is enabled or not and 

Modified: openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/branches/2.1/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Tue Apr  2 07:39:13 2013
@@ -105,13 +105,17 @@
 			canvas.sendViaLocalConnection(canvas.vid_lc_name, "arrangeWindows", null);
 			return;
 		}
-
 		if (canvas.GIVE_EXCLUSIVE_AUDIO_KEY == keyCode) {
 			if (canvas.ismoderator || canvas.isAllowedToGiveExclusiveAudio) {
 				canvas.thishib.giveExclusiveAudio.setExclusiveAudio(canvas.publicSID);
 			} else {
 				new lz.rpcErrorDialog(canvas.main_content._content.inner,{errorid:-54});
 			}
+			return;
+		}
+		if (canvas.MUTE_AUDIO_KEY == keyCode) {
+			canvas._videocontainer._videoviewcontent.muteSound(canvas.publicSID, !canvas.micMuted);
+			return;
 		}
 	]]>
 	</handler>

Modified: openmeetings/branches/2.1/docs/HotKeys.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/docs/HotKeys.html?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/branches/2.1/docs/HotKeys.html (original)
+++ openmeetings/branches/2.1/docs/HotKeys.html Tue Apr  2 07:39:13 2013
@@ -693,6 +693,20 @@ limitations under the License.
 					
     </td>
             </tr>
+                                <tr>
+                        <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+        F7 (code 118)
+    </td>
+                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+        A hot key code for the 'mute/unmute audio' functionality.
+    </td>
+                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+        Yes
+    </td>
+                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+        mute.keycode
+    </td>
+            </tr>
             </table>
                             </blockquote>
       </td></tr>

Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java Tue Apr  2 07:39:13 2013
@@ -463,7 +463,14 @@ public class ImportInitvalues {
 						"123",
 						null,
 						"A hot key code for the 'give exclusive audio' functionality. Keycode 123 is F12");
-
+		// mute/unmute audio key code
+		configurationDao
+				.addConfByKey(
+						"mute.keycode",
+						"118",
+						null,
+						"A hot key code for the 'mute/unmute audio' functionality. Keycode 118 is F7");
+		
 		// system-wide ldap params
 		configurationDao.addConfByKey("ldap_default_id", "0", null,
 				"Ldap domain selected by default in the login screen");

Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/remote/MainService.java?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/remote/MainService.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/remote/MainService.java Tue Apr  2 07:39:13 2013
@@ -751,6 +751,7 @@ public class MainService implements IPen
 			cList.add(configurationDao.get("exclusive.audio.keycode"));
 			cList.add(configurationDao.get("red5sip.enable"));
 			cList.add(configurationDao.get("max_upload_size"));
+			cList.add(configurationDao.get("mute.keycode"));
 			
 			return cList;
 			

Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Tue Apr  2 07:39:13 2013
@@ -2740,10 +2740,6 @@ public class ScopeApplicationAdapter ext
 		return null;
 	}
 
-    public String getExclusiveAudioKeyCode() {
-		return configurationDao.getConfValue("exclusive.audio.keycode", String.class, null);
-    }
-
 	public synchronized IScope getRoomScope(String room) {
 		try {
 

Modified: openmeetings/branches/2.1/xdocs/HotKeys.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/xdocs/HotKeys.xml?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/branches/2.1/xdocs/HotKeys.xml (original)
+++ openmeetings/branches/2.1/xdocs/HotKeys.xml Tue Apr  2 07:39:13 2013
@@ -42,6 +42,12 @@
 					<td>
 					</td>
 				</tr>
+				<tr>
+					<td>F7 (code 118)</td>
+					<td>A hot key code for the 'mute/unmute audio' functionality.</td>
+					<td>Yes</td>
+					<td>mute.keycode</td>
+				</tr>
 			</table>
 		</section>
 	</body>

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Tue Apr  2 07:39:13 2013
@@ -668,34 +668,38 @@
             parent.getGeneralOptions.doCall();
         </handler>  
     </netRemoteCallHib>
-    
-    <netRemoteCallHib name="getGeneralOptions" funcname="xmlcrm.getGeneralOptions" >
-        <handler name="ondata" args="value">
-            <![CDATA[
-                if (canvas.thishib.loaderVar != null) {
-                  canvas.thishib.loaderVar.setProgress();
-                }
-                if ($debug) Debug.write("getGeneralOptions: ", value.length, value);
-                if (value != null) {
-                	if (value.length > 0) {
-	                    //if ($debug) Debug.write("Give exclusive audio keycode is: ", value[0].conf_value);
-	                    canvas.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY', value[0].conf_value);
-                    }
-					if (value.length > 1) {
-	                    if ($debug) Debug.write("red5sip.enable is: ", value[1].conf_value);
-	                    canvas.setAttribute('RED5_SIP_ENABLE', value[1].conf_value);
-                    }
-                    if (value.length > 2) {
-	                    if ($debug) Debug.write("max_upload_size is: ", value[2].conf_value);
-	                    canvas.setAttribute('MAX_UPLOAD_SIZE', value[2].conf_value);
-                    }
-                } else {
-                   if ($debug) Debug.warn("xmlcrm.getGeneralOptions empty!");
-                }
-                parent.getUserSalutations.doCall();
-            ]]>
-        </handler>
-    </netRemoteCallHib>
+
+	<netRemoteCallHib name="getGeneralOptions" funcname="xmlcrm.getGeneralOptions">
+		<handler name="ondata" args="value">
+		<![CDATA[
+			if (canvas.thishib.loaderVar != null) {
+				canvas.thishib.loaderVar.setProgress();
+			}
+			if ($debug) Debug.write("getGeneralOptions: ", value.length, value);
+			if (value != null) {
+				if (value.length > 0) {
+					//if ($debug) Debug.write("Give exclusive audio keycode is: ", value[0].conf_value);
+					canvas.setAttribute('GIVE_EXCLUSIVE_AUDIO_KEY', value[0].conf_value);
+				}
+				if (value.length > 1) {
+					if ($debug) Debug.write("red5sip.enable is: ", value[1].conf_value);
+					canvas.setAttribute('RED5_SIP_ENABLE', value[1].conf_value);
+				}
+				if (value.length > 2) {
+					if ($debug) Debug.write("max_upload_size is: ", value[2].conf_value);
+					canvas.setAttribute('MAX_UPLOAD_SIZE', value[2].conf_value);
+				}
+				if (value.length > 3) {
+					if ($debug) Debug.write("Mute/unmute keycode is: ", value[3].conf_value);
+					canvas.setAttribute('MUTE_AUDIO_KEY', value[3].conf_value);
+				}
+			} else {
+				if ($debug) Debug.warn("xmlcrm.getGeneralOptions empty!");
+			}
+			parent.getUserSalutations.doCall();
+		]]>
+		</handler>
+	</netRemoteCallHib>
     
     <netRemoteCallHib name="setCurrentUserOrganization" funcname="xmlcrm.setCurrentUserOrganization">
         <netparam><method name="getValue">return canvas.sessionId;</method></netparam>

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Tue Apr  2 07:39:13 2013
@@ -470,6 +470,7 @@ and some more references to temp-objects
 
 <attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/> <!-- F12 --> 
 <attribute name="ARRANGE_WINDOWS_KEY" value="119"/> <!-- F8 --> 
+<attribute name="MUTE_AUDIO_KEY" value="118"/> <!-- F7 --> 
 
 <!-- 
 	Indicates if the Red5 SIP Integration is enabled or not and 

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx Tue Apr  2 07:39:13 2013
@@ -105,13 +105,17 @@
 			canvas.sendViaLocalConnection(canvas.vid_lc_name, "arrangeWindows", null);
 			return;
 		}
-
 		if (canvas.GIVE_EXCLUSIVE_AUDIO_KEY == keyCode) {
 			if (canvas.ismoderator || canvas.isAllowedToGiveExclusiveAudio) {
 				canvas.thishib.giveExclusiveAudio.setExclusiveAudio(canvas.publicSID);
 			} else {
 				new lz.rpcErrorDialog(canvas.main_content._content.inner,{errorid:-54});
 			}
+			return;
+		}
+		if (canvas.MUTE_AUDIO_KEY == keyCode) {
+			canvas._videocontainer._videoviewcontent.muteSound(canvas.publicSID, !canvas.micMuted);
+			return;
 		}
 	]]>
 	</handler>

Modified: openmeetings/trunk/singlewebapp/docs/HotKeys.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/HotKeys.html?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/HotKeys.html (original)
+++ openmeetings/trunk/singlewebapp/docs/HotKeys.html Tue Apr  2 07:39:13 2013
@@ -693,6 +693,20 @@ limitations under the License.
 					
     </td>
             </tr>
+                                <tr>
+                        <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+        F7 (code 118)
+    </td>
+                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+        A hot key code for the 'mute/unmute audio' functionality.
+    </td>
+                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+        Yes
+    </td>
+                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+        mute.keycode
+    </td>
+            </tr>
             </table>
                             </blockquote>
       </td></tr>

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Tue Apr  2 07:39:13 2013
@@ -463,7 +463,14 @@ public class ImportInitvalues {
 						"123",
 						null,
 						"A hot key code for the 'give exclusive audio' functionality. Keycode 123 is F12");
-
+		// mute/unmute audio key code
+		configurationDao
+				.addConfByKey(
+						"mute.keycode",
+						"118",
+						null,
+						"A hot key code for the 'mute/unmute audio' functionality. Keycode 118 is F7");
+		
 		// system-wide ldap params
 		configurationDao.addConfByKey("ldap_default_id", "0", null,
 				"Ldap domain selected by default in the login screen");

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java Tue Apr  2 07:39:13 2013
@@ -721,6 +721,7 @@ public class MainService implements IPen
 			cList.add(configurationDao.get("exclusive.audio.keycode"));
 			cList.add(configurationDao.get("red5sip.enable"));
 			cList.add(configurationDao.get("max_upload_size"));
+			cList.add(configurationDao.get("mute.keycode"));
 			
 			return cList;
 			

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Tue Apr  2 07:39:13 2013
@@ -2658,10 +2658,6 @@ public class ScopeApplicationAdapter ext
 		return null;
 	}
 
-    public String getExclusiveAudioKeyCode() {
-		return configurationDao.getConfValue("exclusive.audio.keycode", String.class, null);
-    }
-
 	public synchronized IScope getRoomScope(String room) {
 		try {
 

Modified: openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml?rev=1463415&r1=1463414&r2=1463415&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml (original)
+++ openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml Tue Apr  2 07:39:13 2013
@@ -42,6 +42,12 @@
 					<td>
 					</td>
 				</tr>
+				<tr>
+					<td>F7 (code 118)</td>
+					<td>A hot key code for the 'mute/unmute audio' functionality.</td>
+					<td>Yes</td>
+					<td>mute.keycode</td>
+				</tr>
 			</table>
 		</section>
 	</body>