/*****************************************************************************
- * m3u.c: a meta demux to parse m3u and asx playlists
+ * m3u.c: a meta demux to parse pls, m3u, asx et b4s playlists
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: m3u.c,v 1.10 2002/12/14 01:05:53 babal Exp $
+ * Copyright (C) 2001-2004 the VideoLAN team
+ * $Id$
*
- * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
+ * Gildas Bazin <gbazin@videolan.org>
+ * Clément Stenac <zorglub@via.ecp.fr>
*
* 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
* Preamble
*****************************************************************************/
#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
-#include <errno.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc_playlist.h>
-#include <sys/types.h>
-
/*****************************************************************************
* Constants and structures
*****************************************************************************/
-#define MAX_LINE 1024
+#define MAX_LINE 8192
+#define TYPE_UNKNOWN 0
#define TYPE_M3U 1
#define TYPE_ASX 2
#define TYPE_HTML 3
+#define TYPE_PLS 4
+#define TYPE_B4S 5
+#define TYPE_WMP 6
+#define TYPE_RTSP 7
struct demux_sys_t
{
*****************************************************************************/
static int Activate ( vlc_object_t * );
static void Deactivate( vlc_object_t * );
-static int Demux ( input_thread_t * );
+static int Demux ( demux_t * );
+static int Control ( demux_t *, int, va_list );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( "m3u/asx metademux" );
- set_capability( "demux", 10 );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_DEMUX );
+ set_description( _("Playlist metademux") );
+ set_capability( "demux2", 5 );
set_callbacks( Activate, Deactivate );
add_shortcut( "m3u" );
add_shortcut( "asx" );
add_shortcut( "html" );
+ add_shortcut( "pls" );
+ add_shortcut( "b4s" );
vlc_module_end();
/*****************************************************************************
*****************************************************************************/
static int Activate( vlc_object_t * p_this )
{
- input_thread_t *p_input = (input_thread_t *)p_this;
- char *psz_ext;
- demux_sys_t *p_m3u;
- int i_type = 0;
+ demux_t *p_demux = (demux_t *)p_this;
+ char *psz_ext;
+ int i_type = TYPE_UNKNOWN;
+ int i_type2 = TYPE_UNKNOWN;
- /* Initialize access plug-in structures. */
- if( p_input->i_mtu == 0 )
- {
- /* Improve speed. */
- p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
- }
+ p_demux->pf_control = Control;
+ p_demux->pf_demux = Demux;
- p_input->pf_demux = Demux;
- p_input->pf_rewind = NULL;
+ /* Check for m3u/asx file extension or if the demux has been forced */
+ psz_ext = strrchr ( p_demux->psz_path, '.' );
- /* Check for m3u/asx file extension */
- psz_ext = strrchr ( p_input->psz_name, '.' );
- if( !strcasecmp( psz_ext, ".m3u") ||
- ( p_input->psz_demux && !strncmp(p_input->psz_demux, "m3u", 3) ) )
+ if( ( psz_ext && !strcasecmp( psz_ext, ".m3u") ) ||
+ /* a .ram file can contain a single rtsp link */
+ ( psz_ext && !strcasecmp( psz_ext, ".ram") ) ||
+ ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "m3u") ) )
{
i_type = TYPE_M3U;
}
- else if( !strcasecmp( psz_ext, ".asx") ||
- ( p_input->psz_demux && !strncmp(p_input->psz_demux, "asx", 3) ) )
+ else if( ( psz_ext && !strcasecmp( psz_ext, ".asx") ) ||
+ ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "asx") ) )
{
i_type = TYPE_ASX;
}
- else if( !strcasecmp( psz_ext, ".html") ||
- ( p_input->psz_demux && !strncmp(p_input->psz_demux, "html", 4) ) )
+ else if( ( psz_ext && !strcasecmp( psz_ext, ".html") ) ||
+ ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "html") ) )
{
i_type = TYPE_HTML;
}
+ else if( ( psz_ext && !strcasecmp( psz_ext, ".pls") ) ||
+ ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "pls") ) )
+ {
+ i_type = TYPE_PLS;
+ }
+ else if( ( psz_ext && !strcasecmp( psz_ext, ".b4s") ) ||
+ ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "b4s") ) )
+ {
+ i_type = TYPE_B4S;
+ }
/* 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 */
- if( !i_type )
+ * that are actually html. Also useful for some asx files that have
+ * another extension */
+ /* We double check for file != m3u as some asx are just m3u file */
+ if( i_type != TYPE_M3U )
{
- byte_t *p_peek;
- int i_size = input_Peek( p_input, &p_peek, MAX_LINE );
- i_size -= sizeof("<html>") - 1;
- if ( i_size > 0 ) {
- while ( i_size
- && strncasecmp( p_peek, "<html>", sizeof("<html>") - 1 )
- && strncasecmp( p_peek, "<asx", sizeof("<asx") - 1 ) )
+ char *p_peek;
+ int i_size = stream_Peek( p_demux->s, (uint8_t **)&p_peek, MAX_LINE );
+ i_size -= sizeof("[Reference]") - 1;
+
+ if( i_size > 0 )
+ {
+ while( i_size &&
+ strncasecmp(p_peek, "[playlist]", sizeof("[playlist]") - 1)
+ && strncasecmp( p_peek, "[Reference]", sizeof("[Reference]") - 1 )
+ && strncasecmp( p_peek, "<html>", sizeof("<html>") - 1 )
+ && strncasecmp( p_peek, "<asx", sizeof("<asx") - 1 )
+ && strncasecmp( p_peek, "rtsptext", sizeof("rtsptext") - 1 )
+ && strncasecmp( p_peek, "<?xml", sizeof("<?xml") -1 ) )
{
p_peek++;
i_size--;
}
- if ( !i_size )
+ if( !i_size )
{
- return -1;
+ ;
}
- else if ( !strncasecmp( p_peek, "<html>", sizeof("<html>") -1 ) )
+ else if( !strncasecmp( p_peek, "[playlist]", sizeof("[playlist]") -1 ) )
{
- i_type = TYPE_HTML;
+ i_type2 = TYPE_PLS;
}
- else if ( !strncasecmp( p_peek, "<asx", sizeof("<asx") -1 ) )
+ else if( !strncasecmp( p_peek, "[Reference]", sizeof("[Reference]") -1 ) )
{
- i_type = TYPE_ASX;
+ i_type2 = TYPE_WMP;
}
+ else if( !strncasecmp( p_peek, "<html>", sizeof("<html>") -1 ) )
+ {
+ i_type2 = TYPE_HTML;
+ }
+ else if( !strncasecmp( p_peek, "<asx", sizeof("<asx") -1 ) )
+ {
+ i_type2 = TYPE_ASX;
+ }
+ else if( !strncasecmp( p_peek, "rtsptext", sizeof("rtsptext") -1 ) )
+ {
+ i_type2 = TYPE_RTSP;
+ }
+#if 0
+ else if( !strncasecmp( p_peek, "<?xml", sizeof("<?xml") -1 ) )
+ {
+ i_type2 = TYPE_B4S;
+ }
+#endif
}
}
- /* Allocate p_m3u */
- if( !( p_m3u = malloc( sizeof( demux_sys_t ) ) ) )
+ if( i_type == TYPE_UNKNOWN && i_type2 == TYPE_UNKNOWN)
{
- msg_Err( p_input, "out of memory" );
- return -1;
+ return VLC_EGENERIC;
+ }
+ if( i_type != TYPE_UNKNOWN && i_type2 == TYPE_UNKNOWN )
+ {
+ i_type = TYPE_M3U;
+ }
+ else
+ {
+ i_type = i_type2;
}
- p_input->p_demux_data = p_m3u;
- p_m3u->i_type = i_type;
+ /* Allocate p_m3u */
+ p_demux->p_sys = malloc( sizeof( demux_sys_t ) );
+ p_demux->p_sys->i_type = i_type;
+ msg_Dbg( p_this, "Playlist type: %d - %d", i_type, i_type2 );
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
*****************************************************************************/
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 ;
+ demux_t *p_demux = (demux_t *)p_this;
+ free( p_demux->p_sys );
+}
+
+/*****************************************************************************
+ * XMLSpecialChars: Handle the special chars in a XML file.
+ * ***************************************************************************/
+static void XMLSpecialChars ( char *str )
+{
+ char *src = str;
+ char *dst = str;
- free( p_m3u );
+ while( *src )
+ {
+ if( *src == '&' )
+ {
+ if( !strncasecmp( src, "à", 6 ) ) *dst++ = 'à';
+ else if( !strncasecmp( src, "î", 6 ) ) *dst++ = 'î';
+ else if( !strncasecmp( src, "'", 6 ) ) *dst++ = '\'';
+ else if( !strncasecmp( src, "è", 6 ) ) *dst++ = 'è';
+ else if( !strncasecmp( src, "é", 6 ) ) *dst++ = 'é';
+ else if( !strncasecmp( src, "ê", 6 ) ) *dst++ = 'ê';
+ else
+ {
+ *dst++ = '?';
+ }
+ src += 6;
+ }
+ else
+ {
+ *dst++ = *src++;
+ }
+ }
+
+ *dst = '\0';
}
/*****************************************************************************
- * Demux: reads and demuxes data packets
- *****************************************************************************
- * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
+ * ParseLine: read a "line" from the file and add any entries found
+ * to the playlist. Returns:
+ * 0 if nothing was found
+ * 1 if a URI was found (it is then copied in psz_data)
+ * 2 if a name was found ( " )
+ *
+ * XXX psz_data has the same length that psz_line so no problem if you don't
+ * expand it
+ * psz_line is \0 terminated
*****************************************************************************/
-static void ProcessLine ( input_thread_t *p_input , demux_sys_t *p_m3u
- , playlist_t *p_playlist , char psz_line[MAX_LINE] )
+static int ParseLine( demux_t *p_demux, char *psz_line, char *psz_data,
+ vlc_bool_t *pb_done )
{
- char *psz_bol, *psz_name;
+ demux_sys_t *p_m3u = p_demux->p_sys;
+ char *psz_bol, *psz_name;
psz_bol = psz_line;
+ *pb_done = VLC_FALSE;
/* Remove unnecessary tabs or spaces at the beginning of line */
while( *psz_bol == ' ' || *psz_bol == '\t' ||
*psz_bol == '\n' || *psz_bol == '\r' )
+ {
psz_bol++;
+ }
if( p_m3u->i_type == TYPE_M3U )
{
/* Check for comment line */
if( *psz_bol == '#' )
- /*line is comment or extended info, ignored for now */
- return;
+ {
+ while( *psz_bol &&
+ strncasecmp( psz_bol, "EXTINF:",
+ sizeof("EXTINF:") - 1 ) &&
+ strncasecmp( psz_bol, "EXTVLCOPT:",
+ sizeof("EXTVLCOPT:") - 1 ) ) psz_bol++;
+
+ if( !*psz_bol ) return 0;
+
+ if( !strncasecmp( psz_bol, "EXTINF:", sizeof("EXTINF:") - 1 ) )
+ {
+ psz_bol = strchr( psz_bol, ',' );
+ if ( !psz_bol ) return 0;
+ psz_bol++;
+
+ /* From now, we have a name line */
+ strcpy( psz_data , psz_bol );
+ return 2;
+ }
+ else
+ {
+ psz_bol = strchr( psz_bol, ':' );
+ if ( !psz_bol ) return 0;
+ psz_bol++;
+
+ strcpy( psz_data , psz_bol );
+ return 3;
+ }
+ }
+ /* If we don't have a comment, the line is directly the URI */
+ }
+ else if( p_m3u->i_type == TYPE_PLS )
+ {
+ /* We are dealing with .pls files from shoutcast
+ * We are looking for lines like "File1=http://..." */
+ if( !strncasecmp( psz_bol, "File", sizeof("File") - 1 ) )
+ {
+ psz_bol += sizeof("File") - 1;
+ psz_bol = strchr( psz_bol, '=' );
+ if ( !psz_bol ) return 0;
+ psz_bol++;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else if( p_m3u->i_type == TYPE_WMP )
+ {
+ /* We are dealing with some weird WMP stream playlist format
+ * Hurray for idiotic M$. Lines look like: "Ref1=http://..." */
+ if( !strncasecmp( psz_bol, "Ref", sizeof("Ref") - 1 ) )
+ {
+ psz_bol += sizeof("Ref") - 1;
+ psz_bol = strchr( psz_bol, '=' );
+ if ( !psz_bol ) return 0;
+ psz_bol++;
+ if( !strncasecmp( psz_bol, "http://", sizeof("http://") -1 ) )
+ {
+ psz_bol[0] = 'm'; psz_bol[1] = 'm'; psz_bol[2] = 's'; psz_bol[3] = 'h';
+ }
+ }
+ else
+ {
+ return 0;
+ }
}
- else if ( p_m3u->i_type == TYPE_ASX )
+ else if( p_m3u->i_type == TYPE_ASX )
{
/* We are dealing with ASX files.
* We are looking for "<ref href=" xml markups that
strncasecmp( psz_bol, "ref", sizeof("ref") - 1 ) )
psz_bol++;
- if( !*psz_bol ) return;
+ if( !*psz_bol ) return 0;
while( *psz_bol &&
strncasecmp( psz_bol, "href", sizeof("href") - 1 ) )
psz_bol++;
- if( !*psz_bol ) return;
+ if( !*psz_bol ) return 0;
while( *psz_bol &&
strncasecmp( psz_bol, "mms://",
sizeof("mms://") - 1 ) &&
+ strncasecmp( psz_bol, "mmsu://",
+ sizeof("mmsu://") - 1 ) &&
+ strncasecmp( psz_bol, "mmst://",
+ sizeof("mmst://") - 1 ) &&
strncasecmp( psz_bol, "http://",
sizeof("http://") - 1 ) &&
strncasecmp( psz_bol, "file://",
sizeof("file://") - 1 ) )
psz_bol++;
- if( !*psz_bol ) return;
+ if( !*psz_bol ) return 0;
psz_eol = strchr( psz_bol, '"');
if( !psz_eol )
- return;
+ return 0;
*psz_eol = '\0';
}
- else
+ else if( p_m3u->i_type == TYPE_HTML )
{
/* We are dealing with a html file with embedded
* video. We are looking for "<param name="filename"
strncasecmp( psz_bol, "param", sizeof("param") - 1 ) )
psz_bol++;
- if( !*psz_bol ) return;
+ if( !*psz_bol ) return 0;
while( *psz_bol &&
strncasecmp( psz_bol, "filename", sizeof("filename") - 1 ) )
psz_bol++;
- if( !*psz_bol ) return;
+ if( !*psz_bol ) return 0;
while( *psz_bol &&
strncasecmp( psz_bol, "http://",
sizeof("http://") - 1 ) )
psz_bol++;
- if( !*psz_bol ) return;
+ if( !*psz_bol ) return 0;
psz_eol = strchr( psz_bol, '"');
if( !psz_eol )
- return;
+ return 0;
*psz_eol = '\0';
}
+ else if( p_m3u->i_type == TYPE_B4S )
+ {
+
+ char *psz_eol;
+
+ msg_Dbg( p_demux, "b4s line=%s", psz_line );
+ /* We are dealing with a B4S file from Winamp 3 */
+
+ /* First, search for name *
+ * <Name>Blabla</Name> */
+
+ if( strstr ( psz_bol, "<Name>" ) )
+ {
+ /* We have a name */
+ while ( *psz_bol &&
+ strncasecmp( psz_bol,"Name",sizeof("Name") -1 ) )
+ psz_bol++;
+
+ if( !*psz_bol ) return 0;
+
+ psz_bol = psz_bol + 5 ;
+ /* We are now at the beginning of the name */
+
+ if( !psz_bol ) return 0;
+
+
+ psz_eol = strchr(psz_bol, '<' );
+ if( !psz_eol) return 0;
+
+ *psz_eol='\0';
+
+ XMLSpecialChars( psz_bol );
+
+ strcpy( psz_data, psz_bol );
+ return 2;
+ }
+ else if( strstr( psz_bol, "</entry>" ) || strstr( psz_bol, "</Entry>" ))
+ {
+ *pb_done = VLC_TRUE;
+ return 0;
+ }
+
+ /* We are looking for <entry Playstring="blabla"> */
+
+ while( *psz_bol &&
+ strncasecmp( psz_bol,"Playstring",sizeof("Playstring") -1 ) )
+ psz_bol++;
+
+ if( !*psz_bol ) return 0;
+
+ psz_bol = strchr( psz_bol, '=' );
+ if ( !psz_bol ) return 0;
+
+ psz_bol += 2;
+
+ psz_eol= strchr(psz_bol, '"');
+ if( !psz_eol ) return 0;
+
+ *psz_eol= '\0';
+
+ /* Handle the XML special characters */
+ XMLSpecialChars( psz_bol );
+ }
+ else if( p_m3u->i_type == TYPE_RTSP )
+ {
+ /* We are dealing with rtsptext reference files
+ * Ignore anthying that doesn't start with rtsp://..." */
+ if( strncasecmp( psz_bol, "rtsp://", sizeof("rtsp://") - 1 ) )
+ /* ignore */ return 0;
+ }
+ else
+ {
+ msg_Warn( p_demux, "unknown file type" );
+ return 0;
+ }
+
+ /* empty line */
+ if ( !*psz_bol ) return 0;
/*
* From now on, we know we've got a meaningful line
*/
- /* Check if the line has an absolute or relative path */
+ /* 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_bol;
- while( *psz_name && strncmp( psz_name, "://", sizeof("://") - 1 ) )
+ while( *psz_name && *psz_name!=':' )
{
psz_name++;
}
+#ifdef WIN32
+ if ( *psz_name && ( psz_name == psz_bol + 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_bol != '/' )
+ /* If this line doesn't begin with a '/' */
#else
- if( !*psz_name && (strlen(psz_bol) < 2 ||
- ( *(psz_bol+1) != ':' &&
- strncmp( psz_bol, "\\\\", 2 ) ) ) )
+ if( !*psz_name
+ && *psz_bol!='/'
+ && *psz_bol!='\\'
+ && *(psz_bol+1)!=':' )
+ /* if this line doesn't begin with
+ * "/" or "\" or "*:" or "*:\" or "*:/" or "\\" */
#endif
{
- /* the line doesn't specify a protocol name.
- * If this line doesn't begin with a '/' then assume the path
- * is relative to the path of the m3u file. */
- char *psz_path = strdup( p_input->psz_name );
+ /* assume the path is relative to the path of the m3u file. */
+ char *psz_path = strdup( p_demux->psz_path );
#ifndef WIN32
psz_name = strrchr( psz_path, '/' );
psz_name = strdup( psz_bol );
}
- playlist_Add( p_playlist, psz_name,
- PLAYLIST_APPEND, PLAYLIST_END );
+ strcpy(psz_data, psz_name ) ;
free( psz_name );
+
+ if( p_m3u->i_type != TYPE_B4S )
+ {
+ *pb_done = VLC_TRUE;
+ }
+
+ return 1;
+}
+
+static void ProcessLine ( demux_t *p_demux, playlist_t *p_playlist,
+ playlist_item_t *p_parent,
+ char *psz_line, char **ppsz_uri, char **ppsz_name,
+ int *pi_options, char ***pppsz_options,
+ vlc_bool_t b_flush )
+{
+ char psz_data[MAX_LINE];
+ vlc_bool_t b_done;
+
+ switch( ParseLine( p_demux, psz_line, psz_data, &b_done ) )
+ {
+ case 1:
+ if( *ppsz_uri ) free( *ppsz_uri );
+ *ppsz_uri = strdup( psz_data );
+ break;
+ case 2:
+ if( *ppsz_name ) free( *ppsz_name );
+ *ppsz_name = strdup( psz_data );
+ break;
+ case 3:
+ (*pi_options)++;
+ *pppsz_options = realloc( *pppsz_options,
+ sizeof(char *) * *pi_options );
+ (*pppsz_options)[*pi_options - 1] = strdup( psz_data );
+ break;
+ case 0:
+ default:
+ break;
+ }
+
+ if( (b_done || b_flush) && *ppsz_uri )
+ {
+ playlist_item_t *p_item =
+ playlist_ItemNew( p_playlist, *ppsz_uri, *ppsz_name );
+ int i;
+
+ for( i = 0; i < *pi_options; i++ )
+ {
+ playlist_ItemAddOption( p_item, *pppsz_options[i] );
+ }
+
+ playlist_NodeAddItem( p_playlist, p_item,
+ p_parent->pp_parents[0]->i_view,
+ p_parent, PLAYLIST_APPEND, PLAYLIST_END );
+
+ /* We need to declare the parents of the node as the
+ * same of the parent's ones */
+ playlist_CopyParents( p_parent, p_item );
+
+ vlc_input_item_CopyOptions( &p_parent->input, &p_item->input );
+
+ if( *ppsz_name ) free( *ppsz_name ); *ppsz_name = NULL;
+ free( *ppsz_uri ); *ppsz_uri = NULL;
+
+ for( ; *pi_options; (*pi_options)-- )
+ {
+ free( (*pppsz_options)[*pi_options - 1] );
+ if( *pi_options == 1 ) free( *pppsz_options );
+ }
+ *pppsz_options = NULL;
+ }
+}
+
+static vlc_bool_t FindItem( demux_t *p_demux, playlist_t *p_playlist,
+ playlist_item_t **pp_item )
+{
+ vlc_bool_t b_play;
+
+ if( &p_playlist->status.p_item->input ==
+ ((input_thread_t *)p_demux->p_parent)->input.p_item )
+ {
+ msg_Dbg( p_playlist, "starting playlist playback" );
+ *pp_item = p_playlist->status.p_item;
+ b_play = VLC_TRUE;
+ }
+ else
+ {
+ input_item_t *p_current =
+ ((input_thread_t*)p_demux->p_parent)->input.p_item;
+ *pp_item = playlist_LockItemGetByInput( p_playlist, p_current );
+
+ if( !*pp_item )
+ msg_Dbg( p_playlist, "unable to find item in playlist");
+
+ b_play = VLC_FALSE;
+ }
+
+ return b_play;
}
-static int Demux ( input_thread_t *p_input )
+/*****************************************************************************
+ * Demux: reads and demuxes data packets
+ *****************************************************************************
+ * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
+ *****************************************************************************/
+static int Demux( demux_t *p_demux )
{
- data_packet_t *p_data;
- char *p_buf, psz_line[MAX_LINE], eol_tok;
+ demux_sys_t *p_m3u = p_demux->p_sys;
+
+ char psz_line[MAX_LINE];
+ char p_buf[MAX_LINE], eol_tok;
int i_size, i_bufpos, i_linepos = 0;
- playlist_t *p_playlist;
vlc_bool_t b_discard = VLC_FALSE;
- demux_sys_t *p_m3u = (demux_sys_t *)p_input->p_demux_data;
+ char *psz_name = NULL;
+ char *psz_uri = NULL;
+ int i_options = 0;
+ char **ppsz_options = NULL;
+
+ playlist_t *p_playlist;
+ playlist_item_t *p_parent;
+ vlc_bool_t b_play;
- p_playlist = (playlist_t *) vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
+ p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( !p_playlist )
{
- msg_Err( p_input, "can't find playlist" );
+ msg_Err( p_demux, "can't find playlist" );
return -1;
}
- p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
+ b_play = FindItem( p_demux, p_playlist, &p_parent );
+ playlist_ItemToNode( p_playlist, p_parent );
+ p_parent->input.i_type = ITEM_TYPE_PLAYLIST;
/* Depending on wether we are dealing with an m3u/asf file, the end of
* line token will be different */
else
eol_tok = '\n';
- while( ( i_size = input_SplitBuffer( p_input, &p_data, MAX_LINE ) ) > 0 )
+ while( ( i_size = stream_Read( p_demux->s, p_buf, MAX_LINE ) ) )
{
- i_bufpos = 0; p_buf = p_data->p_payload_start;
+ i_bufpos = 0;
while( i_size )
{
psz_line[i_linepos] = '\0';
i_linepos = 0;
- ProcessLine ( p_input, p_m3u , p_playlist , psz_line );
- }
- input_DeletePacket( p_input->p_method_data, p_data );
+ ProcessLine( p_demux, p_playlist, p_parent,
+ psz_line, &psz_uri, &psz_name,
+ &i_options, &ppsz_options, VLC_FALSE );
+ }
}
- if ( i_linepos && b_discard != VLC_TRUE && eol_tok == '\n' )
+ if( i_linepos && b_discard != VLC_TRUE && eol_tok == '\n' )
{
psz_line[i_linepos] = '\0';
- i_linepos = 0;
- ProcessLine ( p_input, p_m3u , p_playlist , psz_line );
+
+ ProcessLine( p_demux, p_playlist, p_parent,
+ psz_line, &psz_uri, &psz_name,
+ &i_options, &ppsz_options, VLC_TRUE );
+ }
+
+ if( psz_uri ) free( psz_uri );
+ if( psz_name ) free( psz_name );
+ for( ; i_options; i_options-- )
+ {
+ free( ppsz_options[i_options - 1] );
+ if( i_options == 1 ) free( ppsz_options );
+ }
+
+ /* Go back and play the playlist */
+ if( b_play )
+ {
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
+ p_playlist->status.i_view,
+ p_playlist->status.p_item, NULL );
}
vlc_object_release( p_playlist );
return 0;
}
+
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+ return VLC_EGENERIC;
+}
projects / vlc / blobdiff