Merge branch 1.0-bugfix

[vlc] / projects / mozilla / vlcplugin.cpp

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index 9cac45c627594ca86a2beb263cc38aa97e2336c5..552d6fdad43fb9a780a511f1e6f5e19b90094110 100644 (file)
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -50,7 +50,6 @@ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
     libvlc_instance(NULL),
     libvlc_media_list(NULL),
     libvlc_media_player(NULL),
-    libvlc_log(NULL),
     p_scriptClass(NULL),
     p_browser(instance),
     psz_baseURL(NULL)
@@ -74,8 +73,10 @@ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
 #endif
 {
     memset(&npwindow, 0, sizeof(NPWindow));
+#if XP_UNIX
     memset(&npvideo, 0, sizeof(Window));
     memset(&npcontrol, 0, sizeof(Window));
+#endif
 }
 
 static bool boolValue(const char *value) {
@@ -134,7 +135,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
     /* parse plugin arguments */
     for( int i = 0; i < argc ; i++ )
     {
-        fprintf(stderr, "argn=%s, argv=%s\n", argn[i], argv[i]);
+       /* fprintf(stderr, "argn=%s, argv=%s\n", argn[i], argv[i]); */
 
         if( !strcmp( argn[i], "target" )
          || !strcmp( argn[i], "mrl")
@@ -185,7 +186,7 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
         }
         else if( !strcmp( argn[i], "toolbar" ) )
         {
-/* FIXME: Remove this when toolbar functionality has been implemented on\
+/* FIXME: Remove this when toolbar functionality has been implemented on
  * MacOS X and Win32 for Firefox/Mozilla/Safari. */
 #ifdef XP_UNIX
             b_toolbar = boolValue(argv[i]);
@@ -197,7 +198,6 @@ NPError VlcPlugin::init(int argc, char* const argn[], char* const argv[])
     libvlc_exception_init(&ex);
 
     libvlc_instance = libvlc_new(ppsz_argc, ppsz_argv, &ex);
-
     if( libvlc_exception_raised(&ex) )
     {
         libvlc_exception_clear(&ex);
@@ -266,8 +266,6 @@ VlcPlugin::~VlcPlugin()
 {
     free(psz_baseURL);
     free(psz_target);
-    if( libvlc_log )
-        libvlc_log_close(libvlc_log, NULL);
     if( libvlc_media_player )
         libvlc_media_player_release( libvlc_media_player );
     if( libvlc_media_list )
@@ -291,7 +289,7 @@ void VlcPlugin::set_player_window( libvlc_exception_t *ex )
 #endif
 #ifdef XP_WIN
     libvlc_media_player_set_hwnd(libvlc_media_player,
-                                 getVideoWindow(),
+                                 getWindow().window,
                                  ex);
 #endif
 }
@@ -342,24 +340,6 @@ int VlcPlugin::playlist_add_extended_untrusted( const char *mrl, const char *nam
     return item;
 }
 
-void VlcPlugin::playlist_play( libvlc_exception_t *ex )
-{
-    if( libvlc_media_player||playlist_select(0,ex) )
-        libvlc_media_player_play(libvlc_media_player,ex);
-}
-
-void VlcPlugin::playlist_play_item( int idx, libvlc_exception_t *ex )
-{
-    if( playlist_select(idx,ex) )
-        libvlc_media_player_play(libvlc_media_player,ex);
-}
-
-void VlcPlugin::playlist_stop( libvlc_exception_t *ex )
-{
-    if( libvlc_media_player )
-        libvlc_media_player_stop(libvlc_media_player,ex);
-}
-
 bool VlcPlugin::playlist_select( int idx, libvlc_exception_t *ex )
 {
     libvlc_media_t *p_m = NULL;
@@ -399,24 +379,6 @@ bad_unlock:
     return false;
 }
 
-void VlcPlugin::playlist_next( libvlc_exception_t *ex )
-{
-    if( playlist_select(playlist_index+1,ex) )
-        libvlc_media_player_play(libvlc_media_player,ex);
-}
-
-void VlcPlugin::playlist_prev( libvlc_exception_t *ex )
-{
-    if( playlist_select(playlist_index-1,ex) )
-        libvlc_media_player_play(libvlc_media_player,ex);
-}
-
-void VlcPlugin::playlist_pause( libvlc_exception_t *ex )
-{
-    if( libvlc_media_player )
-        libvlc_media_player_pause(libvlc_media_player,ex);
-}
-
 void VlcPlugin::playlist_delete_item( int idx, libvlc_exception_t *ex )
 {
     libvlc_media_list_lock(libvlc_media_list);
@@ -440,26 +402,16 @@ int VlcPlugin::playlist_count( libvlc_exception_t *ex )
     return items_count;
 }
 
-int VlcPlugin::playlist_isplaying( libvlc_exception_t *ex )
-{
-    int is_playing = 0;
-    if( libvlc_media_player )
-        is_playing = libvlc_media_player_is_playing( libvlc_media_player, ex );
-    return is_playing;
-}
-
 void VlcPlugin::toggle_fullscreen( libvlc_exception_t *ex )
 {
     if( playlist_isplaying(ex) )
         libvlc_toggle_fullscreen(libvlc_media_player,ex);
 }
-
 void VlcPlugin::set_fullscreen( int yes, libvlc_exception_t *ex )
 {
     if( playlist_isplaying(ex) )
         libvlc_set_fullscreen(libvlc_media_player,yes,ex);
 }
-
 int  VlcPlugin::get_fullscreen( libvlc_exception_t *ex )
 {
     int r = 0;
@@ -521,7 +473,7 @@ relativeurl:
             if( href )
             {
                 /* prepend base URL */
-                strcpy(href, psz_baseURL);
+                memcpy(href, psz_baseURL, baseLen+1);
 
                 /*
                 ** relative url could be empty,
@@ -536,7 +488,7 @@ relativeurl:
 
                 /* skip over protocol part  */
                 char *pathstart = strchr(href, ':');
-                char *pathend;
+                char *pathend = href+baseLen;
                 if( pathstart )
                 {
                     if( '/' == *(++pathstart) )
@@ -548,7 +500,6 @@ relativeurl:
                     }
                     /* skip over host part */
                     pathstart = strchr(pathstart, '/');
-                    pathend = href+baseLen;
                     if( ! pathstart )
                     {
                         // no path, add a / past end of url (over '\0')
@@ -566,7 +517,6 @@ relativeurl:
                         return NULL;
                     }
                     pathstart = href;
-                    pathend = href+baseLen;
                 }
 
                 /* relative URL made of an absolute path ? */