Commit c6980e9d authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Rémi Denis-Courmont

mozilla: protect calls to libvlc_playlist_isplaying()

parent de3804f4
......@@ -1349,7 +1349,9 @@ RuntimeNPObject::InvokeResult LibvlcPlaylistNPObject::getProperty(int index, NPV
}
case ID_playlist_isplaying:
{
libvlc_playlist_lock(p_plugin->getVLC());
int val = libvlc_playlist_isplaying(p_plugin->getVLC(), &ex);
libvlc_playlist_unlock(p_plugin->getVLC());
if( libvlc_exception_raised(&ex) )
{
NPN_SetException(this, libvlc_exception_get_message(&ex));
......
......@@ -583,7 +583,9 @@ void VlcPlugin::redrawToolbar()
if( p_md )
{
/* get isplaying */
libvlc_playlist_lock( getVLC() );
is_playing = libvlc_playlist_isplaying( getVLC(), &ex );
libvlc_playlist_unlock( getVLC() );
libvlc_exception_clear( &ex );
/* get movie position in % */
......@@ -696,7 +698,9 @@ vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos
/* get isplaying */
libvlc_exception_init( &ex );
libvlc_playlist_lock( getVLC() );
is_playing = libvlc_playlist_isplaying( getVLC(), &ex );
libvlc_playlist_unlock( getVLC() );
libvlc_exception_clear( &ex );
/* get mute info */
......
......@@ -184,7 +184,11 @@ int16 NPP_HandleEvent( NPP instance, void * event )
libvlc_instance_t *p_vlc = p_plugin->getVLC();
if( p_vlc )
{
if( libvlc_playlist_isplaying(p_vlc, NULL) )
int is_playing;
libvlc_playlist_lock(p_vlc);
is_playing = libvlc_playlist_isplaying(p_vlc, NULL);
libvlc_playlist_lunock(p_vlc);
if( is_playing )
{
libvlc_media_player_t *p_md =
libvlc_playlist_get_media_player(p_vlc, NULL);
......@@ -215,7 +219,11 @@ int16 NPP_HandleEvent( NPP instance, void * event )
if( p_vlc )
{
if( libvlc_playlist_isplaying(p_vlc, NULL) )
int is_playing;
libvlc_playlist_lock(p_vlc);
is_playing = libvlc_playlist_isplaying(p_vlc, NULL);
libvlc_playlist_unlock(p_vlc);
if( is_playing )
{
libvlc_media_player_t *p_md =
libvlc_playlist_get_media_player(p_vlc, NULL);
......@@ -846,7 +854,9 @@ static void ControlHandler( Widget w, XtPointer closure, XEvent *event )
fprintf( stderr, "%s\n", libvlc_exception_get_message(&ex));
libvlc_exception_clear( &ex );
libvlc_playlist_lock( p_plugin->getVLC() );
i_playing = libvlc_playlist_isplaying( p_plugin->getVLC(), &ex );
libvlc_playlist_unlock( p_plugin->getVLC() );
if( libvlc_exception_raised(&ex) )
fprintf( stderr, "%s\n", libvlc_exception_get_message(&ex));
libvlc_exception_clear( &ex );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment