Misc cleanups in Qt4. (Closes:#736)

[vlc] / modules / misc / playlist / m3u.c

diff --git a/modules/misc/playlist/m3u.c b/modules/misc/playlist/m3u.c
index 28ebc4db6b35c15f3f451715cf361da5f2c15b02..1773a4eaeee7940d63cea55b5449c2169fcb7866 100644 (file)
--- a/modules/misc/playlist/m3u.c
+++ b/modules/misc/playlist/m3u.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * m3u.c :  M3U playlist export module
  *****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
  * $Id$
  *
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
  *
  * 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
@@ -18,7 +18,7 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -27,7 +27,10 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_input.h>
+#include <vlc_meta.h>
 
 #include <errno.h>                                                 /* ENOMEM */
 
@@ -39,59 +42,78 @@ int Export_M3U ( vlc_object_t * );
 /*****************************************************************************
  * Export_M3U: main export function
  *****************************************************************************/
-int Export_M3U( vlc_object_t *p_this )
+static void DoChildren( playlist_t *p_playlist, playlist_export_t *p_export,
+                        playlist_item_t *p_root )
 {
-    playlist_t *p_playlist = (playlist_t*)p_this;
-    playlist_export_t *p_export = (playlist_export_t *)p_playlist->p_private;
     int i, j;
 
-    msg_Dbg(p_playlist, "Saving using M3U format");
-
-    /* Write header */
-    fprintf( p_export->p_file, "#EXTM3U\n" );
-
     /* Go through the playlist and add items */
-    for( i = 0; i< p_playlist->i_size ; i++)
+    for( i = 0; i< p_root->i_children ; i++)
     {
-        if( (p_playlist->pp_items[i]->i_flags & PLAYLIST_SAVE_FLAG) == 0 )
+        playlist_item_t *p_current = p_root->pp_children[i];
+        if( p_current->i_flags & PLAYLIST_SAVE_FLAG )
+            continue;
+
+        if( p_current->i_children >= 0 )
         {
+            DoChildren( p_playlist, p_export, p_current );
             continue;
         }
 
+        assert( p_current->p_input->psz_uri );
+
         /* General info */
-        if( p_playlist->pp_items[i]->input.psz_name &&
-             strcmp( p_playlist->pp_items[i]->input.psz_name,
-                    p_playlist->pp_items[i]->input.psz_uri ) )
+        if( p_current->p_input->psz_name &&
+             strcmp( p_current->p_input->psz_uri,
+                     p_current->p_input->psz_name ) )
         {
-            char *psz_author =
-                   vlc_input_item_GetInfo( &p_playlist->pp_items[i]->input,
-                                         _("Meta-information"), _("Artist") );
-            if( psz_author && *psz_author )
+            char *psz_artist = p_current->p_input->p_meta->psz_artist ?
+                               strdup( p_current->p_input->p_meta->psz_artist ):
+                               strdup( "" );
+            if( psz_artist && *psz_artist )
             {
+                /* write EXTINF with artist */
                 fprintf( p_export->p_file, "#EXTINF:%i,%s - %s\n",
-                     (int)(p_playlist->pp_items[i]->input.i_duration/1000000),
-                     psz_author, p_playlist->pp_items[i]->input.psz_name );
+                          (int)( p_current->p_input->i_duration/1000000 ),
+                          psz_artist,
+                          p_current->p_input->psz_name);
             }
             else
             {
+                /* write EXTINF without artist */
                 fprintf( p_export->p_file, "#EXTINF:%i,%s\n",
-                         (int)(p_playlist->pp_items[i]->input.i_duration/1000000),
-                         p_playlist->pp_items[i]->input.psz_name );
+                         (int)( p_current->p_input->i_duration/1000000 ),
+                          p_current->p_input->psz_name);
             }
-            free(psz_author);
+            if( psz_artist )
+                free( psz_artist );
         }
 
         /* VLC specific options */
-        for( j = 0; j < p_playlist->pp_items[i]->input.i_options; j++ )
+        for( j = 0; j < p_current->p_input->i_options; j++ )
         {
             fprintf( p_export->p_file, "#EXTVLCOPT:%s\n",
-                     p_playlist->pp_items[i]->input.ppsz_options[j][0] == ':' ?
-                     p_playlist->pp_items[i]->input.ppsz_options[j] + 1 :
-                     p_playlist->pp_items[i]->input.ppsz_options[j] );
+                     p_current->p_input->ppsz_options[j][0] == ':' ?
+                     p_current->p_input->ppsz_options[j] + 1 :
+                     p_current->p_input->ppsz_options[j] );
         }
 
         fprintf( p_export->p_file, "%s\n",
-                 p_playlist->pp_items[i]->input.psz_uri );
+                 p_current->p_input->psz_uri );
     }
+}
+
+int Export_M3U( vlc_object_t *p_this )
+{
+    playlist_t *p_playlist = (playlist_t*)p_this;
+    playlist_export_t *p_export = (playlist_export_t *)p_playlist->p_private;
+
+    msg_Dbg(p_playlist, "saving using M3U format");
+
+    /* Write header */
+    fprintf( p_export->p_file, "#EXTM3U\n" );
+
+    DoChildren( p_playlist, p_export, p_export->p_root );
     return VLC_SUCCESS;
 }
+