Use var_InheritString for --decklink-video-connection.

[vlc] / modules / codec / twolame.c

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index 6a3f33e890ce6a1f48cb8a10212d124fa0818ce7..9b0649ee6704d73193301b81e42720a0ab753927 100644 (file)
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -84,7 +84,7 @@ vlc_module_begin ()
     add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT,
                  ENC_MODE_LONGTEXT, false )
         change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, NULL );
-    add_bool( ENC_CFG_PREFIX "vbr", 0, NULL, ENC_VBR_TEXT,
+    add_bool( ENC_CFG_PREFIX "vbr", false, NULL, ENC_VBR_TEXT,
               ENC_VBR_LONGTEXT, false )
     add_integer( ENC_CFG_PREFIX "psy", 3, NULL, ENC_PSY_TEXT,
                  ENC_PSY_LONGTEXT, false )
@@ -129,7 +129,6 @@ static int OpenEncoder( vlc_object_t *p_this )
 {
     encoder_t *p_enc = (encoder_t *)p_this;
     encoder_sys_t *p_sys;
-    vlc_value_t val;
     int i_frequency;
 
     if( p_enc->fmt_out.i_codec != VLC_CODEC_MPGA &&
@@ -177,16 +176,13 @@ static int OpenEncoder( vlc_object_t *p_this )
     twolame_set_in_samplerate( p_sys->p_twolame, p_enc->fmt_out.audio.i_rate );
     twolame_set_out_samplerate( p_sys->p_twolame, p_enc->fmt_out.audio.i_rate );
 
-    var_Get( p_enc, ENC_CFG_PREFIX "vbr", &val );
-    if ( val.b_bool )
+    if( var_GetBool( p_enc, ENC_CFG_PREFIX "vbr" ) )
     {
-        float i_quality;
-        var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );
-        i_quality = val.i_int;
-        if ( i_quality > 50.0 ) i_quality = 50.0;
-        if ( i_quality < 0.0 ) i_quality = 0.0;
+        float f_quality = var_GetFloat( p_enc, ENC_CFG_PREFIX "quality" );
+        if ( f_quality > 50.0 ) f_quality = 50.0;
+        if ( f_quality < 0.0 ) f_quality = 0.0;
         twolame_set_VBR( p_sys->p_twolame, 1 );
-        twolame_set_VBR_q( p_sys->p_twolame, i_quality );
+        twolame_set_VBR_q( p_sys->p_twolame, f_quality );
     }
     else
     {
@@ -219,8 +215,7 @@ static int OpenEncoder( vlc_object_t *p_this )
     else
     {
         twolame_set_num_channels( p_sys->p_twolame, 2 );
-        var_Get( p_enc, ENC_CFG_PREFIX "mode", &val );
-        switch ( val.i_int )
+        switch( var_GetInteger( p_enc, ENC_CFG_PREFIX "mode" ) )
         {
         case 1:
             twolame_set_mode( p_sys->p_twolame, TWOLAME_DUAL_CHANNEL );
@@ -235,8 +230,8 @@ static int OpenEncoder( vlc_object_t *p_this )
         }
     }
 
-    var_Get( p_enc, ENC_CFG_PREFIX "psy", &val );
-    twolame_set_psymodel( p_sys->p_twolame, val.i_int );
+    twolame_set_psymodel( p_sys->p_twolame,
+                          var_GetInteger( p_enc, ENC_CFG_PREFIX "psy" ) );
 
     if ( twolame_init_params( p_sys->p_twolame ) )
     {
@@ -271,7 +266,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
     int i_nb_samples = p_aout_buf->i_nb_samples;
     block_t *p_chain = NULL;
 
-    p_sys->i_pts = p_aout_buf->start_date -
+    p_sys->i_pts = p_aout_buf->i_pts -
                 (mtime_t)1000000 * (mtime_t)p_sys->i_nb_samples /
                 (mtime_t)p_enc->fmt_out.audio.i_rate;