X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fextended_panels.cpp;h=3a05513f1bc38974ef9f85b1c5ffb4e8a5da3eae;hb=edeb8f7bc73ca5bf1eeeca767469098252add6fa;hp=7fbaf4f4778d705330f6cfe8f036f5b59aa47991;hpb=9ad1dde84b96dbecbf3b26c311d52ce6aae43ddc;p=vlc

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 7fbaf4f477..3a05513f1b 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#define __STDC_FORMAT_MACROS 1
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -93,7 +95,7 @@ QString OptionFromWidgetName( QObject *obj )
 }
 
 ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
-                           p_intf( _p_intf )
+            QObject( _parent ), p_intf( _p_intf )
 {
     ui.setupUi( _parent );
     p_vout = NULL;
@@ -203,7 +205,24 @@ 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" ) )
+    {
+        SETUP_VFILTER( atmo )
+        SETUP_VFILTER_OPTION( atmoEdgeweightningSlider, valueChanged( int ) )
+        SETUP_VFILTER_OPTION( atmoBrightnessSlider, valueChanged( int ) )
+        SETUP_VFILTER_OPTION( atmoDarknesslimitSlider, valueChanged( int ) )
+        SETUP_VFILTER_OPTION( atmoMeanlengthSlider, valueChanged( int ) )
+        SETUP_VFILTER_OPTION( atmoMeanthresholdSlider, valueChanged( int ) )
+        SETUP_VFILTER_OPTION( atmoPercentnewSlider, valueChanged( int ) )
+        SETUP_VFILTER_OPTION( atmoFiltermodeCombo, currentIndexChanged( int ) )
+        SETUP_VFILTER_OPTION( atmoShowdotsCheck, stateChanged( int ) )
+    }
+    else
+    {
+        _parent->removeTab( _parent->indexOf( ui.tab_atmo ) );
+    }
 
 #undef SETUP_VFILTER
 #undef SETUP_VFILTER_OPTION
@@ -212,6 +231,8 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
     CONNECT( ui.cropBotPx, valueChanged( int ), this, cropChange() );
     CONNECT( ui.cropLeftPx, valueChanged( int ), this, cropChange() );
     CONNECT( ui.cropRightPx, valueChanged( int ), this, cropChange() );
+    CONNECT( ui.leftRightCropSync, toggled ( bool ), this, cropChange() );
+    CONNECT( ui.topBotCropSync, toggled ( bool ), this, cropChange() );
     CONNECT( ui.topBotCropSync, toggled( bool ),
              ui.cropBotPx, setDisabled( bool ) );
     CONNECT( ui.leftRightCropSync, toggled( bool ),
@@ -224,6 +245,11 @@ ExtVideo::~ExtVideo()
 
 void ExtVideo::cropChange()
 {
+    if( ui.topBotCropSync->isChecked() )
+        ui.cropBotPx->setValue( ui.cropTopPx->value() );
+    if( ui.leftRightCropSync->isChecked() )
+        ui.cropRightPx->setValue( ui.cropLeftPx->value() );
+
     p_vout = THEMIM->getVout();
     if( p_vout )
     {
@@ -248,20 +274,27 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add )
     char *psz_parser, *psz_string;
     const char *psz_filter_type;
 
-    module_t *p_obj = module_find( psz_name );
+    /* FIXME temporary hack */
+    const char *psz_module_name = psz_name;
+    if( !strcmp( psz_name, "wall" ) ||
+        !strcmp( psz_name, "panoramix" ) ||
+        !strcmp( psz_name, "clone" ) )
+        psz_module_name = "video_filter_wrapper";
+
+    module_t *p_obj = module_find( psz_module_name );
     if( !p_obj )
     {
         msg_Err( p_intf, "Unable to find filter module \"%s\".", psz_name );
         return;
     }
 
-    if( module_provides( p_obj, "video filter2" ) )
+    if( module_provides( p_obj, "video filter" ) )
     {
-        psz_filter_type = "video-filter";
+        psz_filter_type = "vout-filter";
     }
-    else if( module_provides( p_obj, "video filter" ) )
+    else if( module_provides( p_obj, "video filter2" ) )
     {
-        psz_filter_type = "vout-filter";
+        psz_filter_type = "video-filter";
     }
     else if( module_provides( p_obj, "sub filter" ) )
     {
@@ -339,10 +372,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( p_vout->p_spu, 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 );
     }
 
@@ -375,10 +405,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] );
         }
     }
@@ -410,7 +440,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
                  "Module instance %s not found, looking in config values.",
                  qtu( module ) );
 #endif
-        i_type = config_GetType( p_intf, qtu( option ) ) & 0xf0;
+        i_type = config_GetType( p_intf, qtu( option ) ) & VLC_VAR_CLASS;
         switch( i_type )
         {
             case VLC_VAR_INTEGER:
@@ -427,7 +457,7 @@ void ExtVideo::setWidgetValue( QObject *widget )
     }
     else
     {
-        i_type = var_Type( p_obj, qtu( option ) ) & 0xf0;
+        i_type = var_Type( p_obj, qtu( option ) ) & VLC_VAR_CLASS;
         var_Get( p_obj, qtu( option ), &val );
         vlc_object_release( p_obj );
     }
@@ -452,11 +482,11 @@ void ExtVideo::setWidgetValue( QObject *widget )
         else if( lineedit )
         {
             char str[30];
-            snprintf( str, sizeof(str), "%06X", val.i_int );
+            snprintf( str, sizeof(str), "%06"PRIX64, val.i_int );
             lineedit->setText( str );
         }
         else if( combobox ) combobox->setCurrentIndex(
-                            combobox->findData( val.i_int ) );
+                            combobox->findData( qlonglong(val.i_int) ) );
         else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
     }
     else if( i_type == VLC_VAR_FLOAT )
@@ -524,7 +554,7 @@ void ExtVideo::updateFilterOptions()
     QLineEdit      *lineedit      = qobject_cast<QLineEdit*>     ( sender() );
     QComboBox      *combobox      = qobject_cast<QComboBox*>     ( sender() );
 
-    i_type &= 0xf0;
+    i_type &= VLC_VAR_CLASS;
     if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL )
     {
         int i_int = 0;
@@ -657,7 +687,7 @@ void ExtV4l2::Refresh( void )
             const char *psz_var = text.p_list->p_values[i].psz_string;
             var_Change( p_obj, psz_var, VLC_VAR_GETTEXT, &name, NULL );
             const char *psz_label = name.psz_string;
-            msg_Dbg( p_intf, "v4l2 control \"%x\": %s (%s)",
+            msg_Dbg( p_intf, "v4l2 control \"%"PRIx64"\": %s (%s)",
                      val.p_list->p_values[i].i_int, psz_var, name.psz_string );
 
             int i_type = var_Type( p_obj, psz_var );
@@ -681,12 +711,11 @@ void ExtV4l2::Refresh( void )
                         {
                             combobox->addItem(
                                        text2.p_list->p_values[j].psz_string,
-                                       val2.p_list->p_values[j].i_int );
+                                       qlonglong( val2.p_list->p_values[j].i_int) );
                             if( i_val == val2.p_list->p_values[j].i_int )
                                 combobox->setCurrentIndex( j );
                         }
-                        var_Change( p_obj, psz_var, VLC_VAR_FREELIST,
-                                    &val2, &text2 );
+                        var_FreeList( &val2, &text2 );
 
                         CONNECT( combobox, currentIndexChanged( int ), this,
                                  ValueChange( int ) );
@@ -751,7 +780,7 @@ void ExtV4l2::Refresh( void )
             }
             free( name.psz_string );
         }
-        var_Change( p_obj, "controls", VLC_VAR_FREELIST, &val, &text );
+        var_FreeList( &val, &text );
         vlc_object_release( p_obj );
     }
     else
@@ -788,7 +817,7 @@ void ExtV4l2::ValueChange( int value )
                 var_SetBool( p_obj, psz_var, value );
                 break;
             case VLC_VAR_VOID:
-                var_SetVoid( p_obj, psz_var );
+                var_TriggerCallback( p_obj, psz_var );
                 break;
         }
         free( psz_var );
@@ -822,8 +851,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 */
@@ -870,7 +897,7 @@ void Equalizer::clean()
 /* Write down initial values */
 void Equalizer::updateUIFromCore()
 {
-    char *psz_af;
+    char *psz_af, *psz_pres, *psz_bands;
     float f_preamp;
     int i_preset;
 
@@ -878,21 +905,23 @@ void Equalizer::updateUIFromCore()
     if( p_aout )
     {
         psz_af = var_GetNonEmptyString( p_aout, "audio-filter" );
+        psz_pres = var_GetString( p_aout, "equalizer-preset" );
         if( var_GetBool( p_aout, "equalizer-2pass" ) )
             ui.eq2PassCheck->setChecked( true );
         f_preamp = var_GetFloat( p_aout, "equalizer-preamp" );
-        i_preset = presetsComboBox->findData( QVariant(
-                    var_GetString( p_aout, "equalizer-preset" ) ) );
+        psz_bands = var_GetNonEmptyString( p_aout, "equalizer-bands" );
+        i_preset = presetsComboBox->findData( QVariant( psz_pres ) );
         vlc_object_release( p_aout );
     }
     else
     {
         psz_af = config_GetPsz( p_intf, "audio-filter" );
+        psz_pres = config_GetPsz( p_intf, "equalizer-preset" );
         if( config_GetInt( p_intf, "equalizer-2pass" ) )
             ui.eq2PassCheck->setChecked( true );
         f_preamp = config_GetFloat( p_intf, "equalizer-preamp" );
-        i_preset = presetsComboBox->findData( QVariant(
-                    config_GetPsz( p_intf, "equalizer-preset" ) ) );
+        psz_bands = config_GetPsz( p_intf, "equalizer-bands" );
+        i_preset = presetsComboBox->findData( QVariant( psz_pres ) );
     }
     if( psz_af && strstr( psz_af, "equalizer" ) != NULL )
         ui.enableCheck->setChecked( true );
@@ -900,19 +929,34 @@ void Equalizer::updateUIFromCore()
 
     presetsComboBox->setCurrentIndex( i_preset );
 
+    ui.preampSlider->setValue( (int)( ( f_preamp + 20 ) * 10 ) );
+
+    if( psz_bands && strlen( psz_bands ) > 1 )
+    {
+    	char *psz_bands_orig = psz_bands;
+        for( int i = 0; i < BANDS; i++ )
+        {
+            const float f = us_strtod(psz_bands, &psz_bands );
+            bands[i]->setValue( (int)( ( f + 20 ) * 10 )  );
+            if( psz_bands == NULL || *psz_bands == '\0' ) break;
+            psz_bands++;
+            if( *psz_bands == '\0' ) break;
+        }
+        free( psz_bands_orig );
+    }
+    else free( psz_bands );
+
     free( psz_af );
+    free( psz_pres );
 }
 
 /* Functin called when enableButton is toggled */
 void Equalizer::enable()
 {
     bool en = ui.enableCheck->isChecked();
-    aout_EnableFilter( VLC_OBJECT( p_intf ), "equalizer",
-                       en ? true : false );
-//    aout_EnableFilter( VLC_OBJECT( p_intf ), "upmixer",
-//                       en ? true : false );
-//     aout_EnableFilter( VLC_OBJECT( p_intf ), "vsurround",
-//                       en ? true : false );
+    aout_EnableFilter( THEPL, "equalizer", en );
+//    aout_EnableFilter( THEPL, "upmixer", en );
+//     aout_EnableFilter( THEPL, "vsurround", en );
     enable( en );
 
     if( presetsComboBox->currentIndex() < 0 )
@@ -939,18 +983,12 @@ void Equalizer::set2Pass()
     aout_instance_t *p_aout= THEMIM->getAout();
     bool b_2p = ui.eq2PassCheck->isChecked();
 
-    if( p_aout == NULL )
-        config_PutInt( p_intf, "equalizer-2pass", b_2p );
-    else
+    if( p_aout )
     {
         var_SetBool( p_aout, "equalizer-2pass", b_2p );
-        config_PutInt( p_intf, "equalizer-2pass", b_2p );
-        for( int i = 0; i < p_aout->i_nb_inputs; i++ )
-        {
-            p_aout->pp_inputs[i]->b_restart = true;
-        }
         vlc_object_release( p_aout );
     }
+    config_PutInt( p_intf, "equalizer-2pass", b_2p );
 }
 
 /* Function called when the preamp slider is moved */
@@ -996,40 +1034,8 @@ 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 )
 {
-    char *psz_values;
     QString values;
 
     /* Create the QString in Qt */
@@ -1037,33 +1043,51 @@ char * Equalizer::createValuesFromPreset( int i_preset )
         values += QString( " %1" ).arg( eqz_preset_10b[i_preset]->f_amp[i] );
 
     /* Convert it to char * */
-    if( !asprintf( &psz_values, "%s", values.toAscii().constData() ) )
-        return NULL;
-
-    return psz_values;
+    return strdup( values.toAscii().constData() );
 }
 
 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 )
     {
-        delCallbacks( p_aout );
         var_SetString( p_aout , "equalizer-preset" , preset_list[i_preset] );
 
         var_SetString( p_aout, "equalizer-bands", psz_values );
         var_SetFloat( p_aout, "equalizer-preamp",
                       eqz_preset_10b[i_preset]->f_preamp );
-        addCallbacks( p_aout );
         vlc_object_release( p_aout );
     }
     config_PutPsz( p_intf, "equalizer-bands", psz_values );
     config_PutPsz( p_intf, "equalizer-preset", preset_list[i_preset] );
     config_PutFloat( p_intf, "equalizer-preamp",
                     eqz_preset_10b[i_preset]->f_preamp );
+    free( psz_values );
 }
 
 static int PresetCallback( vlc_object_t *p_this, char const *psz_cmd,
@@ -1177,8 +1201,7 @@ Spatializer::~Spatializer()
 void Spatializer::enable()
 {
     bool en = enableCheck->isChecked();
-    aout_EnableFilter( VLC_OBJECT( p_intf ), "spatializer",
-            en ? true : false );
+    aout_EnableFilter( THEPL, "spatializer", en );
     enable( en );
 }
 
@@ -1275,8 +1298,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" ) );
@@ -1308,8 +1331,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" ) );
@@ -1331,7 +1354,7 @@ SyncControls::SyncControls( intf_thread_t *_p_intf, QWidget *_parent ) :
 
     QLabel *subSpeedLabel = new QLabel;
     subSpeedLabel->setText( qtr( "Speed of the subtitles:" ) );
-    subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 3 );
+    subsLayout->addWidget( subSpeedLabel, 1, 0, 1, 1 );
 
     subSpeedSpin = new QDoubleSpinBox;
     subSpeedSpin->setAlignment( Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter );