Removed fake access.

[vlc] / modules / access / cdda.c

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index f68074094628c08947e07a5850b09980a9d2bc39..43b824b8f5dacdf97fbe0cfd669578f0f612a8fb 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -77,11 +77,11 @@ vlc_module_begin ()
         change_safe()
 
     add_integer( "cdda-track", 0 , NULL, NULL, NULL, true )
-        change_internal ()
+        change_volatile ()
     add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, true )
-        change_internal ()
+        change_volatile ()
     add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, true )
-        change_internal ()
+        change_volatile ()
 
 #ifdef HAVE_LIBCDDB
     add_string( "cddb-server", "freedb.freedb.org", NULL, N_( "CDDB Server" ),
@@ -139,7 +139,7 @@ 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 )
@@ -152,7 +152,7 @@ static int Open( vlc_object_t *p_this )
             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] == ':' &&
@@ -493,7 +493,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;