* src/playlist/playlist.c: bugfix for when we delete the last playlist

   element (I'll get this one right... eventually ;).
* modules/demux/m3u.c: allow forcing the demux to be used by specifying the
   asx or m3u demux.

diff --git a/modules/demux/m3u.c b/modules/demux/m3u.c
index 29158f3aa3701fc868c76a89497432923f092bb0..dbc406e9c751951a7a35ab9b1b3dac46ae747d36 100644 (file)
--- a/modules/demux/m3u.c
+++ b/modules/demux/m3u.c
@@ -2,7 +2,7 @@
  * m3u.c: a meta demux to parse m3u and asx playlists
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: m3u.c,v 1.2 2002/11/13 11:09:56 gbazin Exp $
+ * $Id: m3u.c,v 1.3 2002/11/13 12:58:19 gbazin Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -51,7 +51,8 @@ struct demux_sys_t
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static int  Init  ( vlc_object_t * );
+static int  Activate  ( vlc_object_t * );
+static void Deactivate( vlc_object_t * );
 static int  Demux ( input_thread_t * );
 
 /*****************************************************************************
@@ -60,13 +61,15 @@ static int  Demux ( input_thread_t * );
 vlc_module_begin();
     set_description( "m3u/asx metademux" );
     set_capability( "demux", 10 );
-    set_callbacks( Init, NULL );
+    set_callbacks( Activate, Deactivate );
+    add_shortcut( "m3u" );
+    add_shortcut( "asx" );
 vlc_module_end();
 
 /*****************************************************************************
- * Init: initializes ES structures
+ * Activate: initializes m3u demux structures
  *****************************************************************************/
-static int Init( vlc_object_t * p_this )
+static int Activate( vlc_object_t * p_this )
 {
     input_thread_t *p_input = (input_thread_t *)p_this;
     char           *psz_ext;
@@ -85,11 +88,13 @@ static int Init( vlc_object_t * p_this )
 
     /* Check for m3u/asx file extension */
     psz_ext = strrchr ( p_input->psz_name, '.' );
-    if( !strcasecmp( psz_ext, ".m3u") )
+    if( !strcasecmp( psz_ext, ".m3u") ||
+        ( p_input->psz_demux && !strncmp(p_input->psz_demux, "m3u", 3) ) )
     {
         i_type = TYPE_M3U;
     }
-    else if( !strcasecmp( psz_ext, ".asx") )
+    else if( !strcasecmp( psz_ext, ".asx") ||
+             ( p_input->psz_demux && !strncmp(p_input->psz_demux, "asx", 3) ) )
     {
         i_type = TYPE_ASX;
     }
@@ -110,6 +115,22 @@ static int Init( vlc_object_t * p_this )
     return 0;
 }
 
+/*****************************************************************************
+ * Deactivate: frees unused data
+ *****************************************************************************/
+static void Deactivate( vlc_object_t *p_this )
+{
+    input_thread_t *p_input = (input_thread_t *)p_this;
+    demux_sys_t *p_m3u = (demux_sys_t *)p_input->p_demux_data  ; 
+
+    free( p_m3u );
+}
+
+/*****************************************************************************
+ * Demux: reads and demuxes data packets
+ *****************************************************************************
+ * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
+ *****************************************************************************/
 static int Demux ( input_thread_t *p_input )
 {
     data_packet_t *p_data;
@@ -189,12 +210,13 @@ static int Demux ( input_thread_t *p_input )
             else
             {
                 /* We are dealing with ASX files.
-                 * We are looking for href html markups that begins with
-                 * "mms://" */
+                 * We are looking for "href" or "param" html markups that
+                 * begins with "mms://" */
                 char *psz_eol;
 
-                while( *psz_bol && strncasecmp( psz_bol, "href",
-                                                sizeof("href") - 1 )  )
+                while( *psz_bol &&
+                       strncasecmp( psz_bol, "href", sizeof("href") - 1 ) &&
+                       strncasecmp( psz_bol, "param", sizeof("param") - 1 ) )
                     psz_bol++;
 
                 if( !*psz_bol ) continue;

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index eb23e387862b727166d5f1dddb11ff1b4dae1288..7dddda62a20d5c3d04569fcb24422fd24e907e4c 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -2,7 +2,7 @@
  * playlist.c : Playlist management functions
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: playlist.c,v 1.19 2002/11/13 11:09:56 gbazin Exp $
+ * $Id: playlist.c,v 1.20 2002/11/13 12:58:19 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -203,7 +203,7 @@ int playlist_Delete( playlist_t * p_playlist, int i_pos )
         /* XXX: what if the item is still in use? */
         free( p_playlist->pp_items[i_pos] );
 
-        if( i_pos < p_playlist->i_index )
+        if( i_pos <= p_playlist->i_index )
         {
             p_playlist->i_index--;
         }
@@ -310,11 +310,9 @@ static void RunThread ( playlist_t *p_playlist )
                 {
                     playlist_Delete( p_playlist, p_playlist->i_index );
                 }
-                else
-                {
-                    /* Select the next playlist item */
-                    SkipItem( p_playlist, 1 );
-                }
+
+                /* Select the next playlist item */
+                SkipItem( p_playlist, 1 );
 
                 /* Destroy input */
                 input_DestroyThread( p_input );