DVB: useless includes

[vlc] / modules / access / cdda.c

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 48c664b29e1c39c5d813b24b9e7602d39b7077cd..a610b92a9e21fd9decc1e303647c6504fbb69131 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -72,21 +72,21 @@ vlc_module_begin ()
     set_callbacks( Open, Close )
 
     add_usage_hint( N_("[cdda:][device][@[track]]") )
-    add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
+    add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT,
                  CACHING_LONGTEXT, true )
         change_safe()
 
-    add_integer( "cdda-track", 0 , NULL, NULL, NULL, true )
+    add_integer( "cdda-track", 0 , NULL, NULL, true )
         change_volatile ()
-    add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, true )
+    add_integer( "cdda-first-sector", -1, NULL, NULL, true )
         change_volatile ()
-    add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, true )
+    add_integer( "cdda-last-sector", -1, NULL, NULL, true )
         change_volatile ()
 
 #ifdef HAVE_LIBCDDB
-    add_string( "cddb-server", "freedb.freedb.org", NULL, N_( "CDDB Server" ),
+    add_string( "cddb-server", "freedb.freedb.org", N_( "CDDB Server" ),
             N_( "Address of the CDDB server to use." ), true )
-    add_integer( "cddb-port", 8880, NULL, N_( "CDDB port" ),
+    add_integer( "cddb-port", 8880, N_( "CDDB port" ),
             N_( "CDDB Server port to use." ), true )
 #endif
 
@@ -144,12 +144,9 @@ static int Open( vlc_object_t *p_this )
         if( !p_access->psz_access || !*p_access->psz_access )
             return VLC_EGENERIC;
 
-        psz_name = var_CreateGetString( p_this, "cd-audio" );
-        if( !psz_name || !*psz_name )
-        {
-            free( psz_name );
+        psz_name = var_InheritString( p_this, "cd-audio" );
+        if( !psz_name )
             return VLC_EGENERIC;
-        }
     }
     else psz_name = ToLocaleDup( p_access->psz_filepath );
 
@@ -172,7 +169,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 )
    {
@@ -211,10 +208,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 )
         {
@@ -606,7 +603,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;
 
     /* */