X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Fsimple_preferences.cpp;h=8c6eaba67726e59fa845953fd31ada71f1e22fa6;hb=e033388de62713a6ca424be46550f20f3561715b;hp=103072d7c63f34e6f4dbe7e07770cfd7f7e037ec;hpb=23bc3916fea067e6a50ba5431d337957eaf06aab;p=vlc diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index 103072d7c6..8c6eaba677 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -26,13 +26,6 @@ #include "components/simple_preferences.hpp" #include "components/preferences_widgets.hpp" -#include "ui/sprefs_input.h" -#include "ui/sprefs_audio.h" -#include "ui/sprefs_video.h" -#include "ui/sprefs_subtitles.h" -#include "ui/sprefs_hotkeys.h" -#include "ui/sprefs_interface.h" - #include #include @@ -100,10 +93,11 @@ void SPrefsCatList::switchPanel( int i ) * The Panels *********************************************************************/ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, - int number ) : QWidget( _parent ), p_intf( _p_intf ) + int _number ) : QWidget( _parent ), p_intf( _p_intf ) { module_config_t *p_config; ConfigControl *control; + number = _number; #define CONFIG_GENERIC( option, type, label, qcontrol ) \ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \ @@ -136,7 +130,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, #define START_SPREFS_CAT( name , label ) \ case SPrefs ## name: \ { \ - Ui::SPrefs ## name ui; \ + Ui::SPrefs ## name ui; \ ui.setupUi( panel ); \ panel_label->setText( label ); @@ -165,7 +159,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, switch( number ) { - /* Video Panel Implementation */ + /****************************** + * VIDEO Panel Implementation * + ******************************/ START_SPREFS_CAT( Video , qtr("General video settings") ); CONFIG_GENERIC( "video", Bool, NULL, enableVideo ); @@ -174,19 +170,18 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop ); CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations ); CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames ); - CONFIG_GENERIC( "overlay", Bool, NULL, overlay ); CONFIG_GENERIC( "vout", Module, NULL, outputModule ); #ifdef WIN32 CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode ); CONFIG_GENERIC( "directx-device", StringList, NULL, - dXdisplayDevice ); + dXdisplayDevice ); #else ui.directXBox->setVisible( false ); #endif CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL, - snapshotsDirectory, snapshotsDirectoryBrowse ); + snapshotsDirectory, snapshotsDirectoryBrowse ); CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix ); CONFIG_GENERIC( "snapshot-sequential", Bool, NULL, snapshotsSequentialNumbering ); @@ -194,11 +189,26 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, snapshotsFormat ); END_SPREFS_CAT; - /* Audio Panel Implementation */ + /****************************** + * AUDIO Panel Implementation * + ******************************/ START_SPREFS_CAT( Audio, qtr("General audio settings") ); CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); + /* hide if necessary */ +#ifdef WIN32 + ui.OSSControl->hide(); + ui.alsaControl->hide(); +#else + ui.DirectXControl->hide(); +#endif + ui.lastfm_user_edit->hide(); + ui.lastfm_user_label->hide(); + ui.lastfm_pass_edit->hide(); + ui.lastfm_pass_label->hide(); + + /* General Audio Options */ CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL, defaultVolume ); CONFIG_GENERIC( "audio-language" , String , NULL, @@ -208,128 +218,217 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, detectionDolby ); + CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); + + CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, + volNormSpin ); + CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation); + + /* Audio Output Specifics */ CONFIG_GENERIC( "aout", Module, NULL, outputModule ); - CONNECT( ui.outputModule, currentIndexChanged( int ), this, - updateAudioOptions( int ) ); - audioOutput = ui.outputModule; + CONNECT( ui.outputModule, currentIndexChanged( int ), + this, updateAudioOptions( int ) ); - //FIXME: use modules_Exists #ifndef WIN32 - CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, alsaDevice ); - CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice, + if( module_Exists( p_intf, "alsa" ) ) + { + CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, + alsaDevice ); + } + if( module_Exists( p_intf, "oss" ) ) + { + CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice, OSSBrowse ); + } #else - CONFIG_GENERIC( "directx-audio-device", IntegerList, ui.DirectXLabel, - DirectXDevice ); + CONFIG_GENERIC( "directx-audio-device", IntegerList, + ui.DirectXLabel, DirectXDevice ); #endif // File exists everywhere - CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.fileLabel, fileName, - fileBrowseButton ); - alsa_options = ui.alsaControl; - oss_options = ui.OSSControl; - directx_options = ui.DirectXControl; - file_options = ui.fileControl; - - /* and hide if necessary */ -#ifdef WIN32 - oss_options->hide(); - alsa_options->hide(); -#else - directx_options->hide(); -#endif - - updateAudioOptions( audioOutput->currentIndex() ); - - CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect ); -// CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME - CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, - volNormalizer ); - CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation); - + CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.fileLabel, + fileName, fileBrowseButton ); + + optionWidgets.append( ui.alsaControl ); + optionWidgets.append( ui.OSSControl ); + optionWidgets.append( ui.DirectXControl ); + optionWidgets.append( ui.fileControl ); + optionWidgets.append( ui.outputModule ); + optionWidgets.append( ui.volNormBox ); + updateAudioOptions( ui.outputModule->currentIndex() ); + + /* LastFM */ + if( module_Exists( p_intf, "audioscrobbler" ) ) + { + CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label, + lastfm_user_edit ); + CONFIG_GENERIC( "lastfm-password", String, ui.lastfm_pass_label, + lastfm_pass_edit ); + + if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) ) + ui.lastfm->setChecked( true ); + else + ui.lastfm->setChecked( false ); + CONNECT( ui.lastfm, stateChanged( int ), this , + lastfm_Changed( int ) ); + } + else + ui.lastfm->hide(); - CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label, - lastfm_user_edit ); - CONFIG_GENERIC( "lastfm-password", String, ui.lastfm_pass_label, - lastfm_pass_edit ); - ui.lastfm_user_edit->hide(); - ui.lastfm_user_label->hide(); - ui.lastfm_pass_edit->hide(); - ui.lastfm_pass_label->hide(); + /* Normalizer */ - if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) ) - ui.lastfm->setCheckState( Qt::Checked ); - else - ui.lastfm->setCheckState( Qt::Unchecked ); - CONNECT( ui.lastfm, stateChanged( int ), this , lastfm_Changed( int ) ); + 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; /* Input and Codecs Panel Implementation */ START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") ); - /* Disk Devices */ + + /* Disk Devices */ { - ui.DVDDevice->setToolTip( qtr( "If this propriety is blank, then you have\n" - "values for DVD, VCD, and CDDA.\n You can define" - " a unique one or set that in the advanced preferences" ) ); + ui.DVDDevice->setToolTip( + //TODO: make this sentence understandable + qtr( "If this property is blank, then you have\n" + "values for DVD, VCD, and CDDA.\n" + "You can define a unique one or set that in" + "the advanced preferences" ) ); char *psz_dvddiscpath = config_GetPsz( p_intf, "dvd" ); char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" ); char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" ); - if( ( *psz_cddadiscpath == *psz_dvddiscpath ) - && ( *psz_dvddiscpath == *psz_vcddiscpath ) ) + if( psz_dvddiscpath && psz_vcddiscpath && psz_cddadiscpath ) + if( !strcmp( psz_cddadiscpath, psz_dvddiscpath ) && + !strcmp( psz_dvddiscpath, psz_vcddiscpath ) ) { ui.DVDDevice->setText( qfu( psz_dvddiscpath ) ); } - delete psz_cddadiscpath; delete psz_dvddiscpath; delete psz_vcddiscpath; + delete psz_cddadiscpath; delete psz_dvddiscpath; + delete psz_vcddiscpath; } - CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort ); - CONFIG_GENERIC( "http-proxy", String , NULL, proxy ); - - /* Caching */ -/* CONFIG_GENERIC( );*/ //FIXME - - CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel ); - CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair ); - CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox ); + CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort ); + CONFIG_GENERIC( "http-proxy", String , NULL, proxy ); + CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel ); + CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair ); + CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox ); #ifdef WIN32 - CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox ); + CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox ); #else - ui.systemCodecBox->hide(); + ui.systemCodecBox->hide(); #endif - CONFIG_GENERIC( "timeshift-force", Bool, NULL, timeshiftBox ); - CONFIG_GENERIC( "dump-force", Bool, NULL, DumpBox ); -// CONFIG_GENERIC( "", Bool, NULL, RecordBox ); //FIXME activate record - END_SPREFS_CAT; + /* Access Filters */ + qs_filter = qfu( config_GetPsz( p_intf, "access-filter" ) ); + ui.timeshiftBox->setChecked( qs_filter.contains( "timeshift" ) ); + ui.dumpBox->setChecked( qs_filter.contains( "dump" ) ); + ui.recordBox->setChecked( qs_filter.contains( "record" ) ); + ui.bandwidthBox->setChecked( qs_filter.contains( "bandwidth" ) ); + + optionWidgets.append( ui.recordBox ); + optionWidgets.append( ui.dumpBox ); + optionWidgets.append( ui.bandwidthBox ); + optionWidgets.append( ui.timeshiftBox ); + optionWidgets.append( ui.DVDDevice ); + optionWidgets.append( ui.cachingCombo ); + + /* Caching */ + /* Add the things to the ComboBox */ + #define addToCachingBox( str, cachingNumber ) \ + ui.cachingCombo->addItem( str, QVariant( cachingNumber ) ); + addToCachingBox( "Custom", CachingCustom ); + addToCachingBox( "Lowest latency", CachingLowest ); + addToCachingBox( "Low latency", CachingLow ); + addToCachingBox( "Normal", CachingNormal ); + addToCachingBox( "High latency", CachingHigh ); + addToCachingBox( "Higher latency", CachingHigher ); + +#define TestCaC( name ) \ + b_cache_equal = b_cache_equal && \ + ( i_cache == config_GetInt( p_intf, name ) ) + +#define TestCaCi( name, int ) \ + b_cache_equal = b_cache_equal && \ + ( ( i_cache * int ) == config_GetInt( p_intf, name ) ) + /* Select the accurate value of the ComboBox */ + bool b_cache_equal = true; + int i_cache = config_GetInt( p_intf, "file-caching"); + + TestCaC( "udp-caching" ); + if (module_Exists (p_intf, "dvdread")) + TestCaC( "dvdread-caching" ); + if (module_Exists (p_intf, "dvdnav")) + TestCaC( "dvdnav-caching" ); + TestCaC( "tcp-caching" ); + TestCaC( "fake-caching" ); TestCaC( "cdda-caching" ); + TestCaC( "screen-caching" ); TestCaC( "vcd-caching" ); + #ifdef WIN32 + TestCaC( "dshow-caching" ); + #else + if (module_Exists (p_intf, "v4l")) + TestCaC( "v4l-caching" ); + if (module_Exists (p_intf, "access_jack")) + TestCaC( "jack-input-caching" ); + if (module_Exists (p_intf, "v4l2")) + TestCaC( "v4l2-caching" ); + if (module_Exists (p_intf, "pvr")) + TestCaC( "pvr-caching" ); + #endif + TestCaCi( "rtsp-caching", 4 ); TestCaCi( "ftp-caching", 2 ); + TestCaCi( "http-caching", 4 ); + if (module_Exists (p_intf, "access_realrtsp")) + TestCaCi( "realrtsp-caching", 10 ); + TestCaCi( "mms-caching", 19 ); + if( b_cache_equal ) ui.cachingCombo->setCurrentIndex( + ui.cachingCombo->findData( QVariant( i_cache ) ) ); - /* Interface Panel */ + END_SPREFS_CAT; + /******************* + * Interface Panel * + *******************/ START_SPREFS_CAT( Interface, qtr("Interface settings") ); ui.defaultLabel->setFont( italicFont ); ui.skinsLabel->setFont( italicFont ); #if defined( WIN32 ) || defined (__APPLE__) CONFIG_GENERIC( "language", StringList, NULL, language ); + BUTTONACT( ui.assoButton, assoDialog ); #else ui.language->hide(); ui.languageLabel->hide(); + ui.assoName->hide(); + ui.assoButton->hide(); #endif - /* interface */ - p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" ); - if( p_config->value.psz && strcmp( p_config->value.psz, "qt4" )) - { - ui.qt4->setChecked( true ); - } - if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" )) + /* interface */ + char *psz_intf = config_GetPsz( p_intf, "intf" ); + if( psz_intf ) { + 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->setChecked( true ); } - //FIXME interface choice + delete psz_intf; + optionWidgets.append( ui.skins ); + optionWidgets.append( ui.qt4 ); + + CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, artFetcher ); + CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher ); +#ifdef UPDATE_CHECK + CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, qtUpdates ); +#endif CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo ); + CONFIG_GENERIC( "embeded-video", Bool, NULL, embedVideo ); CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, skinBrowse ); -#if defined( WIN32 ) || defined(HAVE_DBUS_3) +#if defined( WIN32 ) || defined( HAVE_DBUS_3 ) CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode ); CONFIG_GENERIC( "playlist-enqueue", Bool, NULL, EnqueueOneInterfaceMode ); @@ -352,61 +451,168 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, END_SPREFS_CAT; - START_SPREFS_CAT( Hotkeys, "Configure Hotkeys" ); - //FIMXE - END_SPREFS_CAT; + case SPrefsHotkeys: + { + p_config = config_FindConfig( VLC_OBJECT(p_intf), "key-fullscreen" ); + + QGridLayout *gLayout = new QGridLayout; + panel->setLayout( gLayout ); + int line = 0; + + KeySelectorControl *ksCtrl = + new KeySelectorControl( VLC_OBJECT(p_intf), p_config , + this, gLayout, line ); + + panel_label->setText( qtr( "Configure Hotkeys" ) ); + + break; } + } - panel_layout->addWidget(panel_label); - panel_layout->addWidget(title_line); + panel_layout->addWidget( panel_label ); + panel_layout->addWidget( title_line ); panel_layout->addWidget( panel ); - panel_layout->addStretch( 2 ); + if( number != SPrefsHotkeys ) panel_layout->addStretch( 2 ); - this->setLayout(panel_layout); + setLayout( panel_layout ); } void SPrefsPanel::updateAudioOptions( int number) { - QString value = audioOutput->itemData( number ).toString(); - msg_Dbg( p_intf, "I was here, waiting for funman, %s", qtu( value ) ); - -#ifndef WIN32 - oss_options->hide(); - alsa_options->hide(); -#else - directx_options->hide(); -#endif - file_options->hide(); + QString value = qobject_cast(optionWidgets[audioOutCoB]) + ->itemData( number ).toString(); - if( value == "aout_file" ) - file_options->show(); #ifndef WIN32 - else if( value == "alsa" ) - alsa_options->show(); - else if( value == "oss" ) - oss_options->show(); + optionWidgets[ossW]->setVisible( ( value == "oss" ) ); + optionWidgets[alsaW]->setVisible( ( value == "alsa" ) ); #else - else if( value == "directx" ) - directx_options->show(); + optionWidgets[directxW]->setVisible( ( value == "directx" ) ); #endif + optionWidgets[fileW]->setVisible( ( value == "aout_file" ) ); } +/* Function called from the main Preferences dialog on each SPrefs Panel */ void SPrefsPanel::apply() { + msg_Dbg( p_intf, "Trying to save the %i simple panel", number ); + + /* Generic save for ever panel */ QList::Iterator i; for( i = controls.begin() ; i != controls.end() ; i++ ) { ConfigControl *c = qobject_cast(*i); c->doApply( p_intf ); } - /* Devices */ - //FIXME is it qta or qtu ???? - char *psz_devicepath = qtu( ui.DVDDevice->Text() ); - if( !EMPTY_STR( psz_devicepath ) ) + + switch( number ) + { + case SPrefsInputAndCodecs: + { + /* Device default selection */ + char *psz_devicepath = + qtu( qobject_cast(optionWidgets[inputLE] )->text() ); + if( !EMPTY_STR( psz_devicepath ) ) + { + config_PutPsz( p_intf, "dvd", psz_devicepath ); + config_PutPsz( p_intf, "vcd", psz_devicepath ); + config_PutPsz( p_intf, "cd-audio", psz_devicepath ); + } + + /* Access filters */ +#define saveBox( name, box ) {\ + if( box->isChecked() ) { \ + if( b_first ) { \ + qs_filter.append( name ); \ + b_first = false; \ + } \ + else qs_filter.append( ":" ).append( name ); \ + } } + + bool b_first = true; + qs_filter.clear(); + saveBox( "record", qobject_cast(optionWidgets[recordChB]) ); + saveBox( "dump", qobject_cast(optionWidgets[dumpChB]) ); + saveBox( "timeshift", qobject_cast(optionWidgets[timeshiftChB]) ); + saveBox( "bandwidth", qobject_cast(optionWidgets[bandwidthChB] ) ); + config_PutPsz( p_intf, "access-filter", qtu( qs_filter ) ); + +#define CaCi( name, int ) config_PutInt( p_intf, name, int * i_comboValue ) +#define CaC( name ) CaCi( name, 1 ) + /* Caching */ + QComboBox *cachingCombo = qobject_cast(optionWidgets[cachingCoB]); + int i_comboValue = cachingCombo->itemData( cachingCombo->currentIndex() ).toInt(); + if( i_comboValue ) + { + msg_Dbg( p_intf, "Adjusting all cache values at: %i", i_comboValue ); + CaC( "udp-caching" ); + if (module_Exists (p_intf, "dvdread")) + CaC( "dvdread-caching" ); + if (module_Exists (p_intf, "dvdnav")) + CaC( "dvdnav-caching" ); + CaC( "tcp-caching" ); CaC( "vcd-caching" ); + CaC( "fake-caching" ); CaC( "cdda-caching" ); CaC( "file-caching" ); + CaC( "screen-caching" ); + CaCi( "rtsp-caching", 4 ); CaCi( "ftp-caching", 2 ); + CaCi( "http-caching", 4 ); + if (module_Exists (p_intf, "access_realrtsp")) + CaCi( "realrtsp-caching", 10 ); + CaCi( "mms-caching", 19 ); + #ifdef WIN32 + CaC( "dshow-caching" ); + #else + if (module_Exists (p_intf, "v4l")) + CaC( "v4l-caching" ); + if (module_Exists (p_intf, "access_jack")) + CaC( "jack-input-caching" ); + if (module_Exists (p_intf, "v4l2")) + CaC( "v4l2-caching" ); + if (module_Exists (p_intf, "pvr")) + CaC( "pvr-caching" ); + #endif + //CaCi( "dv-caching" ) too short... + } + break; + } + + /* Interfaces */ + case SPrefsInterface: + { + if( qobject_cast(optionWidgets[skinRB])->isChecked() ) + config_PutPsz( p_intf, "intf", "skins2" ); + if( qobject_cast(optionWidgets[qtRB])->isChecked() ) + config_PutPsz( p_intf, "intf", "qt4" ); + break; + } + + case SPrefsAudio: { - config_PutPsz( p_intf, "dvd", psz_devicepath ); - config_PutPsz( p_intf, "vcd", psz_devicepath ); - config_PutPsz( p_intf, "cd-audio", psz_devicepath ); + bool b_normChecked = + qobject_cast(optionWidgets[normalizerChB])->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 */ + if( b_normChecked ) qs_filter.append( ":volnorm" ); + } + config_PutPsz( p_intf, "audio-filter", qtu( qs_filter ) ); + break; + } } } @@ -420,3 +626,8 @@ void SPrefsPanel::lastfm_Changed( int i_state ) else if( i_state == Qt::Unchecked ) config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ); } + +void SPrefsPanel::assoDialog() +{ + +}