/*****************************************************************************
* Preamble
*****************************************************************************/
-#define _GNU_SOURCE
-#include <stdlib.h> /* malloc(), free() */
-#include <ctype.h> /* isspace() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_demux.h>
-#include <errno.h> /* ENOMEM */
+#include <ctype.h>
#include <vlc_charset.h>
#include "playlist.h"
#include "vlc_meta.h"
char *psz_prefix;
char *psz_data;
int64_t i_data_len;
- vlc_bool_t b_utf8;
- vlc_bool_t b_skip_ads;
+ bool b_utf8;
+ bool b_skip_ads;
};
/*****************************************************************************
demux_sys_t *p_sys = p_demux->p_sys;
unsigned len = psz_source_end - psz_source_start;
- if( *ppsz_string ) free( *ppsz_string );
+ free( *ppsz_string );
char *buf = *ppsz_string = malloc ((len * (1 + !p_sys->b_utf8)) + 1);
if (buf == NULL)
/*****************************************************************************
* Import_ASX: main import function
*****************************************************************************/
-int E_(Import_ASX)( vlc_object_t *p_this )
+int Import_ASX( 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 );
// skip over possible leading empty lines and empty spaces
p_peek = (uint8_t *)SkipBlanks((char *)p_peek, 6);
- if( POKE( p_peek, "<asx", 4 ) || isExtension( p_demux, ".asx" ) ||
- isExtension( p_demux, ".wax" ) || isExtension( p_demux, ".wvx" ) ||
- isDemux( p_demux, "asx-open" ) )
+ if( POKE( p_peek, "<asx", 4 ) || demux_IsPathExtension( p_demux, ".asx" ) ||
+ demux_IsPathExtension( p_demux, ".wax" ) || demux_IsPathExtension( p_demux, ".wvx" ) ||
+ demux_IsForced( p_demux, "asx-open" ) )
{
;
}
return VLC_EGENERIC;
STANDARD_DEMUX_INIT_MSG( "found valid ASX playlist" );
- p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux );
+ p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
p_demux->p_sys->psz_data = NULL;
p_demux->p_sys->i_data_len = -1;
- p_demux->p_sys->b_utf8 = VLC_FALSE;
+ p_demux->p_sys->b_utf8 = false;
p_demux->p_sys->b_skip_ads = config_GetInt( p_demux, "playlist-skip-ads" );
return VLC_SUCCESS;
/*****************************************************************************
* Deactivate: frees unused data
*****************************************************************************/
-void E_(Close_ASX)( vlc_object_t *p_this )
+void Close_ASX( 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 );
- if( p_sys->psz_data ) free( p_sys->psz_data );
+ free( p_sys->psz_prefix );
+ free( p_sys->psz_data );
free( p_sys );
}
demux_sys_t *p_sys = p_demux->p_sys;
char *psz_parse = NULL;
char *psz_backup = NULL;
- vlc_bool_t b_entry = VLC_FALSE;
- input_item_t *p_input;
+ bool b_entry = false;
INIT_PLAYLIST_STUFF;
/* init txt */
for( ;; )
{
int i_read = stream_Read( p_demux->s, &p_sys->psz_data[i_pos], p_sys->i_data_len - i_pos );
- p_sys->psz_data[i_read] = '\0';
+ p_sys->psz_data[i_pos + i_read] = '\0';
if( i_read < p_sys->i_data_len - i_pos ) break; /* Done */
p_sys->i_data_len += 1024;
p_sys->psz_data = realloc( p_sys->psz_data, p_sys->i_data_len * sizeof( char * ) +1 );
}
- if( p_sys->i_data_len <= 0 ) return VLC_EGENERIC;
+ if( p_sys->i_data_len <= 0 ) return -1;
}
psz_parse = p_sys->psz_data;
char *psz_moreinfo_entry = NULL;
char *psz_abstract_entry = NULL;
int i_entry_count = 0;
- vlc_bool_t b_skip_entry = VLC_FALSE;
+ bool b_skip_entry = false;
char *psz_href = NULL;
int i_starttime = 0;
}
else if( !strncasecmp( psz_parse, "<PARAM ", 7 ) )
{
- vlc_bool_t b_encoding_flag = VLC_FALSE;
+ bool b_encoding_flag = false;
psz_parse = SkipBlanks(psz_parse+7, (unsigned)-1);
if( !strncasecmp( psz_parse, "name", 4 ) )
{
memcpy( psz_string, psz_backup, i_strlen );
psz_string[i_strlen] = '\0';
msg_Dbg( p_demux, "param value: %s", psz_string);
- if( b_encoding_flag && !strcasecmp( psz_string, "utf-8" ) ) p_sys->b_utf8 = VLC_TRUE;
+ if( b_encoding_flag && !strcasecmp( psz_string, "utf-8" ) ) p_sys->b_utf8 = true;
free( psz_string );
}
else continue;
psz_string = malloc( i_strlen*sizeof( char ) +1);
memcpy( psz_string, psz_backup, i_strlen );
psz_string[i_strlen] = '\0';
- p_input = input_ItemNew( p_playlist, psz_string, psz_title_asx );
- input_ItemCopyOptions( p_current->p_input, p_input );
- playlist_BothAddInput( p_playlist, p_input,
- p_item_in_category,
- PLAYLIST_APPEND|PLAYLIST_SPREPARSE,
- PLAYLIST_END, NULL, NULL,
- VLC_FALSE);
+ input_item_t *p_input;
+ p_input = input_item_New( p_demux, psz_string, psz_title_asx );
+ input_item_CopyOptions( p_current_input, p_input );
+ input_item_AddSubItem( p_current_input, p_input );
+ vlc_gc_decref( p_input );
free( psz_string );
}
else continue;
if( p_sys->b_skip_ads && b_skip_entry )
{
+ char *psz_current_input_name = input_item_GetName( p_current_input );
+
msg_Dbg( p_demux, "skipped entry %d %s (%s)",
- i_entry_count, ( psz_title_entry ? psz_title_entry : p_current->p_input->psz_name ), psz_href );
+ i_entry_count,
+ ( psz_title_entry ? psz_title_entry : psz_current_input_name ), psz_href );
+ free( psz_current_input_name );
}
else
{
if( i_starttime || i_duration )
{
- if( i_starttime ) {
- asprintf(ppsz_options+i_options, ":start-time=%d", i_starttime);
- ++i_options;
+ if( i_starttime )
+ {
+ if( asprintf(ppsz_options+i_options, ":start-time=%d", i_starttime) == -1 )
+ *(ppsz_options+i_options) = NULL;
+ else
+ ++i_options;
}
- if( i_duration ) {
- asprintf(ppsz_options+i_options, ":stop-time=%d", i_starttime + i_duration);
- ++i_options;
+ if( i_duration )
+ {
+ if( asprintf(ppsz_options+i_options, ":stop-time=%d", i_starttime + i_duration) == -1 )
+ *(ppsz_options+i_options) = NULL;
+ else
+ ++i_options;
}
}
/* create the new entry */
- asprintf( &psz_name, "%d %s", i_entry_count, ( psz_title_entry ? psz_title_entry : p_current->p_input->psz_name ) );
-
- p_entry = input_ItemNewExt( p_playlist, psz_href, psz_name, i_options, (const char * const *)ppsz_options, -1 );
- FREENULL( psz_name );
- input_ItemCopyOptions( p_current->p_input, p_entry );
- while( i_options )
+ char *psz_current_input_name = input_item_GetName( p_current_input );
+ if( asprintf( &psz_name, "%d %s", i_entry_count, ( psz_title_entry ? psz_title_entry : psz_current_input_name ) ) != -1 )
{
- psz_name = ppsz_options[--i_options];
- FREENULL(psz_name);
- }
+ p_entry = input_item_NewExt( p_demux, psz_href, psz_name, i_options, (const char * const *)ppsz_options, -1 );
+ FREENULL( psz_name );
+ input_item_CopyOptions( p_current_input, p_entry );
+ while( i_options )
+ {
+ psz_name = ppsz_options[--i_options];
+ FREENULL( psz_name );
+ }
- p_entry->p_meta = vlc_meta_New();
- if( psz_title_entry ) vlc_meta_SetTitle( p_entry->p_meta, psz_title_entry );
- if( psz_artist_entry ) vlc_meta_SetArtist( p_entry->p_meta, psz_artist_entry );
- if( psz_copyright_entry ) vlc_meta_SetCopyright( p_entry->p_meta, psz_copyright_entry );
- if( psz_moreinfo_entry ) vlc_meta_SetURL( p_entry->p_meta, psz_moreinfo_entry );
- if( psz_abstract_entry ) vlc_meta_SetDescription( p_entry->p_meta, psz_abstract_entry );
- playlist_BothAddInput( p_playlist, p_entry,
- p_item_in_category,
- PLAYLIST_APPEND | PLAYLIST_SPREPARSE
- , PLAYLIST_END, NULL, NULL,
- VLC_FALSE );
+ if( psz_title_entry ) input_item_SetTitle( p_entry, psz_title_entry );
+ if( psz_artist_entry ) input_item_SetArtist( p_entry, psz_artist_entry );
+ if( psz_copyright_entry ) input_item_SetCopyright( p_entry, psz_copyright_entry );
+ if( psz_moreinfo_entry ) input_item_SetURL( p_entry, psz_moreinfo_entry );
+ if( psz_abstract_entry ) input_item_SetDescription( p_entry, psz_abstract_entry );
+ input_item_AddSubItem( p_current_input, p_entry );
+ vlc_gc_decref( p_entry );
+ }
+ free( psz_current_input_name );
}
- /* cleanup entry */
- FREENULL( psz_href )
- FREENULL( psz_title_entry )
- FREENULL( psz_base_entry )
- FREENULL( psz_artist_entry )
- FREENULL( psz_copyright_entry )
- FREENULL( psz_moreinfo_entry )
- FREENULL( psz_abstract_entry )
- b_entry = VLC_FALSE;
+ /* cleanup entry */;
+ FREENULL( psz_href );
+ FREENULL( psz_title_entry );
+ FREENULL( psz_base_entry );
+ FREENULL( psz_artist_entry );
+ FREENULL( psz_copyright_entry );
+ FREENULL( psz_moreinfo_entry );
+ FREENULL( psz_abstract_entry );
+ b_entry = false;
}
else if( !strncasecmp( psz_parse, "<Entry", 6 ) )
{
continue;
}
i_entry_count += 1;
- b_entry = VLC_TRUE;
+ b_entry = true;
psz_clientskip = strcasestr( psz_parse, "clientskip=\"no\"" );
psz_parse = strcasestr( psz_parse, ">" );
/* If clientskip was enabled ... this is an ad */
- if( psz_clientskip < psz_parse ) b_skip_entry = VLC_TRUE;
- else b_skip_entry = VLC_FALSE;
+ b_skip_entry = (NULL != psz_clientskip) && (psz_clientskip < psz_parse);
// init entry details
FREENULL(psz_href);
if( ( psz_parse = strcasestr( psz_parse, "\"" ) ) )
{
psz_backup = ++psz_parse;
+ psz_backup = SkipBlanks(psz_backup, (unsigned)-1);
if( ( psz_parse = strcasestr( psz_parse, "\"" ) ) )
{
+ char *psz_tmp;
i_strlen = psz_parse-psz_backup;
if( i_strlen < 1 ) continue;
psz_href = malloc( i_strlen*sizeof( char ) +1);
memcpy( psz_href, psz_backup, i_strlen );
psz_href[i_strlen] = '\0';
+ psz_tmp = psz_href + (i_strlen-1);
+ while( psz_tmp >= psz_href &&
+ ( *psz_tmp == '\r' || *psz_tmp == '\n' ) )
+ {
+ *psz_tmp = '\0';
+ psz_tmp++;
+ }
}
else continue;
}
}
else if( !strncasecmp( psz_parse, "</ASX", 5 ) )
{
- vlc_mutex_lock( &p_current->p_input->lock );
- if( !p_current->p_input->p_meta ) p_current->p_input->p_meta = vlc_meta_New();
- if( psz_title_asx ) vlc_meta_SetTitle( p_current->p_input->p_meta, psz_title_asx );
- if( psz_artist_asx ) vlc_meta_SetArtist( p_current->p_input->p_meta, psz_artist_asx );
- if( psz_copyright_asx ) vlc_meta_SetCopyright( p_current->p_input->p_meta, psz_copyright_asx );
- if( psz_moreinfo_asx ) vlc_meta_SetURL( p_current->p_input->p_meta, psz_moreinfo_asx );
- if( psz_abstract_asx ) vlc_meta_SetDescription( p_current->p_input->p_meta, psz_abstract_asx );
- vlc_mutex_unlock( &p_current->p_input->lock );
+ if( psz_title_asx ) input_item_SetTitle( p_current_input, psz_title_asx );
+ if( psz_artist_asx ) input_item_SetArtist( p_current_input, psz_artist_asx );
+ if( psz_copyright_asx ) input_item_SetCopyright( p_current_input, psz_copyright_asx );
+ if( psz_moreinfo_asx ) input_item_SetURL( p_current_input, psz_moreinfo_asx );
+ if( psz_abstract_asx ) input_item_SetDescription( p_current_input, psz_abstract_asx );
FREENULL( psz_base_asx );
FREENULL( psz_title_asx );
FREENULL( psz_artist_asx );
#endif
}
HANDLE_PLAY_AND_RELEASE;
- return -1; /* Needed for correct operation of go back */
+ 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;
}