modules/demux/playlist/playlist.c:

 * Added common functions for handling relative paths in playlist files
 * Module declaration for pls import module
modules/demux/playlist/m3u.c:
 * implemented m3u import module
modules/demux/playlist/pls.c:
 * new pls import module
modules/demux/playlist/playlist.h:
 * common prototypes
modules/demux/playlist/Modules.ac
 * activated pls module

modules/demux/playlist/Modules.am

 SOURCES_playlist = playlist.c \
 		   old.c \
-		   m3u.c
+		   m3u.c \
+		   pls.c

modules/demux/playlist/m3u.c

@@ -2,9 +2,10 @@
  * m3u.c : M3U playlist format import
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: m3u.c,v 1.1 2004/01/11 00:45:06 zorglub Exp $
+ * $Id: m3u.c,v 1.2 2004/01/11 17:46:58 sigmunau Exp $
  *
  * Authors: Clment Stenac <zorglub@videolan.org>
+ * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
  *
  * 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
@@ -30,50 +31,147 @@
 #include <vlc/intf.h>
 
 #include <errno.h>                                                 /* ENOMEM */
+#include "playlist.h"
 
+struct demux_sys_t
+{
+    char *psz_prefix;
+};
 
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-int Import_M3U ( vlc_object_t * );
 static int Demux( demux_t *p_demux);
 static int Control( demux_t *p_demux, int i_query, va_list args );
 
 /*****************************************************************************
- * Import_Old : main import function
+ * Import_M3U: main import function
  *****************************************************************************/
 int Import_M3U( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
 
     uint8_t *p_peek;
+    char    *psz_ext;
 
     if( stream_Peek( p_demux->s , &p_peek, 7 ) < 7 )
     {
         msg_Err( p_demux, "cannot peek" );
         return VLC_EGENERIC;
     }
+    psz_ext = strrchr ( p_demux->psz_path, '.' );
 
-    if( strncmp( p_peek, "#EXTM3U", 7 ) )
+    if( !strncmp( p_peek, "#EXTM3U", 7 ) )
+    {
+        ;
+    }
+    else if( ( psz_ext && !strcasecmp( psz_ext, ".m3u") ) ||
+             ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "m3u") ) )
     {
-        msg_Warn(p_demux, "m3u import module discarded: invalid file");
+        ;
+    }
+    else
+    {
+        msg_Warn(p_demux, "m3u import module discarded");
         return VLC_EGENERIC;
+        
     }
     msg_Info( p_demux, "Found valid M3U playlist file");
 
     p_demux->pf_control = Control;
     p_demux->pf_demux = Demux;
+    p_demux->p_sys = malloc( sizeof(demux_sys_t) );
+    if( p_demux->p_sys == NULL )
+    {
+        msg_Err( p_demux, "Out of memory" );
+        return VLC_ENOMEM;
+    }
+    p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
 
     return VLC_SUCCESS;
 }
 
-static int Demux( demux_t *p_demux)
+/*****************************************************************************
+ * Deactivate: frees unused data
+ *****************************************************************************/
+void Close_M3U( vlc_object_t *p_this )
 {
-    msg_Warn(p_demux, "Not yet implemented" );
-    playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_demux,
-                    VLC_OBJECT_PLAYLIST, FIND_PARENT );
+    demux_t *p_demux = (demux_t *)p_this;
+    if( p_demux->p_sys->psz_prefix )
+    {
+        free( p_demux->p_sys->psz_prefix );
+    }
+    free( p_demux->p_sys );
+}
+
+
+static int Demux( demux_t *p_demux )
+{
+    mtime_t        i_duration = -1;
+    char          *psz_name = NULL;    
+    char          *psz_line;
+    char          *psz_parse;
+    char          *psz_duration;
+    char          *psz_mrl;
+    playlist_t    *p_playlist;
+    int            i_position;
+
+    p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
+                                                 FIND_PARENT );
+    if( !p_playlist )
+    {
+        msg_Err( p_demux, "can't find playlist" );
+        return -1;
+    }
 
     p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
+    i_position = p_playlist->i_index + 1;
+    while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
+    {
+        if( *psz_line == '#' )
+        {
+            /* parse extra info */
+            psz_parse = psz_line;
+            while( *psz_parse &&
+                   strncasecmp( psz_parse, "EXTINF:", sizeof("EXTINF:") - 1 ) )
+               psz_parse++;
+            if( *psz_parse )
+            {
+                psz_parse += sizeof("EXTINF:") - 1;
+                while( *psz_parse == '\t' || *psz_parse == ' ' )
+                    psz_parse++;
+                psz_duration = psz_parse;
+                psz_parse = strchr( psz_parse, ',' );
+                if ( psz_parse )
+                {
+                    *psz_parse = '\0';
+                    psz_parse++;
+                    psz_name = strdup( psz_parse );
+                    i_duration = atoi( psz_duration );
+                    if( i_duration != -1 )
+                    {
+                        i_duration *= 1000000;
+                    }
+                }
+            }
+        }
+        else
+        {
+            psz_mrl = ProcessMRL( psz_line, p_demux->p_sys->psz_prefix );
+            playlist_Add( p_playlist, psz_mrl, psz_name,
+                          PLAYLIST_INSERT, i_position );
+            playlist_SetDuration( p_playlist, i_position, i_duration );
+            free( psz_mrl );
+            i_position++;
+            i_duration = -1;
+            if( psz_name )
+            {
+                free( psz_name );
+                psz_name = NULL;
+            }
+        }
+        free( psz_line);
+    }
     vlc_object_release( p_playlist );
     return VLC_SUCCESS;
 }

modules/demux/playlist/playlist.c

@@ -2,7 +2,7 @@
  * playlist.c :  Playlist import module
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: playlist.c,v 1.1 2004/01/11 00:45:06 zorglub Exp $
+ * $Id: playlist.c,v 1.2 2004/01/11 17:46:58 sigmunau Exp $
  *
  * Authors: Clment Stenac <zorglub@videolan.org>
  *
@@ -25,12 +25,9 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
+#include "ninput.h"
 
-/***************************************************************************
- * Prototypes
- ***************************************************************************/
-int Import_Old ( vlc_object_t * );
-int Import_M3U ( vlc_object_t * );
+#include "playlist.h"
 
 /*****************************************************************************
  * Module descriptor
@@ -48,5 +45,98 @@ vlc_module_begin();
         set_description( _("M3U playlist import") );
         add_shortcut( "m3u-open" );
         set_capability( "demux2" , 10 );
-        set_callbacks( Import_M3U , NULL );
+        set_callbacks( Import_M3U , Close_M3U );
+    add_submodule();
+        set_description( _("PLS playlist import") );
+        add_shortcut( "pls-open" );
+        set_capability( "demux2" , 10 );
+        set_callbacks( Import_PLS , Close_PLS );
 vlc_module_end();
+
+
+/**
+ * Find directory part of the path to the playlist file, in case of
+ * relative paths inside
+ */
+char *FindPrefix( demux_t *p_demux )
+{
+    char *psz_name;
+    char *psz_path = strdup( p_demux->psz_path );
+
+#ifndef WIN32
+    psz_name = strrchr( psz_path, '/' );
+#else
+    psz_name = strrchr( psz_path, '\\' );
+    if ( ! psz_name ) psz_name = strrchr( psz_path, '/' );
+#endif
+    if( psz_name ) *psz_name = '\0';
+    else *psz_path = '\0';
+    return psz_path;
+}
+
+/**
+ * Add the directory part of the playlist file to the start of the
+ * mrl, if the mrl is a relative file path
+ */
+char *ProcessMRL( char *psz_mrl, char *psz_prefix )
+{
+    char *psz_name;
+    /* check for a protocol name */
+    /* for URL, we should look for "://"
+     * for MRL (Media Resource Locator) ([[<access>][/<demux>]:][<source>]),
+     * we should look for ":"
+     * so we end up looking simply for ":"*/
+    /* PB: on some file systems, ':' are valid characters though*/
+    psz_name = psz_mrl;
+    while( *psz_name && *psz_name!=':' )
+    {
+        psz_name++;
+    }
+#ifdef WIN32
+    if ( *psz_name && ( psz_name == psz_mrl + 1 ) )
+    {
+        /* if it is not an URL,
+         * as it is unlikely to be an MRL (PB: if it is ?)
+         * it should be an absolute file name with the drive letter */
+        if ( *(psz_name+1) == '/' )/* "*:/" */
+        {
+            if ( *(psz_name+2) != '/' )/* not "*://" */
+                while ( *psz_name ) *psz_name++;/* so now (*psz_name==0) */
+        }
+        else while ( *psz_name ) *psz_name++;/* "*:*"*/
+    }
+#endif
+
+    /* if the line doesn't specify a protocol name,
+     * check if the line has an absolute or relative path */
+#ifndef WIN32
+    if( !*psz_name && *psz_mrl != '/' )
+         /* If this line doesn't begin with a '/' */
+#else
+    if( !*psz_name
+            && *psz_mrl!='/'
+            && *psz_mrl!='\\'
+            && *(psz_mrl+1)!=':' )
+         /* if this line doesn't begin with
+          *  "/" or "\" or "*:" or "*:\" or "*:/" or "\\" */
+#endif
+    {
+#ifndef WIN32
+        psz_name = malloc( strlen(psz_prefix) + strlen(psz_mrl) + 2 );
+        sprintf( psz_name, "%s/%s", psz_prefix, psz_mrl );
+#else
+        if ( *p_m3u->psz_prefix != '\0' )
+        {
+            psz_name = malloc( strlen(psz_prefix) + strlen(psz_mrl) + 2 );
+            sprintf( psz_name, "%s\\%s", psz_prefix, psz_mrl );
+        }
+        else psz_name = strdup( psz_mrl );
+#endif
+    }
+    else
+    {
+        psz_name = strdup( psz_mrl );
+    }
+    return psz_name;
+}
+

modules/demux/playlist/playlist.h

+/*****************************************************************************
+ * playlist.h:  Playlist import module common functions
+ *****************************************************************************
+ * Copyright (C) 2004 VideoLAN
+ * $Id: playlist.h,v 1.1 2004/01/11 17:46:58 sigmunau Exp $
+ *
+ * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+char *ProcessMRL( char *, char * );
+char *FindPrefix( demux_t * );
+
+int Import_Old ( vlc_object_t * );
+int Import_M3U ( vlc_object_t * );
+void Close_M3U ( vlc_object_t * );
+int Import_PLS ( vlc_object_t * );
+void Close_PLS ( vlc_object_t * );

modules/demux/playlist/pls.c

+/*****************************************************************************
+ * pls.c : PLS playlist format import
+ *****************************************************************************
+ * Copyright (C) 2004 VideoLAN
+ * $Id: pls.c,v 1.1 2004/01/11 17:46:58 sigmunau Exp $
+ *
+ * Authors: Clment Stenac <zorglub@videolan.org>
+ * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>                                      /* malloc(), free() */
+
+#include <vlc/vlc.h>
+#include <vlc/intf.h>
+
+#include <errno.h>                                                 /* ENOMEM */
+#include "playlist.h"
+
+struct demux_sys_t
+{
+    char *psz_prefix;
+};
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int Demux( demux_t *p_demux);
+static int Control( demux_t *p_demux, int i_query, va_list args );
+
+/*****************************************************************************
+ * Import_PLS: main import function
+ *****************************************************************************/
+int Import_PLS( vlc_object_t *p_this )
+{
+    demux_t *p_demux = (demux_t *)p_this;
+
+    uint8_t *p_peek;
+    char    *psz_ext;
+
+    if( stream_Peek( p_demux->s , &p_peek, 7 ) < 7 )
+    {
+        msg_Err( p_demux, "cannot peek" );
+        return VLC_EGENERIC;
+    }
+    psz_ext = strrchr ( p_demux->psz_path, '.' );
+
+    if( !strncasecmp( p_peek, "[playlist]", 10 ) )
+    {
+        ;
+    }
+    else if( ( psz_ext && !strcasecmp( psz_ext, ".pls") ) ||
+             ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "pls") ) )
+    {
+        ;
+    }
+    else
+    {
+        msg_Warn(p_demux, "pls import module discarded");
+        return VLC_EGENERIC;
+        
+    }
+    msg_Info( p_demux, "Found valid PLS playlist file");
+
+    p_demux->pf_control = Control;
+    p_demux->pf_demux = Demux;
+    p_demux->p_sys = malloc( sizeof(demux_sys_t) );
+    if( p_demux->p_sys == NULL )
+    {
+        msg_Err( p_demux, "Out of memory" );
+        return VLC_ENOMEM;
+    }
+    p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Deactivate: frees unused data
+ *****************************************************************************/
+void Close_PLS( vlc_object_t *p_this )
+{
+    demux_t *p_demux = (demux_t *)p_this;
+    if( p_demux->p_sys->psz_prefix )
+    {
+        free( p_demux->p_sys->psz_prefix );
+    }
+    free( p_demux->p_sys );
+}
+
+static int Demux( demux_t *p_demux )
+{
+    mtime_t        i_duration = -1;
+    char          *psz_name = NULL;    
+    char          *psz_line;
+    char          *psz_mrl = NULL;
+    char          *psz_key;
+    char          *psz_value;
+    playlist_t    *p_playlist;
+    int            i_position;
+    int            i_item = -1;
+    int            i_new_item = 0;
+    int            i_key_length;
+
+    p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
+                                                 FIND_PARENT );
+    if( !p_playlist )
+    {
+        msg_Err( p_demux, "can't find playlist" );
+        return -1;
+    }
+
+    p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
+    i_position = p_playlist->i_index + 1;
+    while( ( psz_line = stream_ReadLine( p_demux->s ) ) )
+    {
+        if( !strncasecmp( psz_line, "[playlist]", sizeof("[playlist]")-1 ) )
+        {
+            free( psz_line );
+            continue;
+        }
+        psz_key = psz_line;
+        psz_value = strchr( psz_line, '=' );
+        if( psz_value )
+        {
+            *psz_value='\0';
+            psz_value++;
+        }
+        else
+        {
+            msg_Warn( p_demux, "invalid line in pls file" );
+            free( psz_line );
+            continue;
+        }
+        if( !strcasecmp( psz_key, "version" ) )
+        {
+            msg_Dbg( p_demux, "pls file version: %s", psz_value );
+            free( psz_line );
+            continue;
+        }
+        /* find the number part of of file1, title1 or length1 etc */
+        i_key_length = strlen( psz_key );
+        if( i_key_length >= 5 ) /* file1 type case */
+        {
+            i_new_item = atoi( psz_key + 4 );
+            if( i_new_item == 0 && i_key_length >= 6 ) /* title1 type case */
+            {
+                i_new_item = atoi( psz_key + 5 );
+                if( i_new_item == 0 && i_key_length >= 7 ) /* length1 type case */
+                {
+                    i_new_item = atoi( psz_key + 6 );
+                }
+            }
+        }
+        if( i_new_item == 0 )
+        {
+            msg_Warn( p_demux, "couldn't find number of item" );
+            free( psz_line );
+            continue;
+        }
+        if( i_item == -1 )
+        {
+            i_item = i_new_item;
+        }
+        /* we found a new item, insert the previous */
+        if( i_item != i_new_item )
+        {
+            if( psz_mrl )
+            {
+                playlist_Add( p_playlist, psz_mrl, psz_name,
+                              PLAYLIST_INSERT, i_position );
+                if( i_duration != -1 )
+                {
+                    playlist_SetDuration( p_playlist, i_position, i_duration );
+                }
+                i_position++;
+                free( psz_mrl );
+                psz_mrl = NULL;
+            }
+            else
+            {
+                msg_Warn( p_demux, "no file= part found for item %d", i_item );
+            }
+            if( psz_name )
+            {
+                free( psz_name );
+                psz_name = NULL;
+            }
+            i_duration = -1;
+            i_item = i_new_item;
+            i_new_item = 0;
+        }
+        if( !strncasecmp( psz_key, "file", sizeof("file") -1 ) )
+        {
+            psz_mrl = ProcessMRL( psz_value, p_demux->p_sys->psz_prefix );
+        }
+        else if( !strncasecmp( psz_key, "title", sizeof("title") -1 ) )
+        {
+            psz_name = strdup( psz_value );
+        }
+        else if( !strncasecmp( psz_key, "length", sizeof("length") -1 ) )
+        {
+            i_duration = atoi( psz_value );
+            if( i_duration != -1 )
+            {
+                i_duration *= 1000000;
+            }
+        }
+        else
+        {
+            msg_Warn( p_demux, "unknown key found in pls file: %s", psz_key );
+        }
+        free( psz_line );
+    }
+    /* Add last object */
+    if( psz_mrl )
+    {
+        playlist_Add( p_playlist, psz_mrl, psz_name,
+                      PLAYLIST_INSERT, i_position );
+        if( i_duration != -1 )
+        {
+                    playlist_SetDuration( p_playlist, i_position, i_duration );
+        }
+        i_position++;
+        free( psz_mrl );
+        psz_mrl = NULL;
+    }
+    else
+    {
+        msg_Warn( p_demux, "no file= part found for item %d", i_item );
+    }
+    if( psz_name )
+    {
+        free( psz_name );
+        psz_name = NULL;
+    }
+
+    vlc_object_release( p_playlist );
+    return VLC_SUCCESS;
+}
+
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+    return VLC_EGENERIC;
+}