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
index a598ba89fad1b9ccbadae405cbeb63b364304efb..e0f223d34b5f6a6025b0de68c31385919852d3d4 100644 (file)
--- a/modules/gui/skins2/commands/cmd_playlist.cpp
+++ b/modules/gui/skins2/commands/cmd_playlist.cpp
@@ -17,29 +17,26 @@
  * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, 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 );
-    }
 }
 
 
@@ -47,9 +44,7 @@ void CmdPlaylistPrevious::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
-    {
         playlist_Prev( pPlaylist );
-    }
 }
 
 
@@ -57,11 +52,7 @@ void CmdPlaylistRandom::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
-    {
-        vlc_value_t val;
-        val.b_bool = m_value;
-        var_Set( pPlaylist , "random", val);
-    }
+        var_SetBool( pPlaylist , "random", m_value );
 }
 
 
@@ -69,11 +60,7 @@ void CmdPlaylistLoop::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
-    {
-        vlc_value_t val;
-        val.b_bool = m_value;
-        var_Set( pPlaylist , "loop", val);
-    }
+        var_SetBool( pPlaylist , "loop", m_value );
 }
 
 
@@ -81,11 +68,7 @@ void CmdPlaylistRepeat::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
-    {
-        vlc_value_t val;
-        val.b_bool = m_value;
-        var_Set( pPlaylist , "repeat", val);
-    }
+        var_SetBool( pPlaylist , "repeat", m_value );
 }
 
 
@@ -93,9 +76,7 @@ void CmdPlaylistLoad::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
-    {
         playlist_Import( pPlaylist, m_file.c_str() );
-    }
 }
 
 
@@ -104,10 +85,25 @@ void CmdPlaylistSave::execute()
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
     {
-        // FIXME: when the PLS export will be working, we'll need to remove
-        // this hardcoding...
-        msg_Err( getIntf(), "need to fix playlist save" );
-//        playlist_Export( pPlaylist, m_file.c_str(), "export-m3u" );
+        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);
+}