X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=projects%2Fmozilla%2Fvlcplugin.h;h=3e85840deaffd3c20548be2eb67193e3675e8ce7;hb=db1e6a133d1e29d3eb5bf8d526b76423d523d6a9;hp=cd98e6189812d0a41226a42ce0ade15e3f8f5ed1;hpb=b3958ce98fa87b60a71d3c2ea4b5c969b9570921;p=vlc

diff --git a/projects/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
index cd98e61898..3e85840dea 100644
--- a/projects/mozilla/vlcplugin.h
+++ b/projects/mozilla/vlcplugin.h
@@ -107,7 +107,7 @@ public:
     }
 };
 
-typedef bitmap<libvlc_num_event_types> eventtypes_bitmap_t;
+typedef bitmap<libvlc_VlmMediaInstanceStatusError+1> eventtypes_bitmap_t;
 
 
 class EventObj: private eventtypes_bitmap_t
@@ -167,11 +167,10 @@ public:
     NPError             init(int argc, char* const argn[], char* const argv[]);
     libvlc_instance_t*  getVLC()
                             { return libvlc_instance; };
-    libvlc_media_player_t* getMD(libvlc_exception_t *ex)
+    libvlc_media_player_t* getMD()
     {
         if( !libvlc_media_player )
         {
-             libvlc_exception_raise(ex);
              libvlc_printerr("no mediaplayer");
         }
         return libvlc_media_player;
@@ -224,14 +223,14 @@ public:
     char *   psz_text;
     char *   psz_target;
 
-    void playlist_play(libvlc_exception_t *ex)
+    void playlist_play()
     {
-        if( libvlc_media_player||playlist_select(0,ex) )
+        if( libvlc_media_player||playlist_select(0) )
             libvlc_media_player_play(libvlc_media_player);
     }
-    void playlist_play_item(int idx,libvlc_exception_t *ex)
+    void playlist_play_item(int idx)
     {
-        if( playlist_select(idx,ex) )
+        if( playlist_select(idx) )
             libvlc_media_player_play(libvlc_media_player);
     }
     void playlist_stop()
@@ -239,17 +238,17 @@ public:
         if( libvlc_media_player )
             libvlc_media_player_stop(libvlc_media_player);
     }
-    void playlist_next(libvlc_exception_t *ex)
+    void playlist_next()
     {
-        if( playlist_select(playlist_index+1,ex) )
+        if( playlist_select(playlist_index+1) )
             libvlc_media_player_play(libvlc_media_player);
     }
-    void playlist_prev(libvlc_exception_t *ex)
+    void playlist_prev()
     {
-        if( playlist_select(playlist_index-1,ex) )
+        if( playlist_select(playlist_index-1) )
             libvlc_media_player_play(libvlc_media_player);
     }
-    void playlist_pause(libvlc_exception_t *ex)
+    void playlist_pause()
     {
         if( libvlc_media_player )
             libvlc_media_player_pause(libvlc_media_player);
@@ -263,25 +262,25 @@ public:
         return is_playing;
     }
 
-    int playlist_add( const char *, libvlc_exception_t * );
+    int playlist_add( const char * );
     int playlist_add_extended_untrusted( const char *, const char *, int,
-                                const char **, libvlc_exception_t * );
-    void playlist_delete_item( int, libvlc_exception_t * );
-    void playlist_clear( libvlc_exception_t * );
+                                const char ** );
+    int playlist_delete_item( int );
+    void playlist_clear();
     int  playlist_count();
 
-    void toggle_fullscreen( libvlc_exception_t * );
-    void set_fullscreen( int, libvlc_exception_t * );
-    int  get_fullscreen( libvlc_exception_t * );
+    void toggle_fullscreen();
+    void set_fullscreen( int );
+    int  get_fullscreen();
 
-    bool  player_has_vout( libvlc_exception_t * );
+    bool  player_has_vout();
 
 
     static bool canUseEventListener();
 
     EventObj events;
 private:
-    bool playlist_select(int,libvlc_exception_t *);
+    bool playlist_select(int);
     void set_player_window();
 
     /* VLC reference */