/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
-#include "charset.h"
+#include <vlc_demux.h>
+#include <vlc_charset.h>
-#include <errno.h> /* ENOMEM */
#include "playlist.h"
struct demux_sys_t
int E_(Import_M3U)( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t *)p_this;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
CHECK_PEEK( p_peek, 8 );
- if( POKE( p_peek, "#EXTM3U", 7 ) || POKE( p_peek, "RTSPtext", 8 ) ||
- isExtension( p_demux, ".m3u" ) || isExtension( p_demux, ".vlc" ) ||
- /* A .ram file can contain a single rtsp link */
- isExtension( p_demux, ".ram" ) || isExtension( p_demux, ".rm" ) ||
- isDemux( p_demux, "m3u" ) )
- {
- ;
- }
- else
+ if(! ( POKE( p_peek, "#EXTM3U", 7 ) || POKE( p_peek, "RTSPtext", 8 ) ||
+ demux2_IsPathExtension( p_demux, ".m3u" ) || demux2_IsPathExtension( p_demux, ".vlc" ) ||
+ /* A .ram file can contain a single rtsp link */
+ demux2_IsPathExtension( p_demux, ".ram" ) || demux2_IsPathExtension( p_demux, ".rm" ) ||
+ demux2_IsForced( p_demux, "m3u" ) ) )
return VLC_EGENERIC;
STANDARD_DEMUX_INIT_MSG( "found valid M3U playlist" );
void E_(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;
+ int i_options = 0;
vlc_bool_t b_cleanup = VLC_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 * I64C(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 );
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 );
+ MaybeFromLocaleRep( &psz_mrl );
b_cleanup = VLC_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_ItemNewExt( p_playlist, psz_mrl, psz_name,
i_options, ppsz_options, i_duration );
if ( psz_artist && *psz_artist )
input_ItemAddInfo( p_input, _(VLC_META_INFO_CAT),
- _(VLC_META_ARTIST), "%s", psz_artist );
- playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
- p_item_in_category, (i_parent_id > 0 )? VLC_TRUE : VLC_FALSE,
- PLAYLIST_APPEND );
+ _(VLC_META_ARTIST), "%s", psz_artist );
+ input_ItemAddSubItem( p_current_input, p_input );
+ vlc_gc_decref( p_input );
free( psz_mrl );
}
{
/* 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;
}
}
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