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 ec2118a550664b84b0625531702c4c4c6926f1df..e0f223d34b5f6a6025b0de68c31385919852d3d4 100644 (file)
--- a/modules/gui/skins2/commands/cmd_playlist.cpp
+++ b/modules/gui/skins2/commands/cmd_playlist.cpp
@@ -17,9 +17,9 @@
  * 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"
@@ -36,9 +36,7 @@ void CmdPlaylistNext::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
-    {
         playlist_Next( pPlaylist );
-    }
 }
 
 
@@ -46,9 +44,7 @@ void CmdPlaylistPrevious::execute()
 {
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
-    {
         playlist_Prev( pPlaylist );
-    }
 }
 
 
@@ -56,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 );
 }
 
 
@@ -68,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 );
 }
 
 
@@ -80,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 );
 }
 
 
@@ -101,17 +85,25 @@ void CmdPlaylistSave::execute()
     playlist_t *pPlaylist = getIntf()->p_sys->p_playlist;
     if( pPlaylist != NULL )
     {
-        static const char psz_xspf[] = "export-xspf",
-                          psz_m3u[] = "export-m3u";
         const char *psz_module;
         if( m_file.find( ".xsp", 0 ) != string::npos )
-            psz_module = psz_xspf;
+            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
         {
-            psz_module = psz_m3u;
-            if( m_file.find( ".m3u", 0 ) == string::npos )
-                m_file.append( ".m3u" );
+            msg_Err(getIntf(),"Did not recognise playlist export file type");
+            return;
         }
-        playlist_Export( pPlaylist, m_file.c_str(), pPlaylist->p_local_category, psz_module );
+
+        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);
+}