]> git.sesse.net Git - vlc/commitdiff
projects / vlc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 851e1c5)
add vlc.video.logo video filter test case to test.html
authorJean-Paul Saman <jean-paul.saman@m2x.nl>
Mon, 18 Jan 2010 21:37:57 +0000 (22:37 +0100)
committerJP Dinger <jpd@m2x.nl>
Tue, 19 Jan 2010 16:53:20 +0000 (17:53 +0100)
projects/activex/test.html patch | blob | history
projects/mozilla/test.html patch | blob | history

diff --git a/projects/activex/test.html b/projects/activex/test.html
index 83377a03f2beb68edd4f3e04fc634424403e4ad0..9edd87ed618b6094cd641f077ab8aebca4bfce50 100644 (file)
--- a/projects/activex/test.html
+++ b/projects/activex/test.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">\r
+F<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">\r
 <HTML>\r
 <TITLE>VLC Plugin test page</TITLE>\r
 <STYLE>\r
@@ -115,6 +115,7 @@ Insert VideoLAN.VLCPlugin.2
        width="640"\r
        height="480"\r
        toolbar="true"\r
+       text="Waiting for video"\r
        name="vlc">\r
 </EMBED>\r
 </OBJECT>\r
@@ -210,7 +211,7 @@ Insert Slider widget
 </TD>\r
 </TR>\r
 <TR>\r
-<TD>Marquee:\r
+<TD>Marquee video filter:\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
@@ -226,7 +227,25 @@ Insert Slider widget
         <OPTION value=9>Y</OPTION>\r
     </SELECT>\r
 </TD>\r
-</TR>\r
+</TR>
+<TR>\r
+<TD>Logo video filter:\r
+    <INPUT type=button value="Enable" onClick='getVLC("vlc").video.logo.enable();'>\r
+    <INPUT type=button value="Disable" onClick='getVLC("vlc").video.logo.disable();'>\r
+    <INPUT size=4 value="" id="logoIntValue">\r
+    <SELECT readonly onClick="doLogoOption(this.value,document.getElementById('logoIntValue').value);">\r
+        <OPTION value=1>File</OPTION>\r
+        <OPTION value=2>Transparency</OPTION>\r
+        <OPTION value=3>Position</OPTION>\r
+        <OPTION value=4>Repeat</OPTION>\r
+        <OPTION value=5>Delay</OPTION>\r
+        <OPTION value=6>X</OPTION>\r
+        <OPTION value=7>Y</OPTION>
+        <OPTION value=8>Width</OPTION>\r
+        <OPTION value=9>Height</OPTION>
+    </SELECT>\r
+</TD>\r
+</TR>\r\r
 <TR>\r
 <TD>\r
     <INPUT type=button id="telx" value="Teletext off" onClick='doToggleTeletext();'>\r
@@ -763,6 +782,33 @@ function doMarqueeOption(option, value)
             vlc.video.marquee.y(val);\r
     }\r
 }\r
+
+function doLogoOption(option, value)\r
+{\r
+    var vlc = getVLC("vlc");\r
+    val = parseInt(value);\r
+    if( vlc )\r
+    {\r
+        if (option == 1)\r
+            vlc.video.logo.file(val);\r
+        if (option == 2)\r
+            vlc.video.logo.transparency(val);\r
+        if (option == 3)\r
+            vlc.video.logo.position(val);\r
+        if (option == 4)\r
+            vlc.video.logo.repeat(val);\r
+        if (option == 5)\r
+            vlc.video.logo.delay(val);\r
+        if (option == 6)\r
+            vlc.video.logo.x(val);\r
+        if (option == 7)\r
+            vlc.video.logo.y(val);\r
+        if (option == 8)\r
+            vlc.video.logo.width(val);\r
+        if (option == 9)\r
+            vlc.video.logo.height(val);\r
+    }\r
+}\r
 \r
 //-->\r
 </SCRIPT>\r
diff --git a/projects/mozilla/test.html b/projects/mozilla/test.html
index 79c6f4d7344c27c725d75870afd44dd5ce3b86cd..9edd87ed618b6094cd641f077ab8aebca4bfce50 100644 (file)
--- a/projects/mozilla/test.html
+++ b/projects/mozilla/test.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">\r
+F<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">\r
 <HTML>\r
 <TITLE>VLC Plugin test page</TITLE>\r
 <STYLE>\r
@@ -211,7 +211,7 @@ Insert Slider widget
 </TD>\r
 </TR>\r
 <TR>\r
-<TD>Marquee:\r
+<TD>Marquee video filter:\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
@@ -227,7 +227,25 @@ Insert Slider widget
         <OPTION value=9>Y</OPTION>\r
     </SELECT>\r
 </TD>\r
-</TR>\r
+</TR>
+<TR>\r
+<TD>Logo video filter:\r
+    <INPUT type=button value="Enable" onClick='getVLC("vlc").video.logo.enable();'>\r
+    <INPUT type=button value="Disable" onClick='getVLC("vlc").video.logo.disable();'>\r
+    <INPUT size=4 value="" id="logoIntValue">\r
+    <SELECT readonly onClick="doLogoOption(this.value,document.getElementById('logoIntValue').value);">\r
+        <OPTION value=1>File</OPTION>\r
+        <OPTION value=2>Transparency</OPTION>\r
+        <OPTION value=3>Position</OPTION>\r
+        <OPTION value=4>Repeat</OPTION>\r
+        <OPTION value=5>Delay</OPTION>\r
+        <OPTION value=6>X</OPTION>\r
+        <OPTION value=7>Y</OPTION>
+        <OPTION value=8>Width</OPTION>\r
+        <OPTION value=9>Height</OPTION>
+    </SELECT>\r
+</TD>\r
+</TR>\r\r
 <TR>\r
 <TD>\r
     <INPUT type=button id="telx" value="Teletext off" onClick='doToggleTeletext();'>\r
@@ -764,6 +782,33 @@ function doMarqueeOption(option, value)
             vlc.video.marquee.y(val);\r
     }\r
 }\r
+
+function doLogoOption(option, value)\r
+{\r
+    var vlc = getVLC("vlc");\r
+    val = parseInt(value);\r
+    if( vlc )\r
+    {\r
+        if (option == 1)\r
+            vlc.video.logo.file(val);\r
+        if (option == 2)\r
+            vlc.video.logo.transparency(val);\r
+        if (option == 3)\r
+            vlc.video.logo.position(val);\r
+        if (option == 4)\r
+            vlc.video.logo.repeat(val);\r
+        if (option == 5)\r
+            vlc.video.logo.delay(val);\r
+        if (option == 6)\r
+            vlc.video.logo.x(val);\r
+        if (option == 7)\r
+            vlc.video.logo.y(val);\r
+        if (option == 8)\r
+            vlc.video.logo.width(val);\r
+        if (option == 9)\r
+            vlc.video.logo.height(val);\r
+    }\r
+}\r
 \r
 //-->\r
 </SCRIPT>\r
Unnamed repository; edit this file 'description' to name the repository.