X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fplaylist%2Fb4s.c;h=31405b43dce355da78185c481fe96ad4820a7b28;hb=f1a39394987b210f1bf5dbede2738ee3bcbff009;hp=272490d4f49111ed99977e5814b3a8b6898a7b35;hpb=ed0b72e3714ad87cb4e10b9a7239e19b9ef0724e;p=vlc diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c index 272490d4f4..31405b43dc 100644 --- a/modules/demux/playlist/b4s.c +++ b/modules/demux/playlist/b4s.c @@ -24,16 +24,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include /* isspace() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include -#include /* ENOMEM */ #include "playlist.h" -#include "vlc_xml.h" struct demux_sys_t { @@ -47,56 +48,31 @@ 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 char *GetNextToken(char *psz_cur_string); +//static char *GetNextToken(char *psz_cur_string); static int IsWhitespace( char *psz_string ); /***************************************************************************** * Import_B4S: main import function *****************************************************************************/ -int E_(Import_B4S)( vlc_object_t *p_this ) +int Import_B4S( vlc_object_t *p_this ) { - demux_t *p_demux = (demux_t *)p_this; - demux_sys_t *p_sys; - - char *psz_ext; - - psz_ext = strrchr ( p_demux->psz_path, '.' ); - - if( ( psz_ext && !strcasecmp( psz_ext, ".b4s") ) || - ( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "b4s-open") ) ) - { - ; - } - else - { - return VLC_EGENERIC; - } - msg_Dbg( p_demux, "using b4s playlist import"); - - p_demux->pf_control = Control; - p_demux->pf_demux = Demux; - p_demux->p_sys = p_sys = malloc( sizeof(demux_sys_t) ); - if( p_sys == NULL ) - { - msg_Err( p_demux, "out of memory" ); - return VLC_ENOMEM; - } - p_sys->psz_prefix = E_(FindPrefix)( p_demux ); - p_sys->p_xml = NULL; - p_sys->p_xml_reader = NULL; - + DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".b4s", "b4s-open", + "using B4S playlist reader" ); + p_demux->p_sys->psz_prefix = FindPrefix( p_demux ); + p_demux->p_sys->p_xml = NULL; + p_demux->p_sys->p_xml_reader = NULL; return VLC_SUCCESS; } /***************************************************************************** * Deactivate: frees unused data *****************************************************************************/ -void E_(Close_B4S)( vlc_object_t *p_this ) +void Close_B4S( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t *)p_this; demux_sys_t *p_sys = p_demux->p_sys; - if( p_sys->psz_prefix ) free( p_sys->psz_prefix ); + free( p_sys->psz_prefix ); if( p_sys->p_xml_reader ) xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader ); if( p_sys->p_xml ) xml_Delete( p_sys->p_xml ); free( p_sys ); @@ -105,15 +81,13 @@ void E_(Close_B4S)( vlc_object_t *p_this ) static int Demux( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - playlist_item_t *p_item; - playlist_item_t *p_bitrate = NULL, *p_genre = NULL; - - int i_ret, i_parent_id; + int i_ret; xml_t *p_xml; xml_reader_t *p_xml_reader; char *psz_elname = NULL; int i_type; + input_item_t *p_input; char *psz_mrl = NULL, *psz_name = NULL, *psz_genre = NULL; char *psz_now = NULL, *psz_listeners = NULL, *psz_bitrate = NULL; @@ -123,8 +97,8 @@ static int Demux( demux_t *p_demux ) if( !p_xml ) return -1; psz_elname = stream_ReadLine( p_demux->s ); - if( psz_elname ) free( psz_elname ); - psz_elname = 0; + free( psz_elname ); + psz_elname = NULL; p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s ); if( !p_xml_reader ) return -1; @@ -135,7 +109,6 @@ static int Demux( demux_t *p_demux ) if( xml_ReaderRead( p_xml_reader ) != 1 ) { msg_Err( p_demux, "invalid file (no root node)" ); - vlc_object_release( p_playlist ); return -1; } @@ -145,8 +118,7 @@ static int Demux( demux_t *p_demux ) { msg_Err( p_demux, "invalid root node %i, %s", xml_ReaderNodeType( p_xml_reader ), psz_elname ); - if( psz_elname ) free( psz_elname ); - vlc_object_release( p_playlist ); + free( psz_elname ); return -1; } free( psz_elname ); @@ -167,24 +139,29 @@ static int Demux( demux_t *p_demux ) strcmp( psz_elname, "playlist" ) ) { msg_Err( p_demux, "invalid child node %s", psz_elname ); - if( psz_elname ) free( psz_elname ); + free( psz_elname ); return -1; } - free( psz_elname ); psz_elname = 0; + free( psz_elname ); psz_elname = NULL; // Read the attributes while( xml_ReaderNextAttr( p_xml_reader ) == VLC_SUCCESS ) { char *psz_name = xml_ReaderName( p_xml_reader ); char *psz_value = xml_ReaderValue( p_xml_reader ); - if( !psz_name || !psz_value ) return -1; + if( !psz_name || !psz_value ) + { + free( psz_name ); + free( psz_value ); + return -1; + } if( !strcmp( psz_name, "num_entries" ) ) { msg_Dbg( p_demux, "playlist has %d entries", atoi(psz_value) ); } else if( !strcmp( psz_name, "label" ) ) { - playlist_ItemSetName( p_current, psz_value ); + input_item_SetName( p_current_input, psz_value ); } else { @@ -209,7 +186,7 @@ static int Demux( demux_t *p_demux ) case XML_READER_STARTELEM: { // Read the element name - if( psz_elname ) free( psz_elname ); + free( psz_elname ); psz_elname = xml_ReaderName( p_xml_reader ); if( !psz_elname ) return -1; @@ -284,29 +261,24 @@ static int Demux( demux_t *p_demux ) if( !psz_elname ) return -1; if( !strcmp( psz_elname, "entry" ) ) { - p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name, - 0, NULL, -1 ); + p_input = input_item_New( p_demux, psz_mrl, psz_name ); if( psz_now ) - vlc_meta_SetNowPlaying( p_input->p_meta, psz_now ); + input_item_SetNowPlaying( p_input, psz_now ); if( psz_genre ) - vlc_meta_SetGenre( p_input->p_meta, psz_genre ); + input_item_SetGenre( p_input, psz_genre ); if( psz_listeners ) - msg_Err( p_playlist, "Unsupported meta listeners" ); + msg_Err( p_demux, "Unsupported meta listeners" ); if( psz_bitrate ) - msg_Err( p_playlist, "Unsupported meta bitrate" ); - - playlist_AddWhereverNeeded( p_playlist, p_input, p_current, - p_item_in_category, (i_parent_id > 0 ) ? VLC_TRUE: - VLC_FALSE, PLAYLIST_APPEND ); - -#define FREE(a) if( a ) free( a ); a = NULL; - FREE( psz_name ); - FREE( psz_mrl ); - FREE( psz_genre ); - FREE( psz_bitrate ); - FREE( psz_listeners ); - FREE( psz_now ); -#undef FREE + msg_Err( p_demux, "Unsupported meta bitrate" ); + + input_item_AddSubItem( p_current_input, p_input ); + vlc_gc_decref( p_input ); + FREENULL( psz_name ); + FREENULL( psz_mrl ); + FREENULL( psz_genre ); + FREENULL( psz_bitrate ); + FREENULL( psz_listeners ); + FREENULL( psz_now ); } free( psz_elname ); psz_elname = strdup(""); @@ -321,15 +293,19 @@ static int Demux( demux_t *p_demux ) msg_Warn( p_demux, "error while parsing data" ); } + free( psz_elname ); + 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; } +#if 0 /** * Get a in-string pointer to the start of the next token from a * string terminating the pointer returned by a previous call. @@ -350,6 +326,7 @@ static char *GetNextToken(char *psz_cur_string) { psz_cur_string++; return psz_cur_string; } +#endif static int IsWhitespace( char *psz_string ) { @@ -358,9 +335,9 @@ static int IsWhitespace( char *psz_string ) if( *psz_string != ' ' && *psz_string != '\t' && *psz_string != '\r' && *psz_string != '\n' ) { - return VLC_FALSE; + return false; } psz_string++; } - return VLC_TRUE; + return true; }