X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ftwolame.c;h=9b0649ee6704d73193301b81e42720a0ab753927;hb=d6aa3d36b8570833583b763b187979399b8c6b2a;hp=51318f33973cb52f08c165ba6dd45bdf40e5549a;hpb=8146a7f0e815b8c89a0d2bf0624fc6c4e87f3376;p=vlc

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index 51318f3397..9b0649ee67 100644
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -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 ) )
     {