#include "components/simple_preferences.hpp"
#include "components/preferences_widgets.hpp"
-#include "ui/sprefs_audio.h"
#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 <vlc_config_cat.h>
+#include <vlc_configuration.h>
#include <QString>
#include <QFont>
switch( number )
{
- /* Video Panel Implementation */
+ /******************************
+ * VIDEO Panel Implementation *
+ ******************************/
START_SPREFS_CAT( Video , qtr("General video settings") );
CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
snapshotsFormat );
END_SPREFS_CAT;
- /* Audio Panel Implementation */
+ /******************************
+ * AUDIO Panel Implementation *
+ ******************************/
START_SPREFS_CAT( Audio, qtr("General audio settings") );
- CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
+ CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
+
+ /* General Audio Options */
+ CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
+ defaultVolume );
+ CONFIG_GENERIC( "audio-language" , String , NULL,
+ preferredAudioLanguage );
+
+ CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox );
+ CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL,
+ detectionDolby );
+
+ 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_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
- defaultVolume );
- CONFIG_GENERIC( "audio-language" , String , NULL,
- preferredAudioLanguage );
+ /* Audio Output Specifics */
+ CONFIG_GENERIC( "aout", Module, NULL, outputModule );
- CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
- CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL,
- detectionDolby );
+ CONNECT( ui.outputModule, currentIndexChanged( int ), this,
+ updateAudioOptions( int ) );
+ audioOutput = ui.outputModule;
- CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
- CONNECT( control, Updated(), this, AudioDeviceChanged() );
- QString aout_value = (dynamic_cast<ModuleConfigControl*>(control))->getValue();
+ //FIXME: use modules_Exists
#ifndef WIN32
- CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, alsaDevice );
- alsa_options = control;
- CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice,
- OSSBrowse );
- oss_options = control;
+ CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, alsaDevice );
+ CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice,
+ OSSBrowse );
#else
- CONFIG_GENERIC( "directx-audio-device" , IntegerList, ui.DirectXLabel,
- DirectXDevice );
- directx_options = control;
+ CONFIG_GENERIC( "directx-audio-device", IntegerList,
+ ui.DirectXLabel, DirectXDevice );
#endif
- CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.FileLabel, FileName,
- fileBrowseButton );
- file_options = control;
-
+ // 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
- ui.OSSBrowse->hide();
- ui.OSSDevice->hide();
- ui.OSSLabel->hide();
- ui.alsaDevice->hide();
- ui.alsaLabel->hide();
+ oss_options->hide();
+ alsa_options->hide();
#else
- ui.DirectXLabel->setVisible( false );
- ui.DirectXDevice->setVisible( false );
+ directx_options->hide();
#endif
- updateAudioOptions( aout_value );
+ updateAudioOptions( audioOutput->currentIndex() );
+
+ /* LastFM */
+ 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();
+
+ 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 ) );
- 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);
END_SPREFS_CAT;
/* Input and Codecs Panel Implementation */
START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") );
+ inputDevice = ui.DVDDevice;
/* Disk Devices */
-/* CONFIG_GENERIC( );*/ //FIXME
+ {
+ 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" ) );
+ 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 ) )
+ {
+ ui.DVDDevice->setText( qfu( psz_dvddiscpath ) );
+ }
+ 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 );
}
if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" ))
{
- ui.skins->setChecked( true );
+ ui.skins->setChecked( true );
}
- //FIXME interface choice
+ skinInterfaceButton = ui.skins;
+ qtInterfaceButton = ui.qt4;
CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
this->setLayout(panel_layout);
}
-void SPrefsPanel::AudioDeviceChanged()
+void SPrefsPanel::updateAudioOptions( int number)
{
- ModuleConfigControl *module_config =
- dynamic_cast<ModuleConfigControl*>( sender() );
- updateAudioOptions( module_config->getValue() );
-}
+ QString value = audioOutput->itemData( number ).toString();
+ msg_Dbg( p_intf, "I was here, waiting for funman, %s", qtu( value ) );
-void SPrefsPanel::updateAudioOptions( QString value )
-{
#ifndef WIN32
- alsa_options->hide();
oss_options->hide();
+ alsa_options->hide();
#else
directx_options->hide();
#endif
file_options->hide();
- if( value == "aout_file" )
- file_options->show();
+ if( value == "aout_file" )
+ file_options->show();
#ifndef WIN32
else if( value == "alsa" )
alsa_options->show();
ConfigControl *c = qobject_cast<ConfigControl *>(*i);
c->doApply( p_intf );
}
+
+ /* Devices */
+ //FIXME is it qta or qtu ????
+ char *psz_devicepath = qtu( inputDevice->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 );
+ }
+
+ /* Interfaces */
+ if( skinInterfaceButton->isChecked() )
+ config_PutPsz( p_intf, "intf", "skins2" );
+ if( qtInterfaceButton->isChecked() )
+ config_PutPsz( p_intf, "intf", "qt4" );
}
void SPrefsPanel::clean()
{}
+void SPrefsPanel::lastfm_Changed( int i_state )
+{
+ if( i_state == Qt::Checked )
+ config_AddIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
+ else if( i_state == Qt::Unchecked )
+ config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
+}
projects / vlc / blobdiff