[vlc-devel] [PATCH 06/17] test pages: JavaScript indenting, cleanup and improving
Daniel Amm
da2424 at t-online.de
Sun Jun 14 00:35:42 CEST 2015
---
share/test/simple.html | 17 +-
share/test/test.html | 272 ++++++++++++++++----------------
share/test/windowless.html | 383 ++++++---------------------------------------
3 files changed, 193 insertions(+), 479 deletions(-)
diff --git a/share/test/simple.html b/share/test/simple.html
index 966400e..ae4beca 100755
--- a/share/test/simple.html
+++ b/share/test/simple.html
@@ -4,17 +4,18 @@
<title>Simplest VLC plugin test</title>
<script type="text/javascript">
-function play(tgt) {
+function play(tgt)
+{
var uri = "http://streams.videolan.org/streams/mp4/Mr_MrsSmith-h264_aac.mp4";
if (document.all) tgt += "_IE"
- var tgt = document.getElementById(tgt);
- // alert(tgt);
- if (document.all) tgt.playlist.add(uri,uri, new Array());
- else tgt.playlist.add(uri,uri, "");
- tgt.playlist.play();
+ var vlc = document.getElementById(tgt);
+ // alert(vlc);
+ vlc.playlist.add(uri);
+ vlc.playlist.play();
}
-function reload() {
- document.body.innerHTML="";
+function reload()
+{
+ document.body.innerHTML = "";
setTimeout("document.location.reload();", 500);
}
</script>
diff --git a/share/test/test.html b/share/test/test.html
index e032a3e..116fe22 100755
--- a/share/test/test.html
+++ b/share/test/test.html
@@ -13,7 +13,7 @@ form {
<!--
function init()
{
- if( navigator.appName.indexOf("Microsoft Internet")==-1 )
+ if( navigator.appName.indexOf("Microsoft Internet") == -1 )
{
onVLCPluginReady()
}
@@ -24,7 +24,7 @@ function init()
else
{
/* Explorer loads plugins asynchronously */
- document.onreadystatechange=function()
+ document.onreadystatechange = function()
{
if( document.readyState == 'complete' )
{
@@ -36,16 +36,16 @@ function init()
function getVLC(name)
{
- if (window.document[name])
+ if( window.document[name] )
{
return window.document[name];
}
- if (navigator.appName.indexOf("Microsoft Internet")==-1)
+ if( navigator.appName.indexOf("Microsoft Internet") == -1 )
{
- if (document.embeds && document.embeds[name])
+ if( document.embeds && document.embeds[name] )
return document.embeds[name];
}
- else // if (navigator.appName.indexOf("Microsoft Internet")!=-1)
+ else
{
return document.getElementById(name);
}
@@ -55,16 +55,17 @@ function registerVLCEvent(event, handler)
{
var vlc = getVLC("vlc");
- if (vlc) {
- if (vlc.attachEvent) {
+ if( vlc )
+ {
+ if( vlc.attachEvent )
+ {
// Microsoft
- vlc.attachEvent (event, handler);
- } else if (vlc.addEventListener) {
+ vlc.attachEvent(event, handler);
+ }
+ else if( vlc.addEventListener )
+ {
// Mozilla: DOM level 2
- vlc.addEventListener (event, handler);
- } else {
- // DOM level 0
- eval("vlc.on" + event + " = handler");
+ vlc.addEventListener(event, handler, false);
}
}
}
@@ -73,16 +74,17 @@ function unregisterVLCEvent(event, handler)
{
var vlc = getVLC("vlc");
- if (vlc) {
- if (vlc.detachEvent) {
+ if( vlc )
+ {
+ if( vlc.detachEvent )
+ {
// Microsoft
- vlc.detachEvent (event, handler);
- } else if (vlc.removeEventListener) {
+ vlc.detachEvent(event, handler);
+ }
+ else if( vlc.removeEventListener )
+ {
// Mozilla: DOM level 2
- vlc.removeEventListener (event, handler);
- } else {
- // DOM level 0
- eval("vlc.on" + event + " = null");
+ vlc.removeEventListener(event, handler, false);
}
}
}
@@ -283,9 +285,9 @@ function close()
-->
<div id="inputTrackerDiv"></div>
</td>
- <td style="width:15%; text-align:center">
+ <td style="width:100px; text-align:center">
<div id="info">-:--:--/-:--:--</div>
- <div id="state">Stopped...</div>
+ <div id="state">Idle...</div>
</td>
</tr>
</table>
@@ -293,7 +295,7 @@ function close()
</tr>
<tr>
<td>
- <input type="button" id="PlayOrPause" value=" Play " onClick='doPlayOrPause();'>
+ <input type="button" id="PlayOrPause" style="width:60px" value="Play" onClick='doPlayOrPause();'>
<input type="button" value="Stop" onClick='doStop();'>
<input type="button" value=" << " onClick='doPlaySlower();'>
@@ -308,7 +310,7 @@ function close()
<span style="text-align:center">Volume:</span>
<input type="button" value=" - " onClick='updateVolume(-10)'>
<span id="volumeTextField" style="text-align:center">--</span>
- <input type="button" value=" + " onClick='updateVolume(+10)'>
+ <input type="button" value=" + " onClick='updateVolume(10)'>
<input type="button" value="Mute" onClick='getVLC("vlc").audio.toggleMute();'>
</td>
</tr>
@@ -328,7 +330,7 @@ function close()
</select>
</td>
<td style="text-align:right">
- <input type="button" id="itemCount" value="Items 0" onClick='doItemCount();'>
+ <input type="button" id="itemCount" value="Items: 0" onClick='doItemCount();'>
<form action="javascript:doRemoveItem(document.getElementById('removeid').value);">
<input type="text" size="4" value="" id="removeid">
<input type="submit" value="Delete">
@@ -442,8 +444,6 @@ function close()
<script type="text/javascript">
<!--
-var rate = 0;
-var prevState = 0;
var telxState = false;
var canPause = true;
var canSeek = true;
@@ -472,7 +472,7 @@ function doGetPosition()
var vlc = getVLC("vlc");
// set slider to new position
- if (vlc)
+ if( vlc )
alert( "position is " + vlc.input.time);
}
@@ -531,7 +531,7 @@ function doToggleTeletext()
if( vlc )
{
vlc.video.toggleTeletext();
- if (telxState)
+ if( telxState )
{
document.getElementById("telx").innerHTML = "Teletext on";
telxState = true;
@@ -550,7 +550,7 @@ function doItemCount()
if( vlc )
{
var count = vlc.playlist.items.count;
- document.getElementById("itemCount").value = " Items " + count + " ";
+ document.getElementById("itemCount").value = " Items: " + count + " ";
}
}
@@ -567,10 +567,6 @@ function doPlaylistClearAll()
if( vlc )
{
vlc.playlist.items.clear();
- while( vlc.playlist.items.count > 0)
- {
- // wait till playlist empties.
- }
doItemCount();
}
}
@@ -615,45 +611,40 @@ function doState()
if( vlc )
newState = vlc.input.state;
- if( newState == 0 )
- {
- // current media has stopped
- onEnd();
- }
- else if( newState == 1 )
- {
- // current media is openning/connecting
- onOpen();
- }
- else if( newState == 2 )
- {
- // current media is buffering data
- onBuffer();
- }
- else if( newState == 3 )
- {
- // current media is now playing
- onPlay();
- }
- else if( newState == 4 )
- {
- // current media is now paused
- onPause();
- }
- else if( newState == 5 )
- {
- // current media has stopped
- onStop();
- }
- else if( newState == 6 )
- {
- // current media has ended
- onEnd();
- }
- else if( newState == 7 )
+ switch( newState )
{
- // current media encountered error
- onError();
+ case 0:
+ // player is in idle state
+ onEnd();
+ break;
+ case 1:
+ // current media is openning/connecting
+ onOpen();
+ break;
+ case 2:
+ // current media is buffering data
+ onBuffer();
+ break;
+ case 3:
+ // current media is now playing
+ onPlay();
+ break;
+ case 4:
+ // current media is now paused
+ onPause();
+ break;
+ case 5:
+ // current media has stopped
+ onStop();
+ break;
+ case 6:
+ // current media has ended
+ onEnd();
+ break;
+ case 7:
+ // current media encountered error
+ onError();
+ break;
}
}
@@ -666,14 +657,8 @@ function doGo(targetURL)
if( vlc )
{
vlc.playlist.items.clear();
- while( vlc.playlist.items.count > 0 )
- {
- // clear() may return before the playlist has actually been cleared
- // just wait for it to finish its job
- }
var options = [":rtsp-tcp"];
var itemId = vlc.playlist.add(targetURL,"",options);
- options = [];
if( itemId != -1 )
{
// play MRL
@@ -694,7 +679,6 @@ function doAdd(targetURL)
if( vlc )
{
vlc.playlist.add(targetURL, "", options);
- options = [];
doItemCount();
}
}
@@ -732,27 +716,39 @@ function doPlayFaster()
function doMarqueeOption(option, value)
{
var vlc = getVLC("vlc");
- val = parseInt(value);
if( vlc )
{
- if (option == 1)
- vlc.video.marquee.color = val;
- if (option == 2)
- vlc.video.marquee.opacity = val;
- if (option == 3)
- vlc.video.marquee.position = value;
- if (option == 4)
- vlc.video.marquee.refresh = val;
- if (option == 5)
- vlc.video.marquee.size = val;
- if (option == 6)
- vlc.video.marquee.text = value;
- if (option == 7)
- vlc.video.marquee.timeout = val;
- if (option == 8)
- vlc.video.marquee.x = val;
- if (option == 9)
- vlc.video.marquee.y = val;
+ val = parseInt(value);
+ switch( option )
+ {
+ case "1":
+ vlc.video.marquee.color = val;
+ break;
+ case "2":
+ vlc.video.marquee.opacity = val;
+ break;
+ case "3":
+ vlc.video.marquee.position = value;
+ break;
+ case "4":
+ vlc.video.marquee.refresh = val;
+ break;
+ case "5":
+ vlc.video.marquee.size = val;
+ break;
+ case "6":
+ vlc.video.marquee.text = value;
+ break;
+ case "7":
+ vlc.video.marquee.timeout = val;
+ break;
+ case "8":
+ vlc.video.marquee.x = val;
+ break;
+ case "9":
+ vlc.video.marquee.y = val;
+ break;
+ }
}
}
@@ -761,21 +757,31 @@ function doLogoOption(option, value)
var vlc = getVLC("vlc");
if( vlc )
{
- if (option == 1)
- vlc.video.logo.file(value);
- if (option == 2)
- vlc.video.logo.position = value;
val = parseInt(value);
- if (option == 3)
- vlc.video.logo.opacity = 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;
+ switch( option )
+ {
+ case "1":
+ vlc.video.logo.file(value);
+ break;
+ case "2":
+ vlc.video.logo.position = value;
+ break;
+ case "3":
+ vlc.video.logo.opacity = val;
+ break;
+ case "4":
+ vlc.video.logo.repeat = val;
+ break;
+ case "5":
+ vlc.video.logo.delay = val;
+ break;
+ case "6":
+ vlc.video.logo.x = val;
+ break;
+ case "7":
+ vlc.video.logo.y = val;
+ break;
+ }
}
}
@@ -810,44 +816,40 @@ var liveFeedRoll = 0;
function onPlaying()
{
- var vlc = getVLC("vlc");
- var info = document.getElementById("info");
- if( vlc )
+ var vlc = getVLC("vlc");
+ var info = document.getElementById("info");
+ if( vlc )
+ {
+ var mediaLen = vlc.input.length;
+ if( mediaLen > 0 )
{
- var mediaLen = vlc.input.length;
- if( mediaLen > 0 )
- {
- // seekable media
- info.innerHTML = formatTime(vlc.input.time)+"/"+formatTime(mediaLen);
- }
- else
- {
- // non-seekable "live" media
- liveFeedRoll = liveFeedRoll & 3;
- info.innerHTML = liveFeedText[liveFeedRoll++];
- }
+ // seekable media
+ info.innerHTML = formatTime(vlc.input.time)+"/"+formatTime(mediaLen);
}
+ else
+ {
+ // non-seekable "live" media
+ liveFeedRoll = liveFeedRoll & 3;
+ info.innerHTML = liveFeedText[liveFeedRoll++];
+ }
+ }
}
function onPause()
{
document.getElementById("state").innerHTML = "Paused...";
- document.getElementById("PlayOrPause").value = " Play ";
+ document.getElementById("PlayOrPause").value = "Play";
}
function onStop()
{
- var vlc = getVLC("vlc");
-
document.getElementById("info").innerHTML = "-:--:--/-:--:--";
document.getElementById("state").innerHTML = "Stopped...";
- document.getElementById("PlayOrPause").value = " Play ";
+ document.getElementById("PlayOrPause").value = "Play";
}
function onError()
{
- var vlc = getVLC("vlc");
-
document.getElementById("state").innerHTML = "Error...";
}
diff --git a/share/test/windowless.html b/share/test/windowless.html
index e02a376..32d69da 100755
--- a/share/test/windowless.html
+++ b/share/test/windowless.html
@@ -17,7 +17,7 @@ form {
<!--
function init()
{
- if( navigator.appName.indexOf("Microsoft Internet")==-1 )
+ if( navigator.appName.indexOf("Microsoft Internet") == -1 )
{
onVLCPluginReady()
}
@@ -28,7 +28,7 @@ function init()
else
{
/* Explorer loads plugins asynchronously */
- document.onreadystatechange=function()
+ document.onreadystatechange = function()
{
if( document.readyState == 'complete' )
{
@@ -40,16 +40,16 @@ function init()
function getVLC(name)
{
- if (window.document[name])
+ if( window.document[name] )
{
return window.document[name];
}
- if (navigator.appName.indexOf("Microsoft Internet")==-1)
+ if( navigator.appName.indexOf("Microsoft Internet") == -1 )
{
- if (document.embeds && document.embeds[name])
+ if( document.embeds && document.embeds[name] )
return document.embeds[name];
}
- else // if (navigator.appName.indexOf("Microsoft Internet")!=-1)
+ else
{
return document.getElementById(name);
}
@@ -59,16 +59,17 @@ function registerVLCEvent(event, handler)
{
var vlc = getVLC("vlc");
- if (vlc) {
- if (vlc.attachEvent) {
+ if( vlc )
+ {
+ if( vlc.attachEvent )
+ {
// Microsoft
- vlc.attachEvent (event, handler);
- } else if (vlc.addEventListener) {
+ vlc.attachEvent(event, handler);
+ }
+ else if( vlc.addEventListener )
+ {
// Mozilla: DOM level 2
- vlc.addEventListener (event, handler, true);
- } else {
- // DOM level 0
- eval("vlc.on" + event + " = handler");
+ vlc.addEventListener(event, handler, false);
}
}
}
@@ -77,16 +78,17 @@ function unregisterVLCEvent(event, handler)
{
var vlc = getVLC("vlc");
- if (vlc) {
- if (vlc.detachEvent) {
+ if( vlc )
+ {
+ if( vlc.detachEvent )
+ {
// Microsoft
- vlc.detachEvent (event, handler);
- } else if (vlc.removeEventListener) {
+ vlc.detachEvent(event, handler);
+ }
+ else if( vlc.removeEventListener )
+ {
// Mozilla: DOM level 2
- vlc.removeEventListener (event, handler, true);
- } else {
- // DOM level 0
- eval("vlc.on" + event + " = null");
+ vlc.removeEventListener(event, handler, false);
}
}
}
@@ -162,21 +164,6 @@ function handle_MediaPlayerTimeChanged(time)
}
}
-function handle_MediaPlayerPositionChanged(val)
-{
- // set javascript slider to correct position
-}
-
-function handle_MediaPlayerSeekableChanged(val)
-{
- setSeekable(val);
-}
-
-function handle_MediaPlayerPausableChanged(val)
-{
- setPauseable(val);
-}
-
function handle_MediaPlayerTitleChanged(val)
{
//setTitle(val);
@@ -203,9 +190,6 @@ function onVLCPluginReady()
registerVLCEvent("MediaPlayerEndReached", handle_MediaPlayerEndReached);
registerVLCEvent("MediaPlayerEncounteredError", handle_MediaPlayerEncounteredError);
registerVLCEvent("MediaPlayerTimeChanged", handle_MediaPlayerTimeChanged);
- registerVLCEvent("MediaPlayerPositionChanged", handle_MediaPlayerPositionChanged);
- registerVLCEvent("MediaPlayerSeekableChanged", handle_MediaPlayerSeekableChanged);
- registerVLCEvent("MediaPlayerPausableChanged", handle_MediaPlayerPausableChanged);
registerVLCEvent("MediaPlayerTitleChanged", handle_MediaPlayerTitleChanged);
registerVLCEvent("MediaPlayerLengthChanged", handle_MediaPlayerLengthChanged);
}
@@ -224,9 +208,6 @@ function close()
unregisterVLCEvent("MediaPlayerEndReached", handle_MediaPlayerEndReached);
unregisterVLCEvent("MediaPlayerEncounteredError", handle_MediaPlayerEncounteredError);
unregisterVLCEvent("MediaPlayerTimeChanged", handle_MediaPlayerTimeChanged);
- unregisterVLCEvent("MediaPlayerPositionChanged", handle_MediaPlayerPositionChanged);
- unregisterVLCEvent("MediaPlayerSeekableChanged", handle_MediaPlayerSeekableChanged);
- unregisterVLCEvent("MediaPlayerPausableChanged", handle_MediaPlayerPausableChanged);
unregisterVLCEvent("MediaPlayerTitleChanged", handle_MediaPlayerTitleChanged);
unregisterVLCEvent("MediaPlayerLengthChanged", handle_MediaPlayerLengthChanged);
}
@@ -286,12 +267,12 @@ function close()
<tr>
<td>
- <input type="button" id="PlayOrPause" value=" Play " onClick='doPlayOrPause();'>
+ <input type="button" id="PlayOrPause" style="width:60px" value="Play" onClick='doPlayOrPause();'>
<input type="button" value="Stop" onClick='doStop();'>
</td>
- <td style="text-align:center; width:15%">
+ <td style="width:100px; text-align:center">
<div id="info">-:--:--/-:--:--</div>
- <div id="state">Stopped...</div>
+ <div id="state">Idle...</div>
</td>
</tr>
<tr>
@@ -306,108 +287,6 @@ function close()
<script type="text/javascript">
<!--
-var rate = 0;
-var prevState = 0;
-var telxState = false;
-var canPause = true;
-var canSeek = true;
-
-function setPauseable(val)
-{
- canPause = val;
-}
-
-function setSeekable(val)
-{
- canSeek = val;
-}
-
-function doSetSlider()
-{
- var vlc = getVLC("vlc");
-
- // set slider to new position
- if( vlc )
- vlc.input.time = (vlc.input.length/2);
-}
-
-function doGetPosition()
-{
- var vlc = getVLC("vlc");
-
- // set slider to new position
- if (vlc)
- alert( "position is " + vlc.input.time);
-}
-
-function doReverse(rate)
-{
- var vlc = getVLC("vlc");
- if( vlc )
- vlc.input.rate = -1.0 * vlc.input.rate;
-}
-
-function doAudioChannel(value)
-{
- var vlc = getVLC("vlc");
- if( vlc )
- vlc.audio.channel = parseInt(value);
-}
-
-function doAudioTrack(value)
-{
- var vlc = getVLC("vlc");
- if( vlc )
- {
- vlc.audio.track = vlc.audio.track + value;
- document.getElementById("trackTextField").innerHTML = vlc.audio.track;
- }
-}
-
-function doAspectRatio(value)
-{
- var vlc = getVLC("vlc");
- if( vlc )
- vlc.video.aspectRatio = value;
-}
-
-function doSubtitle(value)
-{
- var vlc = getVLC("vlc");
- if( vlc )
- {
- vlc.subtitle.track = vlc.subtitle.track + value;
- document.getElementById("spuTextField").innerHTML = vlc.subtitle.track;
- }
-}
-
-function doTelxPage(value)
-{
- var vlc = getVLC("vlc");
- if( vlc )
- vlc.video.teletext = parseInt(value);
-}
-
-function doToggleTeletext()
-{
- var vlc = getVLC("vlc");
-
- if( vlc )
- {
- vlc.video.toggleTeletext();
- if (telxState)
- {
- document.getElementById("telx").innerHTML = "Teletext on";
- telxState = true;
- }
- else
- {
- document.getElementById("telx").innerHTML = "Teletext off";
- telxState = false;
- }
- }
-}
-
function doToggle3dTransform()
{
var vlc = getVLC("vlc");
@@ -415,7 +294,7 @@ function doToggle3dTransform()
if( vlc )
{
- if (!vlc.style.transform)
+ if( !vlc.style.transform )
{
vlc.style.transform = transform;
vlc.style.webkitTransform = transform;
@@ -435,7 +314,7 @@ function doToggleOpacity()
if( vlc )
{
- if (!vlc.style.opacity)
+ if( !vlc.style.opacity )
{
vlc.style.opacity = opacity;
}
@@ -453,7 +332,7 @@ function doToggleRound()
if( vlc )
{
- if (!vlc.style.borderRadius)
+ if( !vlc.style.borderRadius )
{
vlc.style.borderRadius = corner;
}
@@ -463,46 +342,6 @@ function doToggleRound()
}
}
}
-function doItemCount()
-{
- var vlc = getVLC("vlc");
- if( vlc )
- {
- var count = vlc.playlist.items.count;
- document.getElementById("itemCount").value = " Items " + count + " ";
- }
-}
-
-function doRemoveItem(item)
-{
- var vlc = getVLC("vlc");
- if( vlc )
- vlc.playlist.items.remove(item);
-}
-
-function doPlaylistClearAll()
-{
- var vlc = getVLC("vlc");
- if( vlc )
- {
- vlc.playlist.items.clear();
- while( vlc.playlist.items.count > 0)
- {
- // wait till playlist empties.
- }
- doItemCount();
- }
-}
-
-function updateVolume(deltaVol)
-{
- var vlc = getVLC("vlc");
- if( vlc )
- {
- vlc.audio.volume += deltaVol;
- document.getElementById("volumeTextField").innerHTML = vlc.audio.volume+"%";
- }
-}
function formatTime(timeVal)
{
@@ -524,57 +363,6 @@ function formatTime(timeVal)
return timeMin+":"+timeSec;
}
-// Old method of querying current state
-// function doState() - depreceated
-function doState()
-{
- var vlc = getVLC("vlc");
- var newState = 0;
-
- if( vlc )
- newState = vlc.input.state;
-
- if( newState == 0 )
- {
- // current media has stopped
- onEnd();
- }
- else if( newState == 1 )
- {
- // current media is openning/connecting
- onOpen();
- }
- else if( newState == 2 )
- {
- // current media is buffering data
- onBuffer();
- }
- else if( newState == 3 )
- {
- // current media is now playing
- onPlay();
- }
- else if( newState == 4 )
- {
- // current media is now paused
- onPause();
- }
- else if( newState == 5 )
- {
- // current media has stopped
- onStop();
- }
- else if( newState == 6 )
- {
- // current media has ended
- onEnd();
- }
- else if( newState == 7 )
- {
- // current media encountered error
- onError();
- }
-}
/* actions */
@@ -585,14 +373,8 @@ function doGo(targetURL)
if( vlc )
{
vlc.playlist.items.clear();
- while( vlc.playlist.items.count > 0 )
- {
- // clear() may return before the playlist has actually been cleared
- // just wait for it to finish its job
- }
var options = [":rtsp-tcp"];
var itemId = vlc.playlist.add(targetURL,"",options);
- options = [];
if( itemId != -1 )
{
// play MRL
@@ -602,7 +384,6 @@ function doGo(targetURL)
{
alert("cannot play at the moment !");
}
- doItemCount();
}
}
@@ -613,8 +394,6 @@ function doAdd(targetURL)
if( vlc )
{
vlc.playlist.add(targetURL, "", options);
- options = [];
- doItemCount();
}
}
@@ -624,7 +403,6 @@ function doPlayOrPause()
if( vlc )
{
vlc.playlist.togglePause();
- }
}
function doStop()
@@ -634,69 +412,6 @@ function doStop()
vlc.playlist.stop();
}
-function doPlaySlower()
-{
- var vlc = getVLC("vlc");
- if( vlc )
- vlc.input.rate = vlc.input.rate / 2;
-}
-
-function doPlayFaster()
-{
- var vlc = getVLC("vlc");
- if( vlc )
- vlc.input.rate = vlc.input.rate * 2;
-}
-
-function doMarqueeOption(option, value)
-{
- var vlc = getVLC("vlc");
- val = parseInt(value);
- if( vlc )
- {
- if (option == 1)
- vlc.video.marquee.color = val;
- if (option == 2)
- vlc.video.marquee.opacity = val;
- if (option == 3)
- vlc.video.marquee.position = value;
- if (option == 4)
- vlc.video.marquee.refresh = val;
- if (option == 5)
- vlc.video.marquee.size = val;
- if (option == 6)
- vlc.video.marquee.text = value;
- if (option == 7)
- vlc.video.marquee.timeout = val;
- if (option == 8)
- vlc.video.marquee.x = val;
- if (option == 9)
- vlc.video.marquee.y = val;
- }
-}
-
-function doLogoOption(option, value)
-{
- var vlc = getVLC("vlc");
- if( vlc )
- {
- if (option == 1)
- vlc.video.logo.file(value);
- if (option == 2)
- vlc.video.logo.position = value;
- val = parseInt(value);
- if (option == 3)
- vlc.video.logo.opacity = 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;
- }
-}
/* events */
@@ -729,44 +444,40 @@ var liveFeedRoll = 0;
function onPlaying()
{
- var vlc = getVLC("vlc");
- var info = document.getElementById("info");
- if( vlc )
+ var vlc = getVLC("vlc");
+ var info = document.getElementById("info");
+ if( vlc )
+ {
+ var mediaLen = vlc.input.length;
+ if( mediaLen > 0 )
{
- var mediaLen = vlc.input.length;
- if( mediaLen > 0 )
- {
- // seekable media
- info.innerHTML = formatTime(vlc.input.time)+"/"+formatTime(mediaLen);
- }
- else
- {
- // non-seekable "live" media
- liveFeedRoll = liveFeedRoll & 3;
- info.innerHTML = liveFeedText[liveFeedRoll++];
- }
+ // seekable media
+ info.innerHTML = formatTime(vlc.input.time)+"/"+formatTime(mediaLen);
+ }
+ else
+ {
+ // non-seekable "live" media
+ liveFeedRoll = liveFeedRoll & 3;
+ info.innerHTML = liveFeedText[liveFeedRoll++];
}
+ }
}
function onPause()
{
document.getElementById("state").innerHTML = "Paused...";
- document.getElementById("PlayOrPause").value = " Play ";
+ document.getElementById("PlayOrPause").value = "Play";
}
function onStop()
{
- var vlc = getVLC("vlc");
-
document.getElementById("info").innerHTML = "-:--:--/-:--:--";
document.getElementById("state").innerHTML = "Stopped...";
- document.getElementById("PlayOrPause").value = " Play ";
+ document.getElementById("PlayOrPause").value = "Play";
}
function onError()
{
- var vlc = getVLC("vlc");
-
document.getElementById("state").innerHTML = "Error...";
}
--
2.1.4
More information about the vlc-devel
mailing list