[vlc-devel] commit: add vlc.video.logo video filter test case to test.html ( Jean-Paul Saman )
git version control
git at videolan.org
Tue Jan 19 17:56:09 CET 2010
vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Mon Jan 18 22:37:57 2010 +0100| [cdce6740bf3a35fdc564eab2a4d7be013e7dc9cc] | committer: JP Dinger
add vlc.video.logo video filter test case to test.html
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cdce6740bf3a35fdc564eab2a4d7be013e7dc9cc
---
projects/activex/test.html | 52 +++++++++++++++++++++++++++++++++++++++++--
projects/mozilla/test.html | 51 ++++++++++++++++++++++++++++++++++++++++--
2 files changed, 97 insertions(+), 6 deletions(-)
diff --git a/projects/activex/test.html b/projects/activex/test.html
index 83377a0..9edd87e 100644
--- a/projects/activex/test.html
+++ b/projects/activex/test.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+F<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<TITLE>VLC Plugin test page</TITLE>
<STYLE>
@@ -115,6 +115,7 @@ Insert VideoLAN.VLCPlugin.2
width="640"
height="480"
toolbar="true"
+ text="Waiting for video"
name="vlc">
</EMBED>
</OBJECT>
@@ -210,7 +211,7 @@ Insert Slider widget
</TD>
</TR>
<TR>
-<TD>Marquee:
+<TD>Marquee video filter:
<INPUT type=button value="Enable" onClick='getVLC("vlc").video.marquee.enable();'>
<INPUT type=button value="Disable" onClick='getVLC("vlc").video.marquee.disable();'>
<INPUT size=4 value="" id="marqueeIntValue">
@@ -226,7 +227,25 @@ Insert Slider widget
<OPTION value=9>Y</OPTION>
</SELECT>
</TD>
-</TR>
+</TR>
+<TR>
+<TD>Logo video filter:
+ <INPUT type=button value="Enable" onClick='getVLC("vlc").video.logo.enable();'>
+ <INPUT type=button value="Disable" onClick='getVLC("vlc").video.logo.disable();'>
+ <INPUT size=4 value="" id="logoIntValue">
+ <SELECT readonly onClick="doLogoOption(this.value,document.getElementById('logoIntValue').value);">
+ <OPTION value=1>File</OPTION>
+ <OPTION value=2>Transparency</OPTION>
+ <OPTION value=3>Position</OPTION>
+ <OPTION value=4>Repeat</OPTION>
+ <OPTION value=5>Delay</OPTION>
+ <OPTION value=6>X</OPTION>
+ <OPTION value=7>Y</OPTION>
+ <OPTION value=8>Width</OPTION>
+ <OPTION value=9>Height</OPTION>
+ </SELECT>
+</TD>
+</TR>
<TR>
<TD>
<INPUT type=button id="telx" value="Teletext off" onClick='doToggleTeletext();'>
@@ -763,6 +782,33 @@ function doMarqueeOption(option, value)
vlc.video.marquee.y(val);
}
}
+
+function doLogoOption(option, value)
+{
+ var vlc = getVLC("vlc");
+ val = parseInt(value);
+ if( vlc )
+ {
+ if (option == 1)
+ vlc.video.logo.file(val);
+ if (option == 2)
+ vlc.video.logo.transparency(val);
+ if (option == 3)
+ vlc.video.logo.position(val);
+ if (option == 4)
+ vlc.video.logo.repeat(val);
+ if (option == 5)
+ vlc.video.logo.delay(val);
+ if (option == 6)
+ vlc.video.logo.x(val);
+ if (option == 7)
+ vlc.video.logo.y(val);
+ if (option == 8)
+ vlc.video.logo.width(val);
+ if (option == 9)
+ vlc.video.logo.height(val);
+ }
+}
//-->
</SCRIPT>
diff --git a/projects/mozilla/test.html b/projects/mozilla/test.html
index 79c6f4d..9edd87e 100644
--- a/projects/mozilla/test.html
+++ b/projects/mozilla/test.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+F<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML>
<TITLE>VLC Plugin test page</TITLE>
<STYLE>
@@ -211,7 +211,7 @@ Insert Slider widget
</TD>
</TR>
<TR>
-<TD>Marquee:
+<TD>Marquee video filter:
<INPUT type=button value="Enable" onClick='getVLC("vlc").video.marquee.enable();'>
<INPUT type=button value="Disable" onClick='getVLC("vlc").video.marquee.disable();'>
<INPUT size=4 value="" id="marqueeIntValue">
@@ -227,7 +227,25 @@ Insert Slider widget
<OPTION value=9>Y</OPTION>
</SELECT>
</TD>
-</TR>
+</TR>
+<TR>
+<TD>Logo video filter:
+ <INPUT type=button value="Enable" onClick='getVLC("vlc").video.logo.enable();'>
+ <INPUT type=button value="Disable" onClick='getVLC("vlc").video.logo.disable();'>
+ <INPUT size=4 value="" id="logoIntValue">
+ <SELECT readonly onClick="doLogoOption(this.value,document.getElementById('logoIntValue').value);">
+ <OPTION value=1>File</OPTION>
+ <OPTION value=2>Transparency</OPTION>
+ <OPTION value=3>Position</OPTION>
+ <OPTION value=4>Repeat</OPTION>
+ <OPTION value=5>Delay</OPTION>
+ <OPTION value=6>X</OPTION>
+ <OPTION value=7>Y</OPTION>
+ <OPTION value=8>Width</OPTION>
+ <OPTION value=9>Height</OPTION>
+ </SELECT>
+</TD>
+</TR>
<TR>
<TD>
<INPUT type=button id="telx" value="Teletext off" onClick='doToggleTeletext();'>
@@ -764,6 +782,33 @@ function doMarqueeOption(option, value)
vlc.video.marquee.y(val);
}
}
+
+function doLogoOption(option, value)
+{
+ var vlc = getVLC("vlc");
+ val = parseInt(value);
+ if( vlc )
+ {
+ if (option == 1)
+ vlc.video.logo.file(val);
+ if (option == 2)
+ vlc.video.logo.transparency(val);
+ if (option == 3)
+ vlc.video.logo.position(val);
+ if (option == 4)
+ vlc.video.logo.repeat(val);
+ if (option == 5)
+ vlc.video.logo.delay(val);
+ if (option == 6)
+ vlc.video.logo.x(val);
+ if (option == 7)
+ vlc.video.logo.y(val);
+ if (option == 8)
+ vlc.video.logo.width(val);
+ if (option == 9)
+ vlc.video.logo.height(val);
+ }
+}
//-->
</SCRIPT>
More information about the vlc-devel
mailing list