skins2: use new input-item variable for callbacks on input variables and some cleanup

[vlc] / modules / gui / skins2 / commands / cmd_add_item.cpp

diff --git a/modules/gui/skins2/commands/cmd_add_item.cpp b/modules/gui/skins2/commands/cmd_add_item.cpp
index 7b9a97cbdcccc31687ac6294aa5183e2d12153a9..90ceb5ff25053115894139f247bfcb8296929790 100644 (file)
--- a/modules/gui/skins2/commands/cmd_add_item.cpp
+++ b/modules/gui/skins2/commands/cmd_add_item.cpp
@@ -26,29 +26,33 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_playlist.h>
+#include <vlc_url.h>
 #include "cmd_add_item.hpp"
 
 void CmdAddItem::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
-    if( pPlaylist == NULL )
-    {
+    if( !pPlaylist )
+        return;
+
+    char* psz_uri = make_URI(  m_name.c_str() );
+    if( !psz_uri )
         return;
-    }
 
     if( m_playNow )
     {
         // Enqueue and play the item
-        playlist_Add( pPlaylist, m_name.c_str(), NULL,
+        playlist_Add( pPlaylist, psz_uri, NULL,
                       PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END, true,
                       false );
     }
     else
     {
         // Enqueue the item only
-        playlist_Add( pPlaylist, m_name.c_str(), NULL,
+        playlist_Add( pPlaylist, psz_uri, NULL,
                       PLAYLIST_APPEND, PLAYLIST_END, true, false );
     }
+    free( psz_uri );
 }