* New ASX parser

  - some elements are not yet supported.
  - it could perhaps use a little bit more cleaning.

In the basics. It just works :D

modules/demux/playlist/Modules.am

@@ -10,6 +10,7 @@ SOURCES_playlist = \
 	xspf.c \
 	xspf.h \
 	shoutcast.c \
+	asx.c \
 	$(NULL)
 
 

modules/demux/playlist/m3u.c

@@ -70,6 +70,7 @@ int E_(Import_M3U)( vlc_object_t *p_this )
     else if( ( psz_ext && !strcasecmp( psz_ext, ".m3u") ) ||
              ( psz_ext && !strcasecmp( psz_ext, ".ram") ) ||
              ( psz_ext && !strcasecmp( psz_ext, ".rm") ) ||
+             ( psz_ext && !strcasecmp( psz_ext, ".vlc") ) ||
              /* A .ram file can contain a single rtsp link */
              ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "m3u") ) )
     {

modules/demux/playlist/playlist.c

@@ -96,6 +96,11 @@ vlc_module_begin();
         set_callbacks( E_(Import_Shoutcast), E_(Close_Shoutcast) );
         add_bool( "shoutcast-show-adult", VLC_FALSE, NULL,
                    SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, VLC_FALSE );
+    add_submodule();
+        set_description( _("ASX playlist import") );
+        add_shortcut( "asx-open" );
+        set_capability( "demux2", 10 );
+        set_callbacks( E_(Import_ASX), E_(Close_ASX) );
 vlc_module_end();
 
 

modules/demux/playlist/playlist.h

@@ -53,6 +53,9 @@ int E_(xspf_import_Activate) ( vlc_object_t * );
 int E_(Import_Shoutcast) ( vlc_object_t * );
 void E_(Close_Shoutcast) ( vlc_object_t * );
 
+int E_(Import_ASX) ( vlc_object_t * );
+void E_(Close_ASX) ( vlc_object_t * );
+
 #define INIT_PLAYLIST_STUFF \
     int i_parent_id; \
     vlc_bool_t b_play; \

modules/demux/playlist/podcast.c

@@ -415,7 +415,7 @@ static int Demux( demux_t *p_demux )
                                                 psz_item_type );
                     }
 
-                    fprintf( stderr, "Adding WHEREVER\n");
+                    msg_Dbg( p_demux, "Adding WHEREVER\n" );
                     playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
                           p_item_in_category, (i_parent_id > 0 ) ? VLC_TRUE:
                                                 VLC_FALSE, PLAYLIST_APPEND );