]> git.sesse.net Git - vlc/commitdiff
mozilla: call libvlc_playlist_items_count() with playlist lock held.
authorJean-Paul Saman <jean-paul.saman@m2x.nl>
Mon, 9 Feb 2009 08:42:07 +0000 (09:42 +0100)
committerJean-Paul Saman <jean-paul.saman@m2x.nl>
Mon, 9 Feb 2009 08:42:48 +0000 (09:42 +0100)
projects/mozilla/control/npolibvlc.cpp

index 516bb8b82cdd040aaa2377bb9c6f345236c0d36c..2b43d6760da7074701b0c58b17a2edaeeb68bd21 100644 (file)
@@ -1207,7 +1207,9 @@ RuntimeNPObject::InvokeResult LibvlcPlaylistItemsNPObject::getProperty(int index
         {
             case ID_playlistitems_count:
             {
+                libvlc_playlist_lock(p_plugin->getVLC());
                 int val = libvlc_playlist_items_count(p_plugin->getVLC(), &ex);
+                libvlc_playlist_unlock(p_plugin->getVLC());
                 if( libvlc_exception_raised(&ex) )
                 {
                     NPN_SetException(this, libvlc_exception_get_message(&ex));
@@ -1332,7 +1334,9 @@ RuntimeNPObject::InvokeResult LibvlcPlaylistNPObject::getProperty(int index, NPV
         {
             case ID_playlist_itemcount: /* deprecated */
             {
+                libvlc_playlist_lock(p_plugin->getVLC());
                 int val = libvlc_playlist_items_count(p_plugin->getVLC(), &ex);
+                libvlc_playlist_unlock(p_plugin->getVLC());
                 if( libvlc_exception_raised(&ex) )
                 {
                     NPN_SetException(this, libvlc_exception_get_message(&ex));