mozilla plugin: fix compilation.

[vlc] / projects / mozilla / vlcplugin.cpp

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index f6b88322f89cc992e04e790373c9fea5c67900b1..bb5849ce2ddb6e70ef22f2c0c4e992d116192482 100644 (file)
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -176,6 +176,7 @@ bool EventObj::insert(const NPString &s, NPObject *l, bool b)
             return false;
         i->get(e);
     }
+    return true;
 }
 
 
@@ -203,6 +204,8 @@ bool EventObj::remove(const NPString &s, NPObject *l, bool b)
     }
     if(!any)
         unask_for_event(e);
+
+    return true;
 }
 
 
@@ -446,16 +449,15 @@ void VlcPlugin::set_player_window()
 #endif
 }
 
-int VlcPlugin::playlist_add( const char *mrl, libvlc_exception_t *ex )
+int VlcPlugin::playlist_add( const char *mrl )
 {
     int item = -1;
-    libvlc_media_t *p_m = libvlc_media_new(libvlc_instance,mrl,ex);
-    if( libvlc_exception_raised(ex) )
+    libvlc_media_t *p_m = libvlc_media_new(libvlc_instance,mrl);
+    if( !p_m )
         return -1;
 
     libvlc_media_list_lock(libvlc_media_list);
-    libvlc_media_list_add_media(libvlc_media_list,p_m,ex);
-    if( !libvlc_exception_raised(ex) )
+    if( !libvlc_media_list_add_media(libvlc_media_list,p_m) )
         item = libvlc_media_list_count(libvlc_media_list)-1;
     libvlc_media_list_unlock(libvlc_media_list);
 
@@ -465,19 +467,18 @@ int VlcPlugin::playlist_add( const char *mrl, libvlc_exception_t *ex )
 }
 
 int VlcPlugin::playlist_add_extended_untrusted( const char *mrl, const char *name,
-                    int optc, const char **optv, libvlc_exception_t *ex )
+                    int optc, const char **optv )
 {
-    libvlc_media_t *p_m = libvlc_media_new(libvlc_instance, mrl,ex);
+    libvlc_media_t *p_m = libvlc_media_new(libvlc_instance, mrl);
     int item = -1;
-    if( libvlc_exception_raised(ex) )
+    if( !p_m )
         return -1;
 
     for( int i = 0; i < optc; ++i )
         libvlc_media_add_option_flag(p_m, optv[i], libvlc_media_option_unique);
 
     libvlc_media_list_lock(libvlc_media_list);
-    libvlc_media_list_add_media(libvlc_media_list,p_m,ex);
-    if( !libvlc_exception_raised(ex) )
+    if( !libvlc_media_list_add_media(libvlc_media_list,p_m) )
         item = libvlc_media_list_count(libvlc_media_list)-1;
     libvlc_media_list_unlock(libvlc_media_list);
     libvlc_media_release(p_m);
@@ -485,7 +486,7 @@ int VlcPlugin::playlist_add_extended_untrusted( const char *mrl, const char *nam
     return item;
 }
 
-bool VlcPlugin::playlist_select( int idx, libvlc_exception_t *ex )
+bool VlcPlugin::playlist_select( int idx )
 {
     libvlc_media_t *p_m = NULL;
 
@@ -498,10 +499,10 @@ bool VlcPlugin::playlist_select( int idx, libvlc_exception_t *ex )
 
     playlist_index = idx;
 
-    p_m = libvlc_media_list_item_at_index(libvlc_media_list,playlist_index,ex);
+    p_m = libvlc_media_list_item_at_index(libvlc_media_list,playlist_index);
     libvlc_media_list_unlock(libvlc_media_list);
 
-    if( libvlc_exception_raised(ex) )
+    if( !p_m )
         return false;
 
     if( libvlc_media_player )
@@ -528,14 +529,15 @@ bad_unlock:
     return false;
 }
 
-void VlcPlugin::playlist_delete_item( int idx, libvlc_exception_t *ex )
+int VlcPlugin::playlist_delete_item( int idx )
 {
     libvlc_media_list_lock(libvlc_media_list);
-    libvlc_media_list_remove_index(libvlc_media_list,idx,ex);
+    int ret = libvlc_media_list_remove_index(libvlc_media_list,idx);
     libvlc_media_list_unlock(libvlc_media_list);
+    return ret;
 }
 
-void VlcPlugin::playlist_clear( libvlc_exception_t *ex )
+void VlcPlugin::playlist_clear()
 {
     if( libvlc_media_list )
         libvlc_media_list_release(libvlc_media_list);
@@ -551,25 +553,25 @@ int VlcPlugin::playlist_count()
     return items_count;
 }
 
-void VlcPlugin::toggle_fullscreen( libvlc_exception_t *ex )
+void VlcPlugin::toggle_fullscreen()
 {
     if( playlist_isplaying() )
-        libvlc_toggle_fullscreen(libvlc_media_player,ex);
+        libvlc_toggle_fullscreen(libvlc_media_player);
 }
-void VlcPlugin::set_fullscreen( int yes, libvlc_exception_t *ex )
+void VlcPlugin::set_fullscreen( int yes)
 {
     if( playlist_isplaying() )
-        libvlc_set_fullscreen(libvlc_media_player,yes,ex);
+        libvlc_set_fullscreen(libvlc_media_player,yes);
 }
-int  VlcPlugin::get_fullscreen( libvlc_exception_t *ex )
+int  VlcPlugin::get_fullscreen()
 {
     int r = 0;
     if( playlist_isplaying() )
-        r = libvlc_get_fullscreen(libvlc_media_player,ex);
+        r = libvlc_get_fullscreen(libvlc_media_player);
     return r;
 }
 
-bool  VlcPlugin::player_has_vout( libvlc_exception_t *ex )
+bool  VlcPlugin::player_has_vout()
 {
     bool r = false;
     if( playlist_isplaying() )