Explicit native exception methods scope

[vlc] / share / http / js / mosaic.js

diff --git a/share/http/js/mosaic.js b/share/http/js/mosaic.js
index cdac316767f4b8b493dd23c5436c425a824e84ae..5b9c3e3e983173ac2f1842e95201e874ba9ca30b 100644 (file)
--- a/share/http/js/mosaic.js
+++ b/share/http/js/mosaic.js
@@ -46,7 +46,7 @@ var cells   = Object();
 
 function mosaic_init()
 {
-    document.getElementById( 'sout_transcode_extra' ).value = ",sfilter=mosaic";
+    document.getElementById( 'sout_transcode_extra' ).value = ",sfilter=mosaic}:bridge-in{offset=100";
     mosaic_size_change();
 
     /* Force usage of transcode in sout */
@@ -191,7 +191,7 @@ function mosaic_code_update()
 "\n"+
 "# Background options\n"+
 "new   bg broadcast enabled\n"+
-"setup bg input     " + value( 'mosaic_bg_input' ) + "\n";
+"setup bg input     " + sanitize_input( value( 'mosaic_bg_input' ) ) + "\n";
     if( value( 'mosaic_output' ) )
     {
         code.value +=
@@ -201,7 +201,8 @@ function mosaic_code_update()
     if(! o.test( value( 'mosaic_output' ) ) )
     {
         code.value +=
-"setup bg option    sub-filter=mosaic\n";
+"setup bg option    sub-filter=mosaic\n"+
+"setup bg output    #bridge-in{offset=100}:display\n";
     }
     code.value+=
 "\n"+
@@ -247,8 +248,8 @@ function mosaic_code_update()
                 var s = cells[id];
                 code.value +=
 "new   " + s + " broadcast enabled\n"+
-"setup " + s + " input     " + streams[s] + "\n"+
-"setup " + s + " output #duplicate{dst=mosaic-bridge{id=" + s + ",width="+cell_width+",height="+cell_height+"},select=video,dst=bridge-out,select=audio}\n"+
+"setup " + s + " input     " + sanitize_input( streams[s] ) + "\n"+
+"setup " + s + " output #duplicate{dst=mosaic-bridge{id=" + s + ",width="+cell_width+",height="+cell_height+"},select=video,dst=bridge-out{id="+(y*mosaic_cols+x)+"},select=audio}\n"+
 "\n";
             }
         }