/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
-#include "charset.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_demux.h>
+#include <vlc_charset.h>
-#include <errno.h> /* ENOMEM */
#include "playlist.h"
struct demux_sys_t
static int Demux( demux_t *p_demux);
static int Control( demux_t *p_demux, int i_query, va_list args );
static void parseEXTINF( char *psz_string, char **ppsz_artist, char **ppsz_name, int *pi_duration );
+static bool ContainsURL( demux_t *p_demux );
/*****************************************************************************
* Import_M3U: main import function
*****************************************************************************/
-int E_(Import_M3U)( vlc_object_t *p_this )
+int Import_M3U( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
+ const uint8_t *p_peek;
+ CHECK_PEEK( p_peek, 8 );
- uint8_t *p_peek;
- char *psz_ext;
-
- if( stream_Peek( p_demux->s , &p_peek, 7 ) < 7 )
- {
+ if(! ( POKE( p_peek, "#EXTM3U", 7 ) || POKE( p_peek, "RTSPtext", 8 ) ||
+ demux_IsPathExtension( p_demux, ".m3u" ) || demux_IsPathExtension( p_demux, ".vlc" ) ||
+ demux_IsForced( p_demux, "m3u" ) || ContainsURL( p_demux ) ) )
return VLC_EGENERIC;
- }
- psz_ext = strrchr ( p_demux->psz_path, '.' );
- if( !strncmp( (char *)p_peek, "#EXTM3U", 7 ) )
- {
- ;
- }
- else if( ( psz_ext && !strcasecmp( psz_ext, ".m3u") ) ||
- ( psz_ext && !strcasecmp( psz_ext, ".ram") ) ||
- ( psz_ext && !strcasecmp( psz_ext, ".rm") ) ||
- /* A .ram file can contain a single rtsp link */
- ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "m3u") ) )
- {
- ;
- }
- else
- {
- return VLC_EGENERIC;
- }
- msg_Dbg( p_demux, "found valid M3U playlist file");
+ STANDARD_DEMUX_INIT_MSG( "found valid M3U playlist" );
+ p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
+
+ return VLC_SUCCESS;
+}
+
+static bool ContainsURL( demux_t *p_demux )
+{
+ const uint8_t *p_peek, *p_peek_end;
+ int i_peek;
- 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 )
+ i_peek = stream_Peek( p_demux->s, &p_peek, 1024 );
+ if( i_peek <= 0 ) return false;
+ p_peek_end = p_peek + i_peek;
+
+ while( p_peek + sizeof( "https://" ) < p_peek_end )
{
- msg_Err( p_demux, "Out of memory" );
- return VLC_ENOMEM;
- }
- p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux );
+ /* One line starting with an URL is enough */
+ if( !strncasecmp( (const char *)p_peek, "http://", 7 ) ||
+ !strncasecmp( (const char *)p_peek, "mms://", 6 ) ||
+ !strncasecmp( (const char *)p_peek, "rtsp://", 7 ) ||
+ !strncasecmp( (const char *)p_peek, "https://", 8 ) ||
+ !strncasecmp( (const char *)p_peek, "ftp://", 6 ) )
+ {
+ return true;
+ }
+ /* Comments and blank lines are ignored */
+ else if( *p_peek != '#' && *p_peek != '\n' && *p_peek != '\r')
+ {
+ return false;
+ }
- return VLC_SUCCESS;
+ while( p_peek < p_peek_end && *p_peek != '\n' )
+ p_peek++;
+ if ( *p_peek == '\n' )
+ p_peek++;
+ }
+ return false;
}
/*****************************************************************************
* Deactivate: frees unused data
*****************************************************************************/
-void E_(Close_M3U)( vlc_object_t *p_this )
+void Close_M3U( 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->psz_prefix );
free( p_demux->p_sys );
}
+
+/* Gruik! */
+static inline char *MaybeFromLocaleDup (const char *str)
+{
+ if (str == NULL)
+ return NULL;
+
+ return IsUTF8 (str) ? strdup (str) : FromLocaleDup (str);
+}
+
+
+static inline void MaybeFromLocaleRep (char **str)
+{
+ char *const orig_str = *str;
+
+ if ((orig_str != NULL) && !IsUTF8 (orig_str))
+ {
+ *str = FromLocaleDup (orig_str);
+ free (orig_str);
+ }
+}
+
+
static int Demux( demux_t *p_demux )
{
char *psz_line;
int i_parsed_duration = 0;
mtime_t i_duration = -1;
const char**ppsz_options = NULL;
- int i_options = 0, i, i_parent_id;
- vlc_bool_t b_cleanup = VLC_FALSE;
+ int i_options = 0;
+ bool b_cleanup = false;
+ input_item_t *p_input;
INIT_PLAYLIST_STUFF;
/* Extended info */
psz_parse += sizeof("EXTINF:") - 1;
parseEXTINF( psz_parse, &psz_artist, &psz_name, &i_parsed_duration );
- if ( i_parsed_duration >= 0 )
- i_duration = i_parsed_duration * 1000000;
- if ( psz_name )
+ if( i_parsed_duration >= 0 )
+ i_duration = i_parsed_duration * INT64_C(1000000);
+ if( psz_name )
psz_name = strdup( psz_name );
- if ( psz_artist )
+ if( psz_artist )
psz_artist = strdup( psz_artist );
}
else if( !strncasecmp( psz_parse, "EXTVLCOPT:",
sizeof("EXTVLCOPT:") -1 ) )
{
/* VLC Option */
- const char *psz_option;
+ char *psz_option;
psz_parse += sizeof("EXTVLCOPT:") -1;
if( !*psz_parse ) goto error;
- psz_option = strdup( psz_parse );
+ psz_option = MaybeFromLocaleDup( psz_parse );
if( psz_option )
INSERT_ELEM( ppsz_options, i_options, i_options,
psz_option );
}
}
+ else if( !strncasecmp( psz_parse, "RTSPtext", sizeof("RTSPtext") -1 ) )
+ {
+ ;/* special case to handle QuickTime RTSPtext redirect files */
+ }
else if( *psz_parse )
{
char *psz_mrl;
if( !psz_name || !*psz_name )
{
/* Use filename as name for relative entries */
- psz_name = strdup( psz_parse );
+ psz_name = MaybeFromLocaleDup( psz_parse );
}
- psz_mrl = E_(ProcessMRL)( psz_parse, p_demux->p_sys->psz_prefix );
+ psz_mrl = ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix );
+ MaybeFromLocaleRep( &psz_mrl );
- b_cleanup = VLC_TRUE;
+ b_cleanup = true;
if( !psz_mrl ) goto error;
- EnsureUTF8( psz_name );
- EnsureUTF8( psz_mrl );
-
- for( i = 0; i< i_options; i++ )
- EnsureUTF8( (char*)ppsz_options[i] );
+ p_input = input_item_NewExt( p_demux, psz_mrl, psz_name,
+ i_options, ppsz_options, 0, i_duration );
- p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,
- i_options, ppsz_options, i_duration );
if ( psz_artist && *psz_artist )
- vlc_input_item_AddInfo( p_input, _(VLC_META_INFO_CAT),
- _(VLC_META_ARTIST), "%s", psz_artist );
- fprintf( stderr, "Adding %s\n", p_input->psz_uri );
- playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
- p_item_in_category, (i_parent_id > 0 )? VLC_TRUE : VLC_FALSE,
- PLAYLIST_APPEND );
+ input_item_SetArtist( p_input, psz_artist );
+
+ input_item_AddSubItem( p_current_input, p_input );
+ vlc_gc_decref( p_input );
free( psz_mrl );
}
/* Fetch another line */
free( psz_line );
psz_line = stream_ReadLine( p_demux->s );
- if( !psz_line ) b_cleanup = VLC_TRUE;
+ if( !psz_line ) b_cleanup = true;
if( b_cleanup )
{
/* Cleanup state */
while( i_options-- ) free( (char*)ppsz_options[i_options] );
- if( ppsz_options ) free( ppsz_options );
+ free( ppsz_options );
ppsz_options = NULL; i_options = 0;
- if( psz_name ) free( psz_name );
+ free( psz_name );
psz_name = NULL;
- if ( psz_artist ) free( psz_artist );
+ free( psz_artist );
psz_artist = NULL;
i_parsed_duration = 0;
i_duration = -1;
- b_cleanup = VLC_FALSE;
+ b_cleanup = false;
}
}
HANDLE_PLAY_AND_RELEASE;
- return VLC_SUCCESS;
+ var_Destroy( p_demux, "m3u-extvlcopt" );
+ return 0; /* Needed for correct operation of go back */
}
static int Control( demux_t *p_demux, int i_query, va_list args )
{
+ VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args);
return VLC_EGENERIC;
}
end = psz_string + strlen( psz_string );
/* ignore whitespaces */
- for (; psz_string < end && ( *psz_string == '\t' || *psz_string == ' ' );
+ for (; psz_string < end && ( *psz_string == '\t' || *psz_string == ' ' );
psz_string++ );
/* duration: read to next comma */
projects / vlc / blobdiff