summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorAutobuilder at buildslave-ubuntu-12-32 <magnus@alkit.se>2013-11-07 10:20:59 (GMT)
committerAutobuilder at buildslave-ubuntu-12-32 <magnus@alkit.se>2013-11-07 10:20:59 (GMT)
commit1dca74be3a40cb878cd284d3572fca020173113a (patch)
tree420716ac88856cc22e3f8df9e1c2c3240f8403c3 /apps
parentfb91e9aa1cfa84f471024ac8de63b2ffebf934cb (diff)
downloaduscxml-1dca74be3a40cb878cd284d3572fca020173113a.zip
uscxml-1dca74be3a40cb878cd284d3572fca020173113a.tar.gz
uscxml-1dca74be3a40cb878cd284d3572fca020173113a.tar.bz2
multiple video streams
Diffstat (limited to 'apps')
-rw-r--r--apps/samples/miles/miles.html6
-rw-r--r--apps/samples/miles/miles.js1
-rw-r--r--apps/samples/miles/miles.scxml6
3 files changed, 7 insertions, 6 deletions
diff --git a/apps/samples/miles/miles.html b/apps/samples/miles/miles.html
index 08cfeca..5028621 100644
--- a/apps/samples/miles/miles.html
+++ b/apps/samples/miles/miles.html
@@ -16,9 +16,9 @@
<script type="text/javascript">
require(["dojo/domReady!"], function(dom) {
var milesSession1 = new Miles("miles1");
- var milesSession2 = new Miles("miles2");
- var milesSession3 = new Miles("miles3");
- var milesSession4 = new Miles("miles4");
+ var milesSession2 = new Miles("miles2", {"scxmlURL": "localhost:8080", "reflectorIp": "88.131.107.12", "email": "user@smartvortex.eu", "problemName": "webconfero", "remoteEmail": "yetanother@smartvortex.eu"});
+ var milesSession3 = new Miles("miles3", {"scxmlURL": "localhost:8080", "reflectorIp": "88.131.107.12", "email": "user@smartvortex.eu", "problemName": "webconfero", "remoteEmail": "stillanother@smartvortex.eu"});
+ var milesSession4 = new Miles("miles4", {"scxmlURL": "localhost:8080", "reflectorIp": "88.131.107.12", "email": "user@smartvortex.eu", "problemName": "webconfero", "remoteEmail": "last@smartvortex.eu"});
});
</script>
</head>
diff --git a/apps/samples/miles/miles.js b/apps/samples/miles/miles.js
index 4f31d68..9419a8e 100644
--- a/apps/samples/miles/miles.js
+++ b/apps/samples/miles/miles.js
@@ -60,6 +60,7 @@ function Miles(element, params) {
if (params && params.reflectorIp) reflectorIp = params.reflectorIp;
if (params && params.email) email = params.email;
if (params && params.problemName) problemName = params.problemName;
+ if (params && params.remoteEmail) remoteEmail = params.remoteEmail;
// called when dojo loaded all requirements below
this.connect = function() {
diff --git a/apps/samples/miles/miles.scxml b/apps/samples/miles/miles.scxml
index 22ebdda..154e4d6 100644
--- a/apps/samples/miles/miles.scxml
+++ b/apps/samples/miles/miles.scxml
@@ -49,7 +49,7 @@
<send target="#_miles" event="start">
<param name="origin" expr="_event.origin" />
<param name="reflector" expr="_event.data.query.reflector" />
- <param name="userId" expr="_event.data.query.userid" />
+ <param name="userid" expr="_event.data.query.userid" />
<param name="session" expr="_event.data.query.session" />
</send>
@@ -58,7 +58,7 @@
<send target="#_miles" event="stop">
<param name="origin" expr="_event.origin" />
<param name="reflector" expr="_event.data.query.reflector" />
- <param name="userId" expr="_event.data.query.userid" />
+ <param name="userid" expr="_event.data.query.userid" />
<param name="session" expr="_event.data.query.session" />
</send>
@@ -72,7 +72,7 @@
<elseif cond="_event.data.pathComponent[1] === 'thumbnail'" />
<send target="#_miles" event="thumbnail">
<param name="origin" expr="_event.origin" />
- <param name="userId" expr="_event.data.query.userid" />
+ <param name="userid" expr="_event.data.query.userid" />
</send>
<!-- VIDEO ON ############### -->