]> git.sesse.net Git - vlc/commitdiff
Use var_Inherit* instead of var_CreateGet*.
authorSteinar H. Gunderson <steinar+vlc@gunderson.no>
Mon, 27 Sep 2010 22:44:21 +0000 (00:44 +0200)
committerSteinar H. Gunderson <steinar+vlc@gunderson.no>
Mon, 27 Sep 2010 22:44:21 +0000 (00:44 +0200)
modules/access/sdi.cpp

index 055c0c13b70c070157177bc244461d33e6e7bfe1..b842e0180d3d8b9a20935037416ea6068db2f734 100644 (file)
@@ -291,7 +291,7 @@ static int Open( vlc_object_t *p_this )
 
     HRESULT result;
 
-    i_card_index = var_CreateGetInteger( p_demux, "sdi-card-index" );
+    i_card_index = var_InheritInteger( p_demux, "sdi-card-index" );
     for( int i = 0; i <= i_card_index; ++i )
     {
         if( p_sys->p_card )
@@ -408,7 +408,7 @@ static int Open( vlc_object_t *p_this )
         goto finish;
     }
 
-    psz_display_mode = var_CreateGetString( p_demux, "sdi-mode" );
+    psz_display_mode = var_InheritString( p_demux, "sdi-mode" );
     if( !psz_display_mode || strlen( psz_display_mode ) == 0 || strlen( psz_display_mode ) > 4 ) {
         msg_Err( p_demux, "Missing or invalid --sdi-mode string" );
         ret = VLC_EGENERIC;
@@ -520,8 +520,8 @@ static int Open( vlc_object_t *p_this )
     }
 
     /* Set up audio. */
-    p_sys->i_rate = var_CreateGetInteger( p_demux, "sdi-audio-rate" );
-    p_sys->i_channels = var_CreateGetInteger( p_demux, "sdi-audio-channels" );
+    p_sys->i_rate = var_InheritInteger( p_demux, "sdi-audio-rate" );
+    p_sys->i_channels = var_InheritInteger( p_demux, "sdi-audio-channels" );
     if( p_sys->i_rate > 0 && p_sys->i_channels > 0 )
     {
         result = p_sys->p_input->EnableAudioInput( p_sys->i_rate, bmdAudioSampleType16bitInteger, p_sys->i_channels );