Mozilla & ActiveX: Update test.html

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/projects/activex/test.html b/projects/activex/test.html
index 56ee029ad3dbcea12bf2e33d37b041c64e4ed0f0..83377a03f2beb68edd4f3e04fc634424403e4ad0 100644 (file)
--- a/projects/activex/test.html
+++ b/projects/activex/test.html
@@ -210,6 +210,24 @@ Insert Slider widget
 </TD>\r
 </TR>\r
 <TR>\r
+<TD>Marquee:\r
+    <INPUT type=button value="Enable" onClick='getVLC("vlc").video.marquee.enable();'>\r
+    <INPUT type=button value="Disable" onClick='getVLC("vlc").video.marquee.disable();'>\r
+    <INPUT size=4 value="" id="marqueeIntValue">\r
+    <SELECT readonly onClick="doMarqueeOption(this.value,document.getElementById('marqueeIntValue').value);">\r
+        <OPTION value=1>Color</OPTION>\r
+        <OPTION value=2>Opacity</OPTION>\r
+        <OPTION value=3>Position</OPTION>\r
+        <OPTION value=4>Refresh</OPTION>\r
+        <OPTION value=5>Size</OPTION>\r
+        <OPTION value=6>Text</OPTION>\r
+        <OPTION value=7>Timeout</OPTION>\r
+        <OPTION value=8>X</OPTION>\r
+        <OPTION value=9>Y</OPTION>\r
+    </SELECT>\r
+</TD>\r
+</TR>\r
+<TR>\r
 <TD>\r
     <INPUT type=button id="telx" value="Teletext off" onClick='doToggleTeletext();'>\r
     Teletext page:\r
@@ -504,9 +522,9 @@ function doGo(targetURL)
             // clear() may return before the playlist has actually been cleared\r
             // just wait for it to finish its job\r
         }\r
-        var options = [":rtsp-tcp"];
+        var options = [":rtsp-tcp"];\r
         var itemId = vlc.playlist.add(targetURL,"",options);\r
-        options = [];
+        options = [];\r
         if( itemId != -1 )\r
         {\r
             // play MRL\r
@@ -527,11 +545,11 @@ function doGo(targetURL)
 function doAdd(targetURL)\r
 {\r
     var vlc = getVLC("vlc");\r
-    var options = [":vout-filter=deinterlace", ":deinterlace-mode=linear"];
+    var options = [":vout-filter=deinterlace", ":deinterlace-mode=linear"];\r
     if( vlc )\r
     {\r
         vlc.playlist.add(targetURL, "", options);\r
-        options = [];
+        options = [];\r
         doItemCount();\r
     }\r
 }\r
@@ -611,10 +629,10 @@ function onPlay()
 function onEnd()\r
 {\r
     document.getElementById("state").innerHTML = "End...";\r
-    doStop();
+    doStop();\r
 }\r
 \r
-var liveFeedText = ["Live", "((Live))", "(( Live ))", "((  Live  ))"];
+var liveFeedText = ["Live", "((Live))", "(( Live ))", "((  Live  ))"];\r
 var liveFeedRoll = 0;\r
 \r
 function onPlaying()\r
@@ -719,6 +737,33 @@ function onInputTrackerChange(inputTracker, value, pos)
     }\r
 }\r
 \r
+function doMarqueeOption(option, value)\r
+{\r
+    var vlc = getVLC("vlc");\r
+    val = parseInt(value);\r
+    if( vlc )\r
+    {\r
+        if (option == 1)\r
+            vlc.video.marquee.color(val);\r
+        if (option == 2)\r
+            vlc.video.marquee.opacity(val);\r
+        if (option == 3)\r
+            vlc.video.marquee.position(val);\r
+        if (option == 4)\r
+            vlc.video.marquee.refresh(val);\r
+        if (option == 5)\r
+            vlc.video.marquee.size(val);\r
+        if (option == 6)\r
+            vlc.video.marquee.text(value);\r
+        if (option == 7)\r
+            vlc.video.marquee.timeout(val);\r
+        if (option == 8)\r
+            vlc.video.marquee.x(val);\r
+        if (option == 9)\r
+            vlc.video.marquee.y(val);\r
+    }\r
+}\r
+\r
 //-->\r
 </SCRIPT>\r
 </BODY>\r

diff --git a/projects/mozilla/test.html b/projects/mozilla/test.html
index 919509daa22db4f31e636f24936544befd5ce4bd..83377a03f2beb68edd4f3e04fc634424403e4ad0 100644 (file)
--- a/projects/mozilla/test.html
+++ b/projects/mozilla/test.html
@@ -210,6 +210,24 @@ Insert Slider widget
 </TD>\r
 </TR>\r
 <TR>\r
+<TD>Marquee:\r
+    <INPUT type=button value="Enable" onClick='getVLC("vlc").video.marquee.enable();'>\r
+    <INPUT type=button value="Disable" onClick='getVLC("vlc").video.marquee.disable();'>\r
+    <INPUT size=4 value="" id="marqueeIntValue">\r
+    <SELECT readonly onClick="doMarqueeOption(this.value,document.getElementById('marqueeIntValue').value);">\r
+        <OPTION value=1>Color</OPTION>\r
+        <OPTION value=2>Opacity</OPTION>\r
+        <OPTION value=3>Position</OPTION>\r
+        <OPTION value=4>Refresh</OPTION>\r
+        <OPTION value=5>Size</OPTION>\r
+        <OPTION value=6>Text</OPTION>\r
+        <OPTION value=7>Timeout</OPTION>\r
+        <OPTION value=8>X</OPTION>\r
+        <OPTION value=9>Y</OPTION>\r
+    </SELECT>\r
+</TD>\r
+</TR>\r
+<TR>\r
 <TD>\r
     <INPUT type=button id="telx" value="Teletext off" onClick='doToggleTeletext();'>\r
     Teletext page:\r
@@ -504,9 +522,9 @@ function doGo(targetURL)
             // clear() may return before the playlist has actually been cleared\r
             // just wait for it to finish its job\r
         }\r
-        var options = [":rtsp-tcp"];
+        var options = [":rtsp-tcp"];\r
         var itemId = vlc.playlist.add(targetURL,"",options);\r
-        options = [];
+        options = [];\r
         if( itemId != -1 )\r
         {\r
             // play MRL\r
@@ -527,11 +545,11 @@ function doGo(targetURL)
 function doAdd(targetURL)\r
 {\r
     var vlc = getVLC("vlc");\r
-    var options = [":vout-filter=deinterlace", ":deinterlace-mode=linear"];
+    var options = [":vout-filter=deinterlace", ":deinterlace-mode=linear"];\r
     if( vlc )\r
     {\r
         vlc.playlist.add(targetURL, "", options);\r
-        options = [];
+        options = [];\r
         doItemCount();\r
     }\r
 }\r
@@ -614,7 +632,7 @@ function onEnd()
     doStop();\r
 }\r
 \r
-var liveFeedText = ["Live", "((Live))", "(( Live ))", "((  Live  ))"];
+var liveFeedText = ["Live", "((Live))", "(( Live ))", "((  Live  ))"];\r
 var liveFeedRoll = 0;\r
 \r
 function onPlaying()\r
@@ -719,6 +737,33 @@ function onInputTrackerChange(inputTracker, value, pos)
     }\r
 }\r
 \r
+function doMarqueeOption(option, value)\r
+{\r
+    var vlc = getVLC("vlc");\r
+    val = parseInt(value);\r
+    if( vlc )\r
+    {\r
+        if (option == 1)\r
+            vlc.video.marquee.color(val);\r
+        if (option == 2)\r
+            vlc.video.marquee.opacity(val);\r
+        if (option == 3)\r
+            vlc.video.marquee.position(val);\r
+        if (option == 4)\r
+            vlc.video.marquee.refresh(val);\r
+        if (option == 5)\r
+            vlc.video.marquee.size(val);\r
+        if (option == 6)\r
+            vlc.video.marquee.text(value);\r
+        if (option == 7)\r
+            vlc.video.marquee.timeout(val);\r
+        if (option == 8)\r
+            vlc.video.marquee.x(val);\r
+        if (option == 9)\r
+            vlc.video.marquee.y(val);\r
+    }\r
+}\r
+\r
 //-->\r
 </SCRIPT>\r
 </BODY>\r