/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_demux.h>
#include "playlist.h"
/*****************************************************************************
* Import_PLS: main import function
*****************************************************************************/
-int E_(Import_PLS)( vlc_object_t *p_this )
+int Import_PLS( 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, 10 );
if( POKE( p_peek, "[playlist]", 10 ) || POKE( p_peek, "[Reference]", 10 ) ||
- isExtension( p_demux, ".pls" ) || isDemux( p_demux, "pls" ) )
+ demux_IsPathExtension( p_demux, ".pls" ) || demux_IsForced( p_demux, "pls" ) )
{
;
}
else return VLC_EGENERIC;
STANDARD_DEMUX_INIT_MSG( "found valid PLS playlist file");
- p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux );
+ p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
return VLC_SUCCESS;
}
/*****************************************************************************
* Deactivate: frees unused data
*****************************************************************************/
-void E_(Close_PLS)( vlc_object_t *p_this )
+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->psz_prefix );
free( p_demux->p_sys );
}
free( psz_line );
continue;
}
+ if( !strcasecmp( psz_key, "numberofentries" ) )
+ {
+ msg_Dbg( p_demux, "pls should have %d entries", atoi(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 >= 4 ) /* Ref1 type case */
{
p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,
0, NULL, -1 );
- input_ItemCopyOptions( p_current->p_input, p_input );
- playlist_BothAddInput( p_playlist, p_input, p_item_in_category,
- PLAYLIST_APPEND, PLAYLIST_END );
+ input_ItemCopyOptions( p_current_input, p_input );
+ input_ItemAddSubItem( p_current_input, p_input );
+ vlc_gc_decref( p_input );
}
else
{
msg_Warn( p_demux, "no file= part found for item %d", i_item );
}
- if( psz_name )
- {
- free( psz_name );
- psz_name = NULL;
- }
+ 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 ) ||
!strncasecmp( psz_key, "Ref", sizeof("Ref") -1 ) )
{
+ free( psz_mrl_orig );
psz_mrl_orig =
- psz_mrl = E_(ProcessMRL)( psz_value, p_demux->p_sys->psz_prefix );
+ psz_mrl = ProcessMRL( psz_value, p_demux->p_sys->psz_prefix );
if( !strncasecmp( psz_key, "Ref", sizeof("Ref") -1 ) )
{
}
else if( !strncasecmp( psz_key, "title", sizeof("title") -1 ) )
{
+ free( psz_name );
psz_name = strdup( psz_value );
}
else if( !strncasecmp( psz_key, "length", sizeof("length") -1 ) )
if( psz_mrl )
{
p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,0, NULL, -1 );
- input_ItemCopyOptions( p_current->p_input, p_input );
- playlist_BothAddInput( p_playlist, p_input, p_item_in_category,
- PLAYLIST_APPEND, PLAYLIST_END );
+ input_ItemCopyOptions( p_current_input, p_input );
+ input_ItemAddSubItem( p_current_input, p_input );
+ vlc_gc_decref( p_input );
free( psz_mrl_orig );
psz_mrl = NULL;
}
{
msg_Warn( p_demux, "no file= part found for item %d", i_item );
}
- if( psz_name )
- {
- free( psz_name );
- psz_name = NULL;
- }
+ free( psz_name );
+ psz_name = NULL;
HANDLE_PLAY_AND_RELEASE;
- return VLC_SUCCESS;
+ 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;
}