* Stringreview !!!

[vlc] / modules / demux / m3u.c

diff --git a/modules/demux/m3u.c b/modules/demux/m3u.c
index 0eacb4840d8a6ab19c5b0a5530c9129f1263c955..58b914e9df08c52a1144fa8ceb4404d8f68ec55f 100644 (file)
--- a/modules/demux/m3u.c
+++ b/modules/demux/m3u.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * m3u.c: a meta demux to parse pls, m3u, asx et b4s playlists
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: m3u.c,v 1.24 2003/08/14 13:02:55 sigmunau Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: m3u.c,v 1.26 2004/01/25 20:05:28 hartman Exp $
  *
  * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *          Gildas Bazin <gbazin@netcourrier.com>
@@ -60,7 +60,7 @@ static int  Demux ( input_thread_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("playlist metademux") );
+    set_description( _("Playlist metademux") );
     set_capability( "demux", 180 );
     set_callbacks( Activate, Deactivate );
     add_shortcut( "m3u" );
@@ -121,8 +121,8 @@ static int Activate( vlc_object_t * p_this )
 
     /* we had no luck looking at the file extention, so we have a look
      * at the content. This is useful for .asp, .php and similar files
-     * that are actually html. Also useful for som asx files that have
-     * another extention */
+     * that are actually html. Also useful for some asx files that have
+     * another extension */
     /* XXX we double check for file != m3u as some asx ... are just m3u file */
     if( i_type != TYPE_M3U )
     {
@@ -551,9 +551,9 @@ static void ProcessLine ( input_thread_t *p_input, playlist_t *p_playlist,
 
     if( b_next && *ppsz_uri )
     {
-        playlist_AddExt( p_playlist, *ppsz_uri,
-                         *ppsz_name ? *ppsz_name : *ppsz_uri, -1, 
-                         0, 0, PLAYLIST_INSERT, *pi_position );
+        playlist_Add( p_playlist, *ppsz_uri,
+                         *ppsz_name ? *ppsz_name : *ppsz_uri,
+                          PLAYLIST_INSERT, *pi_position );
         (*pi_position)++;
         if( *ppsz_name )
         {
@@ -660,7 +660,7 @@ static int Demux ( input_thread_t *p_input )
         /* is there a pendding uri without b_next */
         if( psz_uri )
         {
-            playlist_Add( p_playlist, psz_uri, 0, 0,
+            playlist_Add( p_playlist, psz_uri, psz_uri,
                           PLAYLIST_INSERT, i_position );
         }
     }