Changeset e2e6f592915ef9d8c25bfba133ae0f9455a93f94

Timestamp:

06/10/07 15:41:27 (1 year ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

Jean-Baptiste Kempf <jb@videolan.org> 1191678087 +0000

git-parent:

[d0f00ee670c147f64e39d552767aa4924a77126a]

git-author:

Jean-Baptiste Kempf <jb@videolan.org> 1191678087 +0000

Message:

Qt4 - enable and modify the spatializer widget. Don't use a ui for a QCheckbox and a QFrame.

Files:

• modules/gui/qt4/components/extended_panels.cpp (modified) (47 diffs)
• modules/gui/qt4/components/extended_panels.hpp (modified) (3 diffs)
• modules/gui/qt4/dialogs/extended.cpp (modified) (2 diffs)
• modules/gui/qt4/ui/spatializer.ui (deleted)

modules/gui/qt4/components/extended_panels.cpp

@@ -2 +2 @@
- * extended_panels.cpp : Extended controls panels
- ****************************************************************************
-C
+ C 
- * $Id$
- *
@@ -11 +11 @@
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
-at your option
+ at your option 
- *
- * This program is distributed in the hope that it will be useful,
@@ -48 +48 @@
-{
-public:
-_e
+ _e 
-        e = _e; p_intf = _p_intf;
-    }
@@ -69 +69 @@
-QString ModuleFromWidgetName( QObject *obj )
-{
-"Enable",""
+ "Enable","" 
-}
-
@@ -96 +96 @@
-#define SETUP_VFILTER( widget ) \
-    { \
-vlc_object_t *
+ vlc_object_t * 
-            vlc_object_find_name( p_intf->p_libvlc, \
-                                  #widget, \
-                                  FIND_CHILD ); \
-ui.widget##Enable
-ui.widget##Enable
+ ui.widget##Enable 
+ ui.widget##Enable 
-        if( p_obj ) \
-        { \
@@ -121 +121 @@
-
-    SETUP_VFILTER( adjust )
-int
-int
-int
-int
-int
-int
+ int 
+ int 
+ int 
+ int 
+ int 
+ int 
-
-    SETUP_VFILTER( extract )
-QString
+ QString 
-
-    SETUP_VFILTER( colorthres )
-QString
-int
-int
+ QString 
+ int 
+ int 
-
-    SETUP_VFILTER( invert )
-
-    SETUP_VFILTER( gradient )
-QString
-int
-int
+ QString 
+ int 
+ int 
-
-    SETUP_VFILTER( motionblur )
-int
+ int 
-
-    SETUP_VFILTER( motiondetect )
@@ -153 +153 @@
-
-    SETUP_VFILTER( sharpen )
-int
+ int 
-
-    SETUP_VFILTER( ripple )
@@ -160 +160 @@
-
-    SETUP_VFILTER( transform )
-QString
+ QString 
-
-    SETUP_VFILTER( rotate )
-int
+ int 
-    ui.rotateAngleDial->setWrapping( true );
-    ui.rotateAngleDial->setNotchesVisible( true );
-
-    SETUP_VFILTER( puzzle )
-int
-int
-int
+ int 
+ int 
+ int 
-
-    SETUP_VFILTER( magnify )
-
-    SETUP_VFILTER( clone )
-int
+ int 
-
-    SETUP_VFILTER( wall )
-int
-int
+ int 
+ int 
-
-    SETUP_VFILTER( erase )
-    SETUP_VFILTER_OPTION( eraseMaskText, editingFinished() )
-int
-int
+ int 
+ int 
-
-    SETUP_VFILTER( marq )
-QString
-QString
+ QString 
+ QString 
-
-    SETUP_VFILTER( logo )
-    SETUP_VFILTER_OPTION( logoFileText, editingFinished() )
-int
-int
-int
+ int 
+ int 
+ int 
-
-#undef SETUP_VFILTER
@@ -241 +241 @@
-    psz_string = config_GetPsz( p_intf, psz_filter_type );
-
-""
+ "" 
-
-    psz_parser = strstr( psz_string, psz_name );
@@ -250 +250 @@
-        {
-            psz_parser = psz_string;
-*psz_string
+ *psz_string 
-                            psz_string, psz_name );
-            free( psz_parser );
@@ -263 +263 @@
-        if( psz_parser )
-        {
-psz_parser + strlen(psz_name)
+ psz_parser + strlen( psz_name ) 
-            {
-psz_name
-psz_parser + strlen(psz_name
+ psz_name 
+ psz_parser + strlen( psz_name 
-            }
-            else
@@ -296 +296 @@
-
-    /* Try to set on the fly */
-vout_thread_t *
+ vout_thread_t * 
-                                              FIND_ANYWHERE );
-    if( p_vout )
@@ -315 +315 @@
-    //std::cout << "Module name: " << module.toStdString() << std::endl;
-
-sender()
-sender()
-
-module
+ sender() 
+ sender() 
+
+ module 
-                          checkbox ? checkbox->isChecked()
-                                   : groupbox->isChecked() );
@@ -325 +325 @@
-void ExtVideo::initComboBoxItems( QObject *widget )
-{
-widget
+ widget 
-    if( !combobox ) return;
-    QString option = OptionFromWidgetName( widget );
-p_intf
+ p_intf 
-                                                 option.toStdString().c_str() );
-    if( p_item )
@@ -337 +337 @@
-            if( i_type == CONFIG_ITEM_INTEGER
-             || i_type == CONFIG_ITEM_BOOL )
-
+
+
-            else if( i_type == CONFIG_ITEM_STRING )
-
+
+
-        }
-    }
@@ -356 +358 @@
-    //std::cout << "Option name: " << option.toStdString() << std::endl;
-
-vlc_object_t *
+ vlc_object_t * 
-        vlc_object_find_name( p_intf->p_libvlc,
-                              module.toStdString().c_str(),
@@ -394 +396 @@
-    /* Try to cast to all the widgets we're likely to encounter. Only
-     * one of the casts is expected to work. */
-widget
-widget
-widget
-widget
-widget
-widget
-widget
+ widget 
+ widget 
+ widget 
+ widget 
+ widget 
+ widget 
+ widget 
-
-    if( i_type == VLC_VAR_INTEGER || i_type == VLC_VAR_BOOL )
@@ -409 +411 @@
-                                                              : Qt::Unchecked );
-        else if( spinbox )  spinbox->setValue( val.i_int );
-540-val.i_int
+ 540-val.i_int 
-        else if( lineedit )
-        {
@@ -416 +418 @@
-            lineedit->setText( str );
-        }
-
+ 
-                            combobox->findData( val.i_int ) );
-        else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
@@ -423 +425 @@
-    {
-        double f_float = 0;
-int)(val.f_float*(double)slider->tickInterval())
-val.f_float
+ int )( val.f_float*( double )slider->tickInterval() ) 
+ val.f_float 
-        else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
-    }
-    else if( i_type == VLC_VAR_STRING )
-    {
-val.psz_string
-
+ val.psz_string 
+ 
-                            combobox->findData( qfu( val.psz_string ) ) );
-        else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
@@ -437 +439 @@
-    else
-        msg_Err( p_intf,
-%d
+ %d 
-                 module.toStdString().c_str(),
-                 option.toStdString().c_str(),
@@ -450 +452 @@
-    //std::cout << "Option name: " << option.toStdString() << std::endl;
-
-vlc_object_t *
+ vlc_object_t * 
-        vlc_object_find_name( p_intf->p_libvlc,
-                              module.toStdString().c_str(),
@@ -472 +474 @@
-    /* Try to cast to all the widgets we're likely to encounter. Only
-     * one of the casts is expected to work. */
-sender()
-sender()
-sender()
-sender()
-sender()
-sender()
-sender()
+ sender() 
+ sender() 
+ sender() 
+ sender() 
+ sender() 
+ sender() 
+ sender() 
-
-    i_type &= 0xf0;
@@ -487 +489 @@
-        else if( checkbox ) i_int = checkbox->checkState() == Qt::Checked;
-        else if( spinbox )  i_int = spinbox->value();
-540-dial->value()
-NULL,16
-combobox->currentIndex()
+ 540-dial->value() 
+ NULL,16 
+ combobox->currentIndex() 
-        else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
-        config_PutInt( p_intf, option.toStdString().c_str(), i_int );
@@ -503 +505 @@
-    {
-        double f_float = 0;
-double
-double
+ double 
+ double 
-        else if( doublespinbox ) f_float = doublespinbox->value();
-        else if( lineedit ) f_float = lineedit->text().toDouble();
@@ -515 +517 @@
-    {
-        char *psz_string = NULL;
-qtu(lineedit->text())
-qtu(combobox->itemData(
-).toString())
+ qtu( lineedit->text() ) 
+ qtu( combobox->itemData( 
+ ).toString() ) 
-        else msg_Warn( p_intf, "Oops %s %s %d", __FILE__, __func__, __LINE__ );
-        config_PutPsz( p_intf, option.toStdString().c_str(), psz_string );
@@ -526 +528 @@
-    else
-        msg_Err( p_intf,
-%d
+ %d 
-                 module.toStdString().c_str(),
-                 option.toStdString().c_str(),
@@ -537 +539 @@
-void ExtVideo::gotoConf( QObject* src )
-{
-module
-module
+ module 
+ module 
-    { \
-        PrefsDialog::getInstance( p_intf )->showModulePrefs( module ); \
@@ -568 +570 @@
-                            QWidget( _parent ) , p_intf( _p_intf )
-{
-0
+ 0 
-    smallFont.setPointSize( smallFont.pointSize() - 3 );
-
@@ -586 +588 @@
-    BUTTONACT( ui.eq2PassCheck, set2Pass() );
-
-int
+ int 
-
-    QGridLayout *grid = new QGridLayout( ui.frame );
@@ -595 +597 @@
-        bands[i]->setMaximum( 400 );
-        bands[i]->setValue( 200 );
-int
+ int 
-        band_texts[i] = new QLabel( band_frequencies[i] + "\n0.0dB" );
-        band_texts[i]->setFont( smallFont );
@@ -603 +605 @@
-
-    /* Write down initial values */
-aout_instance_t *)vlc_object_find(
-
+ aout_instance_t * )vlc_object_find( 
+ 
-    char *psz_af;
-    char *psz_bands;
@@ -662 +664 @@
-void Equalizer::set2Pass()
-{
-aout_instance_t *)vlc_object_find(
-
+ aout_instance_t * )vlc_object_find( 
+ 
-    vlc_bool_t b_2p = ui.eq2PassCheck->isChecked();
-
@@ -682 +684 @@
-void Equalizer::setPreamp()
-{
-float
+ float 
-    char psz_val[5];
-aout_instance_t *)vlc_object_find(
-
+ aout_instance_t * )vlc_object_find( 
+ 
-
-    sprintf( psz_val, "%.1f", f );
-"Preamp\n") + psz_val + qtr("dB"
+ "Preamp\n" ) + psz_val + qtr( "dB" 
-    if( p_aout )
-    {
@@ -708 +710 @@
-    {
-        char psz_val[5];
-float
+ float 
-        sprintf( psz_values, "%s %f", psz_values, f_val );
-        sprintf( psz_val, "% 5.1f", f_val );
-        band_texts[i]->setText( band_frequencies[i] + "\n" + psz_val + "dB" );
-    }
-aout_instance_t *)vlc_object_find(
-
+ aout_instance_t * )vlc_object_find( 
+ 
-    if( p_aout )
-    {
@@ -732 +734 @@
-            char psz_val[5];
-            float f = strtof( p, &p );
-int
+ int 
-            bands[i]->setValue(  i_val );
-            sprintf( psz_val, "% 5.1f", f );
@@ -743 +745 @@
-    }
-    char psz_val[5];
-int
+ int 
-    sprintf( psz_val, "%.1f", f_preamp );
-    ui.preampSlider->setValue( i_val );
-"Preamp\n") + psz_val + qtr("dB"
+ "Preamp\n" ) + psz_val + qtr( "dB" 
-}
-
-void Equalizer::setPreset( int preset )
-{
-aout_instance_t *)vlc_object_find(
-
+ aout_instance_t * )vlc_object_find( 
+ 
-
-    char psz_values[102]; memset( psz_values, 0, 102 );
@@ -779 +781 @@
-{
-    char *psz_preset = newval.psz_string;
-Equalizer *
-
+ Equalizer * 
+ 
-    return VLC_SUCCESS;
-}
@@ -797 +799 @@
-    var_AddCallback( p_aout, "equalizer-preset", PresetCallback, this );
-}
+
+/**********************************************************************
+ * Audio filters
+ **********************************************************************/
-
-/**********************************************************************
@@ -805 +811 @@
-    "Roomsize", "Width" , "Wet", "Dry", "Damp"
-};
-static const QString control_names[] =
-{
-    "Roomsize", "Width" , "Wet", "Dry", "Damp"
-};
-
-Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent ) :
-    QWidget( _parent ) , p_intf( _p_intf )
-{
-0
+ 0 
-    smallFont.setPointSize( smallFont.pointSize() - 3 );
-
-
-
-
-
+
+
+
+
+
-
-    for( int i = 0 ; i < NUM_SP_CTRL ; i++ )
-    {
-        spatCtrl[i] = new QSlider( Qt::Vertical );
-
+ 
-        {
-            spatCtrl[i]->setMaximum( 10 );
@@ -836 +839 @@
-        }
-        oldControlVars[i] = spatCtrl[i]->value();
-int
-control_names[i]
+ int 
+qfu( psz_control_names[i] )
-        ctrl_texts[i]->setFont( smallFont );
-        ctrl_readout[i] = new QLabel( "" );
-        ctrl_readout[i]->setFont( smallFont );
-grid->addWidget( spatCtrl[i], 0
-grid->addWidget( ctrl_readout[i],1,i
-grid->addWidget( ctrl_texts[i], 2
-
-
-ui.
+layout->addWidget( spatCtrl[i], 1
+layout->addWidget( ctrl_readout[i], 2, i 
+layout->addWidget( ctrl_texts[i], 3
+
+
+
-
-    /* Write down initial values */
-aout_instance_t *
-p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE
+ aout_instance_t * 
+ p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE 
-    char *psz_af;
-
@@ -856 +859 @@
-    {
-        psz_af = var_GetNonEmptyString( p_aout, "audio-filter" );
-
-
- 
+ 
+
+
-        }
-        vlc_object_release( p_aout );
@@ -865 +868 @@
-    {
-        psz_af = config_GetPsz( p_aout, "audio-filter" );
-
-
- 
+ 
+
+
-        }
-    }
-    if( psz_af && strstr( psz_af, "spatializer" ) != NULL )
-ui.
+
-    free( psz_af );
-ui.
+
-    setValues( controlVars );
-
-}
-
@@ -884 +886 @@
-void Spatializer::enable()
-{
-ui.
+
-    aout_EnableFilter( VLC_OBJECT( p_intf ), "spatializer",
-            en ? VLC_TRUE : VLC_FALSE );
@@ -901 +903 @@
-void Spatializer::setInitValues()
-{
-controlVars
-
-
-float *controlVars
+ controlVars 
+
+
+ float *controlVars 
-{
-    char psz_val[5];
-    char var_name[5];
-aout_instance_t *
-p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE
+ aout_instance_t * 
+ p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE 
-
-    for( int i = 0 ; i < NUM_SP_CTRL ; i++ )
-    {
-float
+ float 
-        sprintf( psz_val, "%.1f", f );
-        ctrl_readout[i]->setText( psz_val );
@@ -924 +926 @@
-            {
-                var_SetFloat( p_aout, psz_control_names[i],
-float
+ float 
-                config_PutFloat( p_intf, psz_control_names[i],
-float) spatCtrl[i]->value()
-float
+ float ) spatCtrl[i]->value() 
+ float 
-            }
-        }
-        vlc_object_release( p_aout );
-    }
-    //    printf("set callback values %s %s %d\n", __FILE__,__func__,__LINE__);
-
-}
@@ -952 +953 @@
-
-/**********************************************************************
- * Audio filters
- **********************************************************************/
-
-/**********************************************************************
- * Extended playbak controls
- **********************************************************************/

modules/gui/qt4/components/extended_panels.hpp

@@ -30 +30 @@
-#include "ui/equalizer.h"
-#include "ui/video_effects.h"
-#include "ui/spatializer.h"
-
-#define BANDS 10
@@ -91 +90 @@
-
-private:
-    Ui::SpatializerWidget ui;
-    QSlider *spatCtrl[NUM_SP_CTRL];
-    QLabel *ctrl_texts[NUM_SP_CTRL];
@@ -97 +95 @@
-    float controlVars[5];
-    float oldControlVars[5];
+
+    QCheckBox *enableCheck;
-
-    void delCallbacks( aout_instance_t * );

modules/gui/qt4/dialogs/extended.cpp

@@ -22 +22 @@
- *****************************************************************************/
-
-#include "qt4.hpp"
-#include "dialogs/extended.hpp"
-#include "dialogs_provider.hpp"
-#include "util/qvlcframe.hpp"
-#include "components/extended_panels.hpp"
-
@@ -42 +40 @@
-
-    QTabWidget *tab = new QTabWidget( this );
-foo
-foo
+equal
+equal
-
-
-
+
+
+
+
+
-
-    layout->addWidget( tab, 0, 0, 1, 5 );