p_intf->p_sys->p_aout = p_aout;
f_preamp = var_GetFloat( p_aout, "equalizer-preamp" );
- psz_bands = var_GetString( p_aout, "equalizer-bands" );
+ psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" );
+ if( psz_bands == NULL )
+ psz_bands = strdup("");
b_update = VLC_TRUE;
}
vlc_object_release( p_aout );
if( p_sys->b_update == VLC_TRUE )
{
msg_Dbg( p_sd, "Update required" );
- psz_urls = var_GetString( p_sd, "podcast-urls" );
- ParseUrls( p_sd, psz_urls );
+ psz_urls = var_GetNonEmptyString( p_sd, "podcast-urls" );
+ if( psz_urls != NULL )
+ ParseUrls( p_sd, psz_urls );
free( psz_urls );
p_sys->b_update = VLC_FALSE;
}
if( !p_vout )
return 0;
- psz_aspect = var_GetString( p_vout, "aspect-ratio" );
+ psz_aspect = var_GetNonEmptyString( p_vout, "aspect-ratio" );
vlc_object_release( p_vout );
- return psz_aspect;
+ return psz_aspect ? psz_aspect : strdup("");
}
void libvlc_video_set_aspect_ratio( libvlc_media_instance_t *p_mi,
if( !p_vout )
return 0;
- psz_geometry = var_GetString( p_vout, "crop" );
+ psz_geometry = var_GetNonEmptyString( p_vout, "crop" );
vlc_object_release( p_vout );
- return psz_geometry;
+ return psz_geometry ? psz_geometry : strdup("");
}
void libvlc_video_set_crop_geometry( libvlc_media_instance_t *p_mi,
if( *p_demux->psz_demux == '\0' )
{
free( p_demux->psz_demux );
- p_demux->psz_demux = var_GetString( p_obj, "demux" );
+ p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" );
+ if( p_demux->psz_demux == NULL )
+ p_demux->psz_demux = strdup( "" );
}
if( !b_quick )
var_Get( p_input, "sub-autodetect-file", &val );
if( val.b_bool )
{
- char *psz_autopath = var_GetString( p_input, "sub-autodetect-path" );
+ char *psz_autopath = var_GetNonEmptyString( p_input, "sub-autodetect-path" );
char **subs = subtitles_Detect( p_input, psz_autopath,
p_input->p->input.p_item->psz_uri );
input_source_t *sub;
i = 0;
+ if( psz_autopath == NULL )
+ psz_autopath = strdup("");
/* Try to autoselect the first autodetected subtitles file
* if no subtitles file was specified */