skins2: fix memory leak (a malloc not paired with a free)

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

diff --git a/modules/gui/skins2/commands/cmd_playlist.cpp b/modules/gui/skins2/commands/cmd_playlist.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 599e789..e0f223d
--- a/modules/gui/skins2/commands/cmd_playlist.cpp
+++ b/modules/gui/skins2/commands/cmd_playlist.cpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * cmd_playlist.cpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: cmd_playlist.cpp,v 1.1 2004/01/03 23:31:33 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $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
@@ -17,47 +17,93 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * 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.
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include "cmd_playlist.hpp"
-
+#include <vlc_playlist.h>
+#include "../src/vlcproc.hpp"
+#include "../utils/var_bool.hpp"
 
 void CmdPlaylistDel::execute()
 {
     m_rList.delSelected();
 }
 
+void CmdPlaylistNext::execute()
+{
+    playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
+    if( pPlaylist != NULL )
+        playlist_Next( pPlaylist );
+}
+
 
-void CmdPlaylistSort::execute()
+void CmdPlaylistPrevious::execute()
 {
-    // XXX add the mode and type
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
-    {
-        playlist_Sort( pPlaylist, SORT_TITLE, SORT_NORMAL );
-    }
+        playlist_Prev( pPlaylist );
+}
 
+
+void CmdPlaylistRandom::execute()
+{
+    playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
+    if( pPlaylist != NULL )
+        var_SetBool( pPlaylist , "random", m_value );
 }
 
 
-void CmdPlaylistNext::execute()
+void CmdPlaylistLoop::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
-    {
-        playlist_Next( pPlaylist );
-    }
+        var_SetBool( pPlaylist , "loop", m_value );
 }
 
 
-void CmdPlaylistPrevious::execute()
+void CmdPlaylistRepeat::execute()
+{
+    playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
+    if( pPlaylist != NULL )
+        var_SetBool( pPlaylist , "repeat", m_value );
+}
+
+
+void CmdPlaylistLoad::execute()
+{
+    playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
+    if( pPlaylist != NULL )
+        playlist_Import( pPlaylist, m_file.c_str() );
+}
+
+
+void CmdPlaylistSave::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
     {
-        playlist_Prev( pPlaylist );
+        const char *psz_module;
+        if( m_file.find( ".xsp", 0 ) != string::npos )
+            psz_module = "export-xspf";
+        else if( m_file.find( "m3u", 0 ) != string::npos )
+            psz_module = "export-m3u";
+        else if( m_file.find( "html", 0 ) != string::npos )
+            psz_module = "export-html";
+        else
+        {
+            msg_Err(getIntf(),"Did not recognise playlist export file type");
+            return;
+        }
+
+        playlist_Export( pPlaylist, m_file.c_str(),
+                         pPlaylist->p_local_category, psz_module );
     }
 }
+
+void CmdPlaylistFirst::execute()
+{
+    playlist_Control(getIntf()->p_sys->p_playlist,PLAYLIST_PLAY,pl_Unlocked);
+}