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 4786db9d3746496d4dbdbf4778aeac455d2aab76..90ceb5ff25053115894139f247bfcb8296929790 100644 (file)
--- a/modules/gui/skins2/commands/cmd_add_item.cpp
+++ b/modules/gui/skins2/commands/cmd_add_item.cpp
@@ -5,7 +5,7 @@
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,31 +19,40 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc/vlc.h>
-#include "cmd_add_item.hpp"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#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(),m_name.c_str(),
-                      PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
+        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(), m_name.c_str(),
-                      PLAYLIST_APPEND, PLAYLIST_END );
+        playlist_Add( pPlaylist, psz_uri, NULL,
+                      PLAYLIST_APPEND, PLAYLIST_END, true, false );
     }
+    free( psz_uri );
 }