Merge branch 'master' of git.videolan.org:vlc

[vlc] / modules / gui / qt4 / components / extended_panels.cpp

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 2085f6d82ec5654335554bc8ea9839e12d4c14ce..77cdc9becd9864ef2a434c7cbfecdb619940eb70 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -222,7 +222,7 @@ ExtVideo::~ExtVideo()
 void ExtVideo::cropChange()
 {
     p_vout = ( vout_thread_t * )vlc_object_find( p_intf,
-                                VLC_OBJECT_VOUT, FIND_CHILD );
+                                VLC_OBJECT_VOUT, FIND_ANYWHERE );
     if( p_vout )
     {
         var_SetInteger( p_vout, "crop-top", ui.cropTopPx->value() );
@@ -279,7 +279,10 @@ void ExtVideo::ChangeVFiltersString( char *psz_name, bool b_add )
             psz_parser = psz_string;
             if( asprintf( &psz_string, ( *psz_string ) ? "%s:%s" : "%s%s",
                             psz_string, psz_name ) == -1 )
+            {
+                free( psz_parser );
                 return;
+            }
             free( psz_parser );
         }
         else
@@ -853,7 +856,7 @@ Equalizer::~Equalizer()
 /* Write down initial values */
 void Equalizer::updateUIFromCore()
 {
-    char *psz_af, *psz_bands;
+    char *psz_af;
     float f_preamp;
     int i_preset;
 
@@ -864,7 +867,6 @@ void Equalizer::updateUIFromCore()
         psz_af = var_GetNonEmptyString( p_aout, "audio-filter" );
         if( var_GetBool( p_aout, "equalizer-2pass" ) )
             ui.eq2PassCheck->setChecked( true );
-        psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" );
         f_preamp = var_GetFloat( p_aout, "equalizer-preamp" );
         i_preset = presetsComboBox->findData( QVariant(
                     var_GetString( p_aout, "equalizer-preset" ) ) );
@@ -875,7 +877,6 @@ void Equalizer::updateUIFromCore()
         psz_af = config_GetPsz( p_intf, "audio-filter" );
         if( config_GetInt( p_intf, "equalizer-2pass" ) )
             ui.eq2PassCheck->setChecked( true );
-        psz_bands = config_GetPsz( p_intf, "equalizer-bands" );
         f_preamp = config_GetFloat( p_intf, "equalizer-preamp" );
         i_preset = presetsComboBox->findData( QVariant(
                     config_GetPsz( p_intf, "equalizer-preset" ) ) );
@@ -1101,7 +1102,7 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) :
     QGridLayout *layout = new QGridLayout( this );
     layout->setMargin( 0 );
 
-    enableCheck = new QCheckBox( qfu( "Enable spatializer" ) );
+    enableCheck = new QCheckBox( qtr( "Enable spatializer" ) );
     layout->addWidget( enableCheck, 0, 0, 1, NUM_SP_CTRL );
 
     for( int i = 0 ; i < NUM_SP_CTRL ; i++ )