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
#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 );
CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
- /* and hide if necessary */
-
+ /* hide if necessary */
#ifdef WIN32
ui.OSSControl->hide();
ui.alsaControl->hide();
/* Audio Output Specifics */
CONFIG_GENERIC( "aout", Module, NULL, outputModule );
- CONNECT( ui.outputModule, currentIndexChanged( int ), this,
- updateAudioOptions( int ) );
+ CONNECT( ui.outputModule, currentIndexChanged( int ),
+ this, updateAudioOptions( int ) );
-
- //TODO: 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 );
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 );
-
- if( config_ExistIntf( VLC_OBJECT( p_intf ), "audioscrobbler" ) )
- ui.lastfm->setCheckState( Qt::Checked );
+ 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->setCheckState( Qt::Unchecked );
- CONNECT( ui.lastfm, stateChanged( int ), this ,
- lastfm_Changed( int ) );
+ ui.lastfm->hide();
/* Normalizer */
/* Disk Devices */
{
ui.DVDDevice->setToolTip(
- qtr( "If this propriety is blank, then you have\n"
+ //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 ) );
}
addToCachingBox( "Higher latency", CachingHigher );
#define TestCaC( name ) \
- b_cache_equal = b_cache_equal && ( i_cache == config_GetInt( p_intf, 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 ) );
+ ( ( 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" )
+ 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" )
+ TestCaC( "dshow-caching" );
#else
- TestCaC( "v4l-caching" ) TestCaC( "jack-input-caching" )
- TestCaC( "v4l2-caching" ) TestCaC( "pvr-caching" )
+ 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 ) TestCaCi( "realrtsp-caching", 10 )
- TestCaCi( "mms-caching", 19 )
+ 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 ) ) );
#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 */
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 )
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 );
+#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( "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 ); CaCi( "realrtsp-caching", 10 );
+ 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
- CaC( "v4l-caching" ); CaC( "jack-input-caching" );
- CaC( "v4l2-caching" ); CaC( "pvr-caching" );
+ 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...
}
else if( i_state == Qt::Unchecked )
config_RemoveIntf( VLC_OBJECT( p_intf ), "audioscrobbler" );
}
+
+void SPrefsPanel::assoDialog()
+{
+
+}
projects / vlc / blobdiff