Commit 03421f3e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - More Module_Exist for SPrefs.

parent 4c9b6e28
...@@ -181,7 +181,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -181,7 +181,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
#endif #endif
CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL, CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL,
snapshotsDirectory, snapshotsDirectoryBrowse ); snapshotsDirectory, snapshotsDirectoryBrowse );
CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix ); CONFIG_GENERIC( "snapshot-prefix", String, NULL, snapshotsPrefix );
CONFIG_GENERIC( "snapshot-sequential", Bool, NULL, CONFIG_GENERIC( "snapshot-sequential", Bool, NULL,
snapshotsSequentialNumbering ); snapshotsSequentialNumbering );
...@@ -196,8 +196,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -196,8 +196,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio ); CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
/* and hide if necessary */ /* hide if necessary */
#ifdef WIN32 #ifdef WIN32
ui.OSSControl->hide(); ui.OSSControl->hide();
ui.alsaControl->hide(); ui.alsaControl->hide();
...@@ -228,14 +227,20 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -228,14 +227,20 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
/* Audio Output Specifics */ /* Audio Output Specifics */
CONFIG_GENERIC( "aout", Module, NULL, outputModule ); CONFIG_GENERIC( "aout", Module, NULL, outputModule );
CONNECT( ui.outputModule, currentIndexChanged( int ), this, CONNECT( ui.outputModule, currentIndexChanged( int ),
updateAudioOptions( int ) ); this, updateAudioOptions( int ) );
//TODO: use modules_Exists
#ifndef WIN32 #ifndef WIN32
CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel, alsaDevice ); if( module_Exists( p_intf, "alsa" ) )
CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice, {
CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel,
alsaDevice );
}
if( module_Exists( p_intf, "oss" ) )
{
CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice,
OSSBrowse ); OSSBrowse );
}
#else #else
CONFIG_GENERIC( "directx-audio-device", IntegerList, CONFIG_GENERIC( "directx-audio-device", IntegerList,
ui.DirectXLabel, DirectXDevice ); ui.DirectXLabel, DirectXDevice );
...@@ -253,7 +258,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -253,7 +258,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
updateAudioOptions( ui.outputModule->currentIndex() ); updateAudioOptions( ui.outputModule->currentIndex() );
/* LastFM */ /* LastFM */
if( module_Exists( p_intf, "Audioscrobbler" ) ) if( module_Exists( p_intf, "audioscrobbler" ) )
{ {
CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label, CONFIG_GENERIC( "lastfm-username", String, ui.lastfm_user_label,
lastfm_user_edit ); lastfm_user_edit );
...@@ -267,6 +272,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -267,6 +272,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONNECT( ui.lastfm, stateChanged( int ), this , CONNECT( ui.lastfm, stateChanged( int ), this ,
lastfm_Changed( int ) ); lastfm_Changed( int ) );
} }
else
ui.lastfm->hide();
/* Normalizer */ /* Normalizer */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment