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/07/22 19:35:10 UTC
svn commit: r1612623 - 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: Tue Jul 22 17:35:09 2014
New Revision: 1612623
URL: http://svn.apache.org/r1612623
Log:
[OPENMEETINGS-1049] config for defaultFps 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/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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -35,6 +35,8 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
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_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH;
@@ -434,12 +436,10 @@ public class ImportInitvalues {
configurationDao.add("show.facebook.login", "" + 0, null,
"Show Facebook Login");
- configurationDao
- .add(
- "default.quality.screensharing",
- "1",
- null,
- "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_QUALITY, "1", null,
+ "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("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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -18,6 +18,9 @@
*/
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_QUALITY;
+
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
@@ -196,8 +199,9 @@ public class ScreenController {
ctx.put("red5-host", rtmphostlocal);
ctx.put("red5-app", OpenmeetingsVariables.webAppRootKey + "/" + roomId);
ctx.put("default_quality_screensharing",
- configurationDao
- .getConfValue("default.quality.screensharing", String.class, "1"));
+ configurationDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, "1"));
+ ctx.put("default_fps_screensharing",
+ configurationDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, "10"));
//invited guest does not have valid user_id (have user_id == -1)
ctx.put("user_id", users_id);
ctx.put("port", port);
Modified: openmeetings/branches/3.0.x/src/screenshare.vm
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare.vm?rev=1612623&r1=1612622&r2=1612623&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/screenshare.vm (original)
+++ openmeetings/branches/3.0.x/src/screenshare.vm Tue Jul 22 17:35:09 2014
@@ -43,6 +43,7 @@ $LIBRARIES
<argument>$LABELSHARER</argument>
<argument>$organization_id</argument>
<argument>$default_quality_screensharing</argument>
+ <argument>$default_fps_screensharing</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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -69,6 +69,7 @@ public class CoreScreenShare implements
private ScreenSharerFrame frame;
public int defaultQuality = 1;
+ public int defaultFPS = 10;
public Long organization_id = 0L;
public Long user_id = null;
@@ -105,7 +106,7 @@ public class CoreScreenShare implements
log.debug("arg: " + arg);
}
String[] textArray = null;
- if (args.length > 8) {
+ if (args.length > 9) {
host = args[0];
app = args[1];
port = Integer.parseInt(args[2]);
@@ -116,9 +117,10 @@ public class CoreScreenShare implements
organization_id = Long.parseLong(args[5]);
defaultQuality = Integer.parseInt(args[6]);
- user_id = Long.parseLong(args[7]);
- allowRecording = bool(args[8]);
- allowPublishing = bool(args[9]);
+ defaultFPS = Integer.parseInt(args[7]);
+ user_id = Long.parseLong(args[8]);
+ allowRecording = bool(args[9]);
+ allowPublishing = bool(args[10]);
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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 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 < 11) {
+ if (args.length < 12) {
System.exit(0);
}
- client.setKeystoreBytes(Hex.decodeHex(args[10].toCharArray()));
- client.setKeyStorePassword(args[11]);
+ client.setKeystoreBytes(Hex.decodeHex(args[11].toCharArray()));
+ client.setKeyStorePassword(args[12]);
}
@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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -468,8 +468,20 @@ public class ScreenSharerFrame extends J
ScreenDimensions.FPS = ((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue();
calcRescaleFactors();
}
- });
- comboFPS.setSelectedIndex(2);
+ });
+ boolean fpsSelected = false;
+ for (int i = 0; i < comboFPS.getItemCount(); ++i) {
+ KeyValue<Integer> v = comboFPS.getItemAt(i);
+ if (core.defaultFPS == v.value) {
+ comboFPS.setSelectedIndex(i);
+ fpsSelected = true;
+ break;
+ }
+ }
+ if (!fpsSelected) {
+ comboFPS.addItem(new KeyValue<Integer>(core.defaultFPS + " FPS", core.defaultFPS));
+ comboFPS.setSelectedIndex(comboFPS.getItemCount() - 1);
+ }
comboFPS.setBounds(390, 170, 70, 24);
panelScreen.add(comboFPS);
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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -36,6 +36,8 @@ public class OpenmeetingsVariables {
public static final String CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY = "redirect.url.for.external.users";
public static final String CONFIG_APPOINTMENT_REMINDER_MINUTES = "number.minutes.reminder.send";
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 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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -38,6 +38,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY;
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_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
@@ -402,6 +403,8 @@ public class ImportInitvalues {
cfgDao.add(CONFIG_SCREENSHARING_QUALITY, "1", null,
"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_DASHBOARD_SHOW_MYROOMS_KEY, "1", null, "Show My Rooms Tab");
cfgDao.add("dashboard.show.chat", "1", null, "Show Chat Tab");
Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml?rev=1612623&r1=1612622&r2=1612623&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml Tue Jul 22 17:35:09 2014
@@ -125,6 +125,10 @@
<value>*</value>
</replacement>
<replacement>
+ <token>$defaultFps</token>
+ <value>*</value>
+ </replacement>
+ <replacement>
<token>$allowRecording</token>
<value>*</value>
</replacement>
@@ -182,6 +186,7 @@
<include>commons-codec:commons-codec</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-collections:commons-collections</include>
+ <include>org.apache.commons:commons-lang3</include>
<include>org.apache.httpcomponents:httpclient</include>
<include>org.apache.httpcomponents:httpcore</include>
<include>org.bouncycastle:bcprov-jdk15on</include>
@@ -221,6 +226,7 @@
<include>commons-codec:commons-codec</include>
<include>commons-beanutils:commons-beanutils</include>
<include>commons-collections:commons-collections</include>
+ <include>org.apache.commons:commons-lang3</include>
<include>org.apache.httpcomponents:httpclient</include>
<include>org.apache.httpcomponents:httpcore</include>
<include>org.bouncycastle:bcprov-jdk15on</include>
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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -74,6 +74,7 @@ public class CoreScreenShare implements
private ScreenSharerFrame frame;
public int defaultQuality = 1;
+ public int defaultFPS = 10;
public Long user_id = null;
private boolean allowRecording = true;
@@ -116,6 +117,7 @@ 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]);
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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -469,7 +469,19 @@ public class ScreenSharerFrame extends J
calcRescaleFactors();
}
});
- comboFPS.setSelectedIndex(2);
+ boolean fpsSelected = false;
+ for (int i = 0; i < comboFPS.getItemCount(); ++i) {
+ KeyValue<Integer> v = comboFPS.getItemAt(i);
+ if (core.defaultFPS == v.value) {
+ comboFPS.setSelectedIndex(i);
+ fpsSelected = true;
+ break;
+ }
+ }
+ if (!fpsSelected) {
+ comboFPS.addItem(new KeyValue<Integer>(core.defaultFPS + " FPS", core.defaultFPS));
+ comboFPS.setSelectedIndex(comboFPS.getItemCount() - 1);
+ }
comboFPS.setBounds(390, 170, 70, 24);
panelScreen.add(comboFPS);
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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -44,6 +44,7 @@
<argument>$publicSid</argument>
<argument>$labels</argument>
<argument>$defaultQuality</argument>
+ <argument>$defaultFps</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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 2014
@@ -40,6 +40,7 @@ public class OpenmeetingsVariables {
public static final String CONFIG_FLASH_PROTOCOL = "flash.protocol";
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 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/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=1612623&r1=1612622&r2=1612623&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 Tue Jul 22 17:35:09 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_QUALITY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.addUserToRoom;
import static org.apache.openmeetings.web.app.Application.getBean;
@@ -252,6 +253,7 @@ public class RoomPanel extends BasePanel
, 1472, 1473, 1474, 1475, 1476
, 1477, 1589) + "]]>")
.replace("$defaultQuality", cfgDao.getConfValue(CONFIG_SCREENSHARING_QUALITY, String.class, ""))
+ .replace("$defaultFps", cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, ""))
.replace("$allowRecording", "true") //FIXME add/remove
.replace("$allowPublishing", "true") //FIXME add/remove
.replace("$keystore", "<![CDATA[]]>") //FIXME add/remove