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 2014/08/20 14:47:32 UTC
svn commit: r1619092 - in /openmeetings: branches/3.0.x/src/
branches/3.0.x/src/install/java/org/apache/openmeetings/installation/
branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/
branches/3.0.x/src/screenshare/java/org/apach...
Author: solomax
Date: Wed Aug 20 12:47:32 2014
New Revision: 1619092
URL: http://svn.apache.org/r1619092
Log:
[OPENMEETINGS-998] parameter to show/hide FPS is added
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
openmeetings/branches/3.0.x/src/screenshare.vm
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified: openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/ImportInitvalues.java Wed Aug 20 12:47:32 2014
@@ -36,6 +36,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED1_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED2_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
@@ -440,6 +441,7 @@ public class ImportInitvalues {
"Default selection in ScreenSharing Quality:\n 0 - bigger frame rate, no resize\n 1 - no resize\n 2 - size == 1/2 of selected area\n 3 - size == 3/8 of selected area");
configurationDao.add(CONFIG_SCREENSHARING_FPS, "10", null, "Default selection in ScreenSharing FPS");
+ configurationDao.add(CONFIG_SCREENSHARING_FPS_SHOW, "true", null, "Is screensharing FPS should be displayed or not (true/false)");
configurationDao.add("default.dashboard.tab", "0", null,
"Default selection in Dashboard tabs as tab-index-id");
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Wed Aug 20 12:47:32 2014
@@ -19,6 +19,7 @@
package org.apache.openmeetings.servlet.outputhandler;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_QUALITY;
import java.io.File;
@@ -61,7 +62,7 @@ public class ScreenController {
@Autowired
public SessiondataDao sessiondataDao;
@Autowired
- public ConfigurationDao configurationDao;
+ public ConfigurationDao cfgDao;
@Autowired
public FieldManager fieldManager;
@@ -149,8 +150,7 @@ public class ScreenController {
}
log.debug("RTMP Sharer labels :: " + label_sharer);
- ConnectionType conType
- = ConnectionType.valueOf(request.getParameter("connectionType"));
+ ConnectionType conType = ConnectionType.valueOf(request.getParameter("connectionType"));
String startUpClass;
switch (conType) {
@@ -188,7 +188,7 @@ public class ScreenController {
boolean allowPublishing = (0 == sessionManager.getPublishingCount(roomId));
Context ctx = new VelocityContext();
- ctx.put("APP_NAME", configurationDao.getAppName());
+ ctx.put("APP_NAME", cfgDao.getAppName());
ctx.put("PUBLIC_SID", publicSID);
ctx.put("LABELSHARER", label_sharer);
addKeystore(ctx);
@@ -198,10 +198,9 @@ public class ScreenController {
ctx.put("codebase", baseURL + OmFileHelper.SCREENSHARING_DIR);
ctx.put("red5-host", rtmphostlocal);
ctx.put("red5-app", OpenmeetingsVariables.webAppRootKey + "/" + roomId);
- ctx.put("default_quality_screensharing",
- configurationDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, "1"));
- ctx.put("default_fps_screensharing",
- configurationDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, "10"));
+ ctx.put("default_quality_screensharing", cfgDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, "1"));
+ ctx.put("default_fps_screensharing", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, "10"));
+ ctx.put("show_screensharing_fps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS_SHOW, Boolean.class, "true"));
//invited guest does not have valid user_id (have user_id == -1)
ctx.put("user_id", users_id);
ctx.put("port", port);
@@ -211,8 +210,7 @@ public class ScreenController {
String requestedFile = StringUtils.deleteWhitespace(domain + "_" + roomId) + ".jnlp";
response.setContentType("application/x-java-jnlp-file");
response.setCharacterEncoding("UTF-8");
- response.setHeader("Content-Disposition",
- "Inline; filename=\"" + requestedFile + "\"");
+ response.setHeader("Content-Disposition", "Inline; filename=\"" + requestedFile + "\"");
VelocityEngine ve = new VelocityEngine();
ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
Modified: openmeetings/branches/3.0.x/src/screenshare.vm
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare.vm?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare.vm (original)
+++ openmeetings/branches/3.0.x/src/screenshare.vm Wed Aug 20 12:47:32 2014
@@ -44,6 +44,7 @@ $LIBRARIES
<argument>$organization_id</argument>
<argument>$default_quality_screensharing</argument>
<argument>$default_fps_screensharing</argument>
+ <argument>$show_screensharing_fps</argument>
<argument>$user_id</argument>
<argument>$allowRecording</argument>
<argument>$allowPublishing</argument>
Modified: openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java Wed Aug 20 12:47:32 2014
@@ -70,6 +70,7 @@ public class CoreScreenShare implements
public int defaultQuality = 1;
public int defaultFPS = 10;
+ public boolean showFPS = true;
public Long organization_id = 0L;
public Long user_id = null;
@@ -106,7 +107,7 @@ public class CoreScreenShare implements
log.debug("arg: " + arg);
}
String[] textArray = null;
- if (args.length > 9) {
+ if (args.length > 11) {
host = args[0];
app = args[1];
port = Integer.parseInt(args[2]);
@@ -118,9 +119,10 @@ public class CoreScreenShare implements
defaultQuality = Integer.parseInt(args[6]);
defaultFPS = Integer.parseInt(args[7]);
- user_id = Long.parseLong(args[8]);
- allowRecording = bool(args[9]);
- allowPublishing = bool(args[10]);
+ showFPS = bool(args[8]);
+ user_id = Long.parseLong(args[9]);
+ allowRecording = bool(args[10]);
+ allowPublishing = bool(args[11]);
if (labelTexts.length() > 0) {
textArray = labelTexts.split(";");
Modified: openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java (original)
+++ openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java Wed Aug 20 12:47:32 2014
@@ -41,11 +41,11 @@ public class RTMPSScreenShare extends RT
public static void main(String[] args) throws DecoderException {
RTMPSScreenShare client = new RTMPSScreenShare(args);
- if (args.length < 12) {
+ if (args.length < 14) {
System.exit(0);
}
- client.setKeystoreBytes(Hex.decodeHex(args[11].toCharArray()));
- client.setKeyStorePassword(args[12]);
+ client.setKeystoreBytes(Hex.decodeHex(args[12].toCharArray()));
+ client.setKeyStorePassword(args[13]);
}
@Override
Modified: openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java (original)
+++ openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java Wed Aug 20 12:47:32 2014
@@ -484,6 +484,7 @@ public class ScreenSharerFrame extends J
comboFPS.setSelectedIndex(comboFPS.getItemCount() - 1);
}
comboFPS.setBounds(390, 170, 70, 24);
+ comboFPS.setVisible(core.showFPS);
panelScreen.add(comboFPS);
panelRecording.setBackground(Color.WHITE);
Modified: openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java (original)
+++ openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/OpenmeetingsVariables.java Wed Aug 20 12:47:32 2014
@@ -38,6 +38,7 @@ public class OpenmeetingsVariables {
public static final String CONFIG_APPLICATION_BASE_URL = "application.base.url";
public static final String CONFIG_SCREENSHARING_QUALITY = "default.quality.screensharing";
public static final String CONFIG_SCREENSHARING_FPS = "default.fps.screensharing";
+ public static final String CONFIG_SCREENSHARING_FPS_SHOW = "screensharing.fps.show";
public static int DEFAULT_MINUTES_REMINDER_SEND = 15;
public static String DEFAULT_BASE_URL = "http://localhost:5080/openmeetings/";
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Wed Aug 20 12:47:32 2014
@@ -39,6 +39,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED1_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_RSS_FEED2_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
@@ -404,6 +405,7 @@ public class ImportInitvalues {
"Default selection in ScreenSharing Quality:\n 0 - bigger frame rate, no resize\n 1 - no resize\n 2 - size == 1/2 of selected area\n 3 - size == 3/8 of selected area");
cfgDao.add(CONFIG_SCREENSHARING_FPS, "10", null, "Default selection in ScreenSharing FPS");
+ cfgDao.add(CONFIG_SCREENSHARING_FPS_SHOW, "true", null, "Is screensharing FPS should be displayed or not (true/false)");
cfgDao.add(CONFIG_DASHBOARD_SHOW_MYROOMS_KEY, "1", null, "Show My Rooms Tab");
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml Wed Aug 20 12:47:32 2014
@@ -129,6 +129,10 @@
<value>*</value>
</replacement>
<replacement>
+ <token>$showFps</token>
+ <value>*</value>
+ </replacement>
+ <replacement>
<token>$allowRecording</token>
<value>*</value>
</replacement>
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java Wed Aug 20 12:47:32 2014
@@ -75,6 +75,7 @@ public class CoreScreenShare implements
public int defaultQuality = 1;
public int defaultFPS = 10;
+ public boolean showFPS = true;
public Long user_id = null;
private boolean allowRecording = true;
@@ -108,7 +109,7 @@ public class CoreScreenShare implements
log.debug("arg: " + arg);
}
String[] textArray = null;
- if (args.length > 9) {
+ if (args.length > 11) {
protocol = Protocol.valueOf(args[0]);
host = args[1];
port = Integer.parseInt(args[2]);
@@ -117,9 +118,10 @@ public class CoreScreenShare implements
publishName = args[5];
String labelTexts = args[6];
defaultQuality = Integer.parseInt(args[7]);
- defaultFPS = Integer.parseInt(args[7]);
- allowRecording = bool(args[8]);
- allowPublishing = bool(args[9]);
+ defaultFPS = Integer.parseInt(args[8]);
+ showFPS = bool(args[9]);
+ allowRecording = bool(args[10]);
+ allowPublishing = bool(args[11]);
if (labelTexts.length() > 0) {
textArray = labelTexts.split(";");
@@ -141,8 +143,8 @@ public class CoreScreenShare implements
break;
case rtmps:
RTMPSScreenShare client = new RTMPSScreenShare(this);
- client.setKeystoreBytes(Hex.decodeHex(args[10].toCharArray()));
- client.setKeyStorePassword(args[11]);
+ client.setKeystoreBytes(Hex.decodeHex(args[12].toCharArray()));
+ client.setKeyStorePassword(args[13]);
instance = client;
break;
case rtmpe:
@@ -260,9 +262,9 @@ public class CoreScreenShare implements
if (!isConnected) {
instance.connect(host, port, app, this);
}
- if (isConnected) {
- setConnectionAsSharingClient();
- }
+ if (isConnected) {
+ setConnectionAsSharingClient();
+ }
} catch (Exception err) {
log.error("captureScreenStart Exception: ", err);
frame.setStatus("Exception: " + err);
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java Wed Aug 20 12:47:32 2014
@@ -484,6 +484,7 @@ public class ScreenSharerFrame extends J
comboFPS.setSelectedIndex(comboFPS.getItemCount() - 1);
}
comboFPS.setBounds(390, 170, 70, 24);
+ comboFPS.setVisible(core.showFPS);
panelScreen.add(comboFPS);
panelRecording.setBackground(Color.WHITE);
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp Wed Aug 20 12:47:32 2014
@@ -45,6 +45,7 @@
<argument>$labels</argument>
<argument>$defaultQuality</argument>
<argument>$defaultFps</argument>
+ <argument>$showFps</argument>
<argument>$allowRecording</argument>
<argument>$allowPublishing</argument>
<argument>$keystore</argument>
Modified: openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java Wed Aug 20 12:47:32 2014
@@ -41,6 +41,7 @@ public class OpenmeetingsVariables {
public static final String CONFIG_FLASH_PORT = "flash.port";
public static final String CONFIG_SCREENSHARING_QUALITY = "default.quality.screensharing";
public static final String CONFIG_SCREENSHARING_FPS = "default.fps.screensharing";
+ public static final String CONFIG_SCREENSHARING_FPS_SHOW = "screensharing.fps.show";
public static int DEFAULT_MINUTES_REMINDER_SEND = 15;
public static String DEFAULT_BASE_URL = "http://localhost:5080/openmeetings/";
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Wed Aug 20 12:47:32 2014
@@ -97,7 +97,7 @@ public class UserForm extends AdminBaseF
@Override
protected void onModelChanged() {
super.onModelChanged();
- generalForm.updateModel(getModelObject());
+ generalForm.updateModelObject(getModelObject());
}
@Override
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1619092&r1=1619091&r2=1619092&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Wed Aug 20 12:47:32 2014
@@ -23,6 +23,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_PROTOCOL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.addUserToRoom;
@@ -254,6 +255,7 @@ public class RoomPanel extends BasePanel
, 1477, 1589) + "]]>")
.replace("$defaultQuality", cfgDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, ""))
.replace("$defaultFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, ""))
+ .replace("$showFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS_SHOW, String.class, "true"))
.replace("$allowRecording", "true") //FIXME add/remove
.replace("$allowPublishing", "true") //FIXME add/remove
.replace("$keystore", "<![CDATA[]]>") //FIXME add/remove