Don't mix malloc and delete.

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

diff --git a/modules/misc/playlist/export.c b/modules/misc/playlist/export.c
index 406bb4caecf7e0864d644dbb35c478ef7e22c896..498e6a9dbdd235ff642fec8c06533e59f98fef15 100644 (file)
--- a/modules/misc/playlist/export.c
+++ b/modules/misc/playlist/export.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * export.c :  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,20 +18,25 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 /***************************************************************************
  * Prototypes
  ***************************************************************************/
 int Export_M3U    ( vlc_object_t *p_intf );
 int Export_Old    ( vlc_object_t *p_intf );
-
+int xspf_export_playlist( vlc_object_t *p_intf );
 
 /*****************************************************************************
  * Module descriptor
@@ -41,15 +46,21 @@ vlc_module_begin();
     set_category( CAT_PLAYLIST );
     set_subcategory( SUBCAT_PLAYLIST_EXPORT );
     add_submodule();
-        set_description( _("M3U playlist exporter") );
+        set_description( N_("M3U playlist exporter") );
         add_shortcut( "export-m3u" );
         set_capability( "playlist export" , 0);
         set_callbacks( Export_M3U , NULL );
 
     add_submodule();
-        set_description( _("Old playlist exporter") );
+        set_description( N_("Old playlist exporter") );
         add_shortcut( "export-old" );
         set_capability( "playlist export" , 0);
         set_callbacks( Export_Old , NULL );
 
+    add_submodule();
+        set_description( N_("XSPF playlist export") );
+        add_shortcut( "export-xspf" );
+        set_capability( "playlist export" , 0);
+        set_callbacks( xspf_export_playlist , NULL );
+
 vlc_module_end();