#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 <vlc_config_cat.h>
#include <vlc_configuration.h>
#define START_SPREFS_CAT( name , label ) \
case SPrefs ## name: \
{ \
- Ui::SPrefs ## name ui; \
+ Ui::SPrefs ## name ui; \
ui.setupUi( panel ); \
panel_label->setText( label );
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( "audio", Bool, NULL, enableAudio );
+ /* and 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 );
CONNECT( ui.outputModule, currentIndexChanged( int ), this,
updateAudioOptions( int ) );
- audioOutput = ui.outputModule;
//TODO: use modules_Exists
#ifndef WIN32
// 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() );
+ 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 */
- 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 ) );
+ 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 ) );
+ }
/* Normalizer */
- normalizerBox = ui.volNormBox;
- CONNECT( ui.volNormBox, toggled( bool ), ui.volNormSpin, setEnabled( bool ) );
+
+ 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" ) );
{
/* Input and Codecs Panel Implementation */
START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") );
- inputDevice = ui.DVDDevice;
- /* Disk Devices */
+
+ /* Disk Devices */
{
ui.DVDDevice->setToolTip(
- qtr( "If this propriety is blank, then you have\n"
+ //BUG: 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" ) );
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( "prefer-system-codecs", Bool, NULL, systemCodecBox );
#else
ui.systemCodecBox->hide();
-#endif
+#endif
/* 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" ) );
- timeshiftBox = ui.timeshiftBox;
- recordBox = ui.recordBox;
- dumpBox = ui.dumpBox;
- bandwidthBox = ui.bandwidthBox;
- END_SPREFS_CAT;
- /* Interface Panel */
+ 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" ) TestCaC( "dvdread-caching" )
+ TestCaC( "dvdnav-caching" ) TestCaC( "tcp-caching" )
+ TestCaC( "fake-caching" ) TestCaC( "cdda-caching" )
+ TestCaC( "screen-caching" ) TestCaC( "vcd-caching" )
+ #ifdef WIN32
+ TestCaC( "dshow-caching" )
+ #else
+ TestCaC( "v4l-caching" ) TestCaC( "jack-input-caching" )
+ TestCaC( "v4l2-caching" ) TestCaC( "pvr-caching" )
+ #endif
+ TestCaCi( "rtsp-caching", 4 ) TestCaCi( "ftp-caching", 2 )
+ TestCaCi( "http-caching", 4 ) TestCaCi( "realrtsp-caching", 10 )
+ TestCaCi( "mms-caching", 19 )
+ if( b_cache_equal ) ui.cachingCombo->setCurrentIndex(
+ ui.cachingCombo->findData( QVariant( i_cache ) ) );
+
+ END_SPREFS_CAT;
+ /*******************
+ * Interface Panel *
+ *******************/
START_SPREFS_CAT( Interface, qtr("Interface settings") );
ui.defaultLabel->setFont( italicFont );
ui.skinsLabel->setFont( italicFont );
ui.languageLabel->hide();
#endif
- /* interface */
+ /* interface */
char *psz_intf = config_GetPsz( p_intf, "intf" );
if( psz_intf )
{
else if( strstr( psz_intf, "qt" ) )
ui.qt4->setChecked( true );
}
- skinInterfaceButton = ui.skins;
- qtInterfaceButton = ui.qt4;
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 );
+ CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, qtUpdates );
CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
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 );
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();
+ QString value = qobject_cast<QComboBox *>(optionWidgets[audioOutCoB])
+ ->itemData( number ).toString();
#ifndef WIN32
- oss_options->hide();
- alsa_options->hide();
+ optionWidgets[ossW]->setVisible( ( value == "oss" ) );
+ optionWidgets[alsaW]->setVisible( ( value == "alsa" ) );
#else
- directx_options->hide();
-#endif
- file_options->hide();
-
- if( value == "aout_file" )
- file_options->show();
-#ifndef WIN32
- else if( value == "alsa" )
- alsa_options->show();
- else if( value == "oss" )
- oss_options->show();
-#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 );
c->doApply( p_intf );
}
- /* Devices */
- if( number == SPrefsInputAndCodecs )
+ switch( number )
+ {
+ case SPrefsInputAndCodecs:
{
- char *psz_devicepath = qtu( inputDevice->text() );
+ /* Device default selection */
+ char *psz_devicepath =
+ qtu( qobject_cast<QLineEdit *>(optionWidgets[inputLE] )->text() );
if( !EMPTY_STR( psz_devicepath ) )
{
config_PutPsz( p_intf, "dvd", psz_devicepath );
config_PutPsz( p_intf, "cd-audio", psz_devicepath );
}
- bool b_first = true;
+ /* Access filters */
#define saveBox( name, box ) {\
if( box->isChecked() ) { \
if( b_first ) { \
b_first = false; \
} \
else qs_filter.append( ":" ).append( name ); \
- } }
-
- saveBox( "record", recordBox );
- saveBox( "dump", dumpBox );
- saveBox( "timeshift", timeshiftBox );
- saveBox( "bandwidth", bandwidthBox );
+ } }
+
+ bool b_first = true;
+ qs_filter.clear();
+ saveBox( "record", qobject_cast<QCheckBox *>(optionWidgets[recordChB]) );
+ saveBox( "dump", qobject_cast<QCheckBox *>(optionWidgets[dumpChB]) );
+ saveBox( "timeshift", qobject_cast<QCheckBox *>(optionWidgets[timeshiftChB]) );
+ saveBox( "bandwidth", qobject_cast<QCheckBox *>(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<QComboBox *>(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" ); CaC( "dvdread-caching" );
+ 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 ); CaCi( "realrtsp-caching", 10 );
+ CaCi( "mms-caching", 19 );
+ #ifdef WIN32
+ CaC( "dshow-caching" );
+ #else
+ CaC( "v4l-caching" ); CaC( "jack-input-caching" );
+ CaC( "v4l2-caching" ); CaC( "pvr-caching" );
+ #endif
+ //CaCi( "dv-caching" ) too short...
+ }
+ break;
}
/* Interfaces */
- if( number == SPrefsInterface )
+ case SPrefsInterface:
{
- if( skinInterfaceButton->isChecked() )
+ if( qobject_cast<QRadioButton *>(optionWidgets[skinRB])->isChecked() )
config_PutPsz( p_intf, "intf", "skins2" );
- if( qtInterfaceButton->isChecked() )
+ if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
config_PutPsz( p_intf, "intf", "qt4" );
+ break;
}
- if( number == SPrefsAudio )
+ case SPrefsAudio:
{
- bool b_normChecked = normalizerBox->isChecked();
+ bool b_normChecked =
+ qobject_cast<QCheckBox *>(optionWidgets[normalizerChB])->isChecked();
if( qs_filter.isEmpty() )
{
/* the psz_filter is already empty, so we just append it needed */
{
if( qs_filter.contains( "volnorm" ) )
{
- /* The qs_filter not empty and contains "volnorm"
+ /* The qs_filter not empty and contains "volnorm"
that we have to remove */
if( !b_normChecked )
{
if( b_normChecked ) qs_filter.append( ":volnorm" );
}
config_PutPsz( p_intf, "audio-filter", qtu( qs_filter ) );
+ break;
+ }
}
}
projects / vlc / blobdiff