N_( "CDDB Server port to use." ), true )
#endif
- add_shortcut( "cdda" )
- add_shortcut( "cddasimple" )
+ add_shortcut( "cdda", "cddasimple" )
vlc_module_end ()
if( !p_access->psz_access || !*p_access->psz_access )
return VLC_EGENERIC;
- psz_name = var_CreateGetString( p_this, "cd-audio" );
+ psz_name = var_InheritString( p_this, "cd-audio" );
if( !psz_name || !*psz_name )
{
free( psz_name );
p_sys->vcddev = vcddev;
/* Do we play a single track ? */
- p_sys->i_track = var_CreateGetInteger( p_access, "cdda-track" ) - 1;
+ p_sys->i_track = var_InheritInteger( p_access, "cdda-track" ) - 1;
if( p_sys->i_track < 0 )
{
p_sys->waveheader.DataChunkID = VLC_FOURCC('d', 'a', 't', 'a');
p_sys->waveheader.DataLength = 0; /* we just don't know */
- p_sys->i_first_sector = var_CreateGetInteger( p_access,
- "cdda-first-sector" );
- p_sys->i_last_sector = var_CreateGetInteger( p_access,
- "cdda-last-sector" );
+ p_sys->i_first_sector = var_InheritInteger( p_access,
+ "cdda-first-sector" );
+ p_sys->i_last_sector = var_InheritInteger( p_access,
+ "cdda-last-sector" );
/* Tracknumber in MRL */
if( p_sys->i_first_sector < 0 || p_sys->i_last_sector < 0 )
{
/* If the given string is NULL or empty, fill it by the return value of 'code' */
#define ON_EMPTY( psz, code ) do { if( !NONEMPTY( psz) ) { (psz) = code; } } while(0)
- /* Retreive CDDB informations */
+ /* Retreive CDDB information */
#ifdef HAVE_LIBCDDB
char psz_year_buffer[4+1];
msg_Dbg( p_access, "fetching infos with CDDB" );
pp_cd_text = NULL;
}
- /* Retrieve CD-TEXT informations but prefer CDDB */
+ /* Retrieve CD-TEXT information but prefer CDDB */
if( i_cd_text > 0 && pp_cd_text[0] )
{
const vlc_meta_t *p_disc = pp_cd_text[0];
const char *psz_track_description = NULL;
#ifdef HAVE_LIBCDDB
- /* Retreive CDDB informations */
+ /* Retreive CDDB information */
if( p_disc )
{
cddb_track_t *t = cddb_disc_get_track( p_disc, i );
}
#endif
- /* Retreive CD-TEXT informations but prefer CDDB */
+ /* Retreive CD-TEXT information but prefer CDDB */
if( i+1 < i_cd_text && pp_cd_text[i+1] )
{
const vlc_meta_t *t = pp_cd_text[i+1];
#ifdef HAVE_LIBCDDB
static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors )
{
- if( var_CreateGetInteger( p_access, "album-art" ) == ALBUM_ART_WHEN_ASKED )
+ if( var_InheritInteger( p_access, "album-art" ) == ALBUM_ART_WHEN_ASKED )
return NULL;
/* */