Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
9d0207b6
Commit
9d0207b6
authored
Sep 06, 2010
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mozilla/test.html: kill monitorTimer use MediaPlayer* events only
parent
2776c67e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
85 deletions
+3
-85
projects/mozilla/test.html
projects/mozilla/test.html
+3
-85
No files found.
projects/mozilla/test.html
View file @
9d0207b6
...
@@ -137,12 +137,14 @@ function handle_MediaPlayerBuffering(val)
...
@@ -137,12 +137,14 @@ function handle_MediaPlayerBuffering(val)
function handle_MediaPlayerPlaying()
function handle_MediaPlayerPlaying()
{
{
alert(" Playing ");
onPlay();
onPlay();
}
}
function handle_MediaPlayerPaused()
function handle_MediaPlayerPaused()
{
{
onPause();
alert(" Paused ");
onPause();
}
}
function handle_MediaPlayerStopped()
function handle_MediaPlayerStopped()
...
@@ -235,10 +237,6 @@ function onVLCPluginReady()
...
@@ -235,10 +237,6 @@ function onVLCPluginReady()
function close()
function close()
{
{
unregisterVLCEvent('MediaPlayerMouseGrab', handleMouseGrab);
unregisterVLCEvent('MediaPlayerMouseRelease', handleMouseRelease);
unregisterVLCEvent('MediaPlayerMouseClick', handleMouseClick);
unregisterVLCEvent("MediaPlayerMediaChanged", handleMediaPlayerMediaChanged);
unregisterVLCEvent("MediaPlayerMediaChanged", handleMediaPlayerMediaChanged);
unregisterVLCEvent("MediaPlayerNothingSpecial", handle_MediaPlayerNothingSpecial);
unregisterVLCEvent("MediaPlayerNothingSpecial", handle_MediaPlayerNothingSpecial);
unregisterVLCEvent("MediaPlayerOpening", handle_MediaPlayerOpening);
unregisterVLCEvent("MediaPlayerOpening", handle_MediaPlayerOpening);
...
@@ -432,7 +430,6 @@ Insert Slider widget
...
@@ -432,7 +430,6 @@ Insert Slider widget
var rate = 0;
var rate = 0;
var prevState = 0;
var prevState = 0;
var monitorTimerId = 0;
var inputTracker;
var inputTracker;
var inputTrackerScrolling = false;
var inputTrackerScrolling = false;
var inputTrackerIgnoreChange = false;
var inputTrackerIgnoreChange = false;
...
@@ -647,71 +644,6 @@ function doState()
...
@@ -647,71 +644,6 @@ function doState()
}
}
}
}
function monitor()
{
var vlc = getVLC("vlc");
var newState = 0;
if( vlc )
{
newState = vlc.input.state;
}
if( prevState != newState )
{
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();
}
prevState = newState;
}
else if( newState == 3 )
{
// current media is playing
onPlaying();
}
if( monitorTimerId == 0 )
{
monitorTimerId = setInterval("monitor()", 1000);
}
};
/* actions */
/* actions */
function doGo(targetURL)
function doGo(targetURL)
...
@@ -733,10 +665,6 @@ function doGo(targetURL)
...
@@ -733,10 +665,6 @@ function doGo(targetURL)
{
{
// play MRL
// play MRL
vlc.playlist.playItem(itemId);
vlc.playlist.playItem(itemId);
if( monitorTimerId == 0 )
{
monitor();
}
}
}
else
else
{
{
...
@@ -766,12 +694,10 @@ function doPlayOrPause()
...
@@ -766,12 +694,10 @@ function doPlayOrPause()
if( vlc.playlist.isPlaying && canPause )
if( vlc.playlist.isPlaying && canPause )
{
{
vlc.playlist.togglePause();
vlc.playlist.togglePause();
//monitor();
}
}
else if( vlc.playlist.items.count > 0 )
else if( vlc.playlist.items.count > 0 )
{
{
vlc.playlist.play();
vlc.playlist.play();
//monitor();
}
}
else
else
{
{
...
@@ -783,16 +709,8 @@ function doPlayOrPause()
...
@@ -783,16 +709,8 @@ function doPlayOrPause()
function doStop()
function doStop()
{
{
var vlc = getVLC("vlc");
var vlc = getVLC("vlc");
if( vlc )
if( vlc )
vlc.playlist.stop();
vlc.playlist.stop();
if( monitorTimerId != 0 )
{
clearInterval(monitorTimerId);
monitorTimerId = 0;
}
onStop();
}
}
function doPlaySlower()
function doPlaySlower()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment