Use var_Inherit* when applicable.

[vlc] / modules / access / cdda.c

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 07da568c10748ef046baaa6c67c35ba4f58d1def..1d6fe3cce4a096623d2972bac892026e599d62f8 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -90,8 +90,7 @@ vlc_module_begin ()
             N_( "CDDB Server port to use." ), true )
 #endif
 
-    add_shortcut( "cdda" )
-    add_shortcut( "cddasimple" )
+    add_shortcut( "cdda", "cddasimple" )
 vlc_module_end ()
 
 
@@ -139,20 +138,20 @@ static int Open( vlc_object_t *p_this )
     vcddev_t     *vcddev;
     char         *psz_name;
 
-    if( !p_access->psz_path || !*p_access->psz_path )
+    if( !p_access->psz_filepath || !*p_access->psz_filepath )
     {
         /* Only when selected */
         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 );
             return VLC_EGENERIC;
         }
     }
-    else psz_name = ToLocaleDup( p_access->psz_path );
+    else psz_name = ToLocaleDup( p_access->psz_filepath );
 
 #ifdef WIN32
     if( psz_name[0] && psz_name[1] == ':' &&
@@ -173,7 +172,7 @@ static int Open( vlc_object_t *p_this )
     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 )
    {
@@ -212,10 +211,10 @@ static int Open( vlc_object_t *p_this )
         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 )
         {
@@ -401,7 +400,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
 /* 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" );
@@ -448,7 +447,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
         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];
@@ -493,7 +492,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
         msg_Dbg( p_access, "track[%d] start=%d", i, p_sys->p_sectors[i] );
 
         /* */
-        if( asprintf( &psz_uri, "cdda://%s", p_access->psz_path ) == -1 )
+        if( asprintf( &psz_uri, "cdda://%s", p_access->psz_location ) == -1 )
             psz_uri = NULL;
         if( asprintf( &psz_opt, "cdda-track=%i", i+1 ) == -1 )
             psz_opt = NULL;
@@ -523,7 +522,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
         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 );
@@ -535,7 +534,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
         }
 #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];
@@ -607,7 +606,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
 #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;
 
     /* */