Qt: Increase the max synchronisation time

[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 dfc994dddac3aa565e7f420ce73ef3fbf13cfa9c..da4d3403be2d60b5337e15f82e717f6682d20b07 100644 (file)
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -203,7 +203,7 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
     SETUP_VFILTER_OPTION( logoFileText, editingFinished() )
     SETUP_VFILTER_OPTION( logoYSpin, valueChanged( int ) )
     SETUP_VFILTER_OPTION( logoXSpin, valueChanged( int ) )
-    SETUP_VFILTER_OPTION( logoTransparencySlider, valueChanged( int ) )
+    SETUP_VFILTER_OPTION( logoOpacitySlider, valueChanged( int ) )
 
     if( module_exists( "atmo" ) )
     {
@@ -274,10 +274,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
 
     /* FIXME temporary hack */
     const char *psz_module_name = psz_name;
-    if( !strcmp( psz_name, "magnify" ) ||
-        !strcmp( psz_name, "puzzle" ) ||
-        !strcmp( psz_name, "logo" ) ||
-        !strcmp( psz_name, "wall" ) ||
+    if( !strcmp( psz_name, "wall" ) ||
         !strcmp( psz_name, "panoramix" ) ||
         !strcmp( psz_name, "clone" ) )
         psz_module_name = "video_filter_wrapper";
@@ -373,10 +370,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
     p_vout = THEMIM->getVout();
     if( p_vout )
     {
-        if( !strcmp( psz_filter_type, "sub-filter" ) )
-            var_SetString( vout_GetSpu( p_vout ), psz_filter_type, psz_string );
-        else
-            var_SetString( p_vout, psz_filter_type, psz_string );
+        var_SetString( p_vout, psz_filter_type, psz_string );
         vlc_object_release( p_vout );
     }
 
@@ -409,10 +403,10 @@ void ExtVideo::initComboBoxItems( QObject *widget )
         {
             if( i_type == CONFIG_ITEM_INTEGER
              || i_type == CONFIG_ITEM_BOOL )
-                combobox->addItem( qfu( p_item->ppsz_list_text[i_index] ),
+                combobox->addItem( qtr( p_item->ppsz_list_text[i_index] ),
                                    p_item->pi_list[i_index] );
             else if( i_type == CONFIG_ITEM_STRING )
-                combobox->addItem( qfu( p_item->ppsz_list_text[i_index] ),
+                combobox->addItem( qtr( p_item->ppsz_list_text[i_index] ),
                                    p_item->ppsz_list[i_index] );
         }
     }
@@ -855,8 +849,6 @@ Equalizer::Equalizer( intf_thread_t *_p_intf, QWidget *_parent ) :
 
     /* Setup of presetsComboBox */
     presetsComboBox = ui.presetsCombo;
-    CONNECT( presetsComboBox, currentIndexChanged( int ),
-             this, updateUISliderValues( int ) );
     CONNECT( presetsComboBox, activated( int ), this, setCorePreset( int ) );
 
     /* Add the sliders for the Bands */
@@ -1040,37 +1032,6 @@ void Equalizer::setCoreBands()
     }
 }
 
-void Equalizer::updateUISliderValues( int i_preset )
-{
-    if( i_preset < 0 ) return;
-
-    char *p = createValuesFromPreset( i_preset );
-    char *psz = p;
-    float f_preamp = eqz_preset_10b[i_preset]->f_preamp;
-
-    if ( p )
-    {
-        for( int i = 0; i < BANDS; i++ )
-        {
-            const float f = us_strtod(p, &p );
-
-            bands[i]->setValue( (int)( ( f + 20 ) * 10 )  );
-
-            band_texts[i]->setText( band_frequencies[i] + "\n"
-                                  + QString("%1").arg( f, 5, 'f', 1 ) + "dB" );
-            if( p == NULL || *p == '\0' )
-                break;
-            p++;
-            if( *p == '\0' )
-                break;
-        }
-        free( psz );
-    }
-    ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) );
-    ui.preampLabel->setText( qtr( "Preamp\n" )
-                   + QString::number( f_preamp, 'f', 1 ) + qtr( "dB" ) );
-}
-
 char * Equalizer::createValuesFromPreset( int i_preset )
 {
     QString values;
@@ -1085,9 +1046,31 @@ char * Equalizer::createValuesFromPreset( int i_preset )
 
 void Equalizer::setCorePreset( int i_preset )
 {
+    if( i_preset < 0 )
+        return;
+
+    /* Update pre-amplification in the UI */
+    float f_preamp = eqz_preset_10b[i_preset]->f_preamp;
+    ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) );
+    ui.preampLabel->setText( qtr( "Preamp\n" )
+                   + QString::number( f_preamp, 'f', 1 ) + qtr( "dB" ) );
+
     char *psz_values = createValuesFromPreset( i_preset );
     if( !psz_values ) return ;
 
+    char *p = psz_values;
+    for( int i = 0; i < BANDS && *p; i++ )
+    {
+        const float f = us_strtod( p, &p );
+
+        bands[i]->setValue( (int)( ( f + 20 ) * 10 )  );
+        band_texts[i]->setText( band_frequencies[i] + "\n"
+                              + QString("%1").arg( f, 5, 'f', 1 ) + "dB" );
+        if( *p )
+            p++; /* skip separator */
+    }
+
+    /* Apply presets to audio output */
     aout_instance_t *p_aout= THEMIM->getAout();
     if( p_aout )
     {
@@ -1314,8 +1297,8 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
     AVSpin = new QDoubleSpinBox;
     AVSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
     AVSpin->setDecimals( 3 );
-    AVSpin->setMinimum( -100.0 );
-    AVSpin->setMaximum( 100.0 );
+    AVSpin->setMinimum( -600.0 );
+    AVSpin->setMaximum( 600.0 );
     AVSpin->setSingleStep( 0.1 );
     AVSpin->setToolTip( qtr( "A positive value means that\n"
                              "the audio is ahead of the video" ) );
@@ -1347,8 +1330,8 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
     subsSpin = new QDoubleSpinBox;
     subsSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );
     subsSpin->setDecimals( 3 );
-    subsSpin->setMinimum( -100.0 );
-    subsSpin->setMaximum( 100.0 );
+    subsSpin->setMinimum( -600.0 );
+    subsSpin->setMaximum( 600.0 );
     subsSpin->setSingleStep( 0.1 );
     subsSpin->setToolTip( qtr( "A positive value means that\n"
                              "the subtitles are ahead of the video" ) );