Changeset cacd39b8661a299781bbeb4c888a36d4a47215ca

Timestamp:

10/31/07 21:26:52 (10 months ago)

Author:

Jean-Baptiste Kempf <jb@videolan.org>

git-committer:

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

git-parent:

[ad9ca44d5979a242ef0781dbe793c3c7ae8d8caa]

git-author:

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

Message:

Preferences, audio, save the normalizer activation and clean.

Files:

• modules/gui/qt4/components/preferences_widgets.cpp (modified) (2 diffs)
• modules/gui/qt4/components/preferences_widgets.hpp (modified) (1 diff)
• modules/gui/qt4/components/simple_preferences.cpp (modified) (5 diffs)
• modules/gui/qt4/components/simple_preferences.hpp (modified) (3 diffs)
• modules/gui/qt4/ui/sprefs_audio.ui (modified) (3 diffs)

modules/gui/qt4/components/preferences_widgets.cpp

@@ -29 +29 @@
- *  - Improvements over WX
- *      - Validator for modulelist
- *  - Implement update stuff using a general Updated signal
- */
-
@@ -686 +685 @@
-        }
-    }
-    emit Updated();
-}
-

modules/gui/qt4/components/preferences_widgets.hpp

@@ -86 +86 @@
-    QWidget *widget;
-    bool _advanced;
+#if 0
+/* You shouldn't use that now..*/
-signals:
-    void Updated();
+#endif
-};
-

modules/gui/qt4/components/simple_preferences.cpp

@@ -216 +216 @@
-
-            CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
-
+
-            CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL,
-alizer
+Spin
-            CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
-
@@ -271 +271 @@
-            CONNECT( ui.lastfm, stateChanged( int ), this ,
-                    lastfm_Changed( int ) );
+
+            /* Normalizer */
+            normalizerBox = ui.volNormBox;
+            CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin, setEnabled( bool ) );
+            qs_filter = qfu( config_GetPsz( p_intf, "audio-filter" ) );
+            bool b_normalizer = ( qs_filter.contains( "volnorm" ) );
+            {
+                ui.volNormBox->setChecked( b_normalizer );
+                ui.volNormSpin->setEnabled( b_normalizer );
+            }
-
-        END_SPREFS_CAT;
@@ -298 +308 @@
-          CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort );
-          CONFIG_GENERIC( "http-proxy", String , NULL, proxy );
-
+
-          /* Caching */
-/*          CONFIG_GENERIC( );*/ //FIXME
@@ -328 +338 @@
-
-           /* interface */
-p_config = config_FindConfig( VLC_OBJECT(p_intf)
-_config->value.psz && strcmp( p_config->value.psz, "qt4" )
+char *psz_intf = config_GetPsz( p_intf
+sz_intf 
-            {
-ui.qt4->setChecked( true
-}
-if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" ))
-{
-ui.skins
+msg_Dbg( p_intf, "Interface in config file: %s", psz_intf
+    if( strstr( psz_intf, "skin" ) )
+        ui.skins->setChecked( true );
+    else if( strstr( psz_intf, "qt" ) )
+    ui.qt4
-            }
-            skinInterfaceButton = ui.skins;
@@ -436 +446 @@
-            config_PutPsz( p_intf, "intf", "qt4" );
-    }
+    
+    if( number == SPrefsAudio )
+    {
+        bool b_normChecked = normalizerBox->isChecked();
+        if( qs_filter.isEmpty() )
+        {
+            /* the psz_filter is already empty, so we just append it needed */
+            if( b_normChecked ) qs_filter = "volnorm";
+        }
+        else /* Not Empty */
+        {
+            if( qs_filter.contains( "volnorm" ) )
+            {
+                /* The qs_filter not empty and contains "volnorm" that we have to remove */
+                if( !b_normChecked )
+                {
+                    /* Ugly :D */
+                    qs_filter.remove( "volnorm:" );
+                    qs_filter.remove( ":volnorm" );
+                    qs_filter.remove( "volnorm" );
+                }
+            }
+            else /* qs_filter not empty, but doesn't have volnorm inside already */
+                if( b_normChecked ) qs_filter.append( ":volnorm" );
+        }
+        config_PutPsz( p_intf, "audio-filter", qtu( qs_filter ) );
+    }
-}
-

modules/gui/qt4/components/simple_preferences.hpp

@@ -44 +44 @@
-class QLineEdit;
-class QRadioButton;
+class QCheckBox;
+class QString;
-
-class SPrefsCatList : public QWidget
@@ -73 +75 @@
-    int number;
-
+    /* this is ugly and bad until I found a new solution */
-    QWidget *alsa_options;
-    QWidget *oss_options;
@@ -81 +84 @@
-    QRadioButton *skinInterfaceButton;
-    QRadioButton *qtInterfaceButton;
+    QString qs_filter;
+    QCheckBox *normalizerBox;
-
-/* Display only the options for the selected audio output */

modules/gui/qt4/ui/sprefs_audio.ui

@@ -256 +256 @@
-      </item>
-      <item row="1" column="0" >
-umeNormalizer
+NormBox
-        <property name="text" >
-         <string>_("Volume normalizer")</string>
@@ -270 +270 @@
-      </item>
-      <item row="1" column="1" >
-alizer
+Spin
-        <property name="alignment" >
-         <set>Qt::AlignRight</set>
@@ -334 +334 @@
-  <tabstop>fileBrowseButton</tabstop>
-  <tabstop>headphoneEffect</tabstop>
-umeNormalizer
-alizer
+NormBox
+Spin
-  <tabstop>visualisation</tabstop>
- </tabstops>