control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
p_config, label, ui.qcontrol, false ); \
controls.append( control ); \
+ } \
+ else { \
+ ui.qcontrol->setEnabled( false ); \
+ if( label ) label->setEnabled( false ); \
}
-#define CONFIG_GENERIC2( option, type, label, qcontrol ) \
+#define CONFIG_BOOL( option, qcontrol ) \
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
+ if( p_config ) \
+ { \
+ control = new BoolConfigControl( VLC_OBJECT(p_intf), \
+ p_config, NULL, ui.qcontrol, false ); \
+ controls.append( control ); \
+ } \
+ else { ui.qcontrol->setEnabled( false ); }
+
+
+#define CONFIG_GENERIC_NO_UI( option, type, label, qcontrol ) \
p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
if( p_config ) \
{ \
control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
- p_config, label, qcontrol, false ); \
+ p_config, label, qcontrol, false ); \
controls.append( control ); \
+ } \
+ else { \
+ QWidget *widget = label; \
+ qcontrol->setVisible( false ); \
+ if( widget ) widget->setEnabled( false ); \
}
controls.append( control ); \
}
-#define CONFIG_GENERIC_FILE( option, type, label, qcontrol, qbutton ) \
- p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
- if( p_config ) \
- { \
- control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
- p_config, label, qcontrol, qbutton ); \
- controls.append( control ); \
- }
+#define CONFIG_GENERIC_FILE( option, type, label, qcontrol, qbutton ) \
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
+ if( p_config ) \
+ { \
+ control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
+ p_config, label, qcontrol, qbutton ); \
+ controls.append( control ); \
+ }
#define START_SPREFS_CAT( name , label ) \
case SPrefs ## name: \
* VIDEO Panel Implementation *
******************************/
START_SPREFS_CAT( Video , qtr("Video Settings") );
- CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
+ CONFIG_BOOL( "video", enableVideo );
- CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen );
- CONFIG_GENERIC( "overlay", Bool, NULL, overlay );
- CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop );
- CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations );
- CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames );
+ CONFIG_BOOL( "fullscreen", fullscreen );
+ CONFIG_BOOL( "overlay", overlay );
+ CONFIG_BOOL( "video-on-top", alwaysOnTop );
+ CONFIG_BOOL( "video-deco", windowDecorations );
+ CONFIG_BOOL( "skip-frames", skipFrames );
CONFIG_GENERIC( "vout", Module, ui.voutLabel, outputModule );
- CONFIG_GENERIC( "video-wallpaper" , Bool , NULL, wallpaperMode );
+ CONFIG_BOOL( "video-wallpaper", wallpaperMode );
#ifdef WIN32
CONFIG_GENERIC( "directx-device", StringList, ui.dxDeviceLabel,
dXdisplayDevice );
- CONFIG_GENERIC( "directx-hw-yuv", Bool, NULL, hwYUVBox );
+ CONFIG_BOOL( "directx-hw-yuv", hwYUVBox );
#else
ui.directXBox->setVisible( false );
ui.hwYUVBox->setVisible( false );
CONFIG_GENERIC_FILE( "snapshot-path", Directory, ui.dirLabel,
ui.snapshotsDirectory, ui.snapshotsDirectoryBrowse );
CONFIG_GENERIC( "snapshot-prefix", String, ui.prefixLabel, snapshotsPrefix );
- CONFIG_GENERIC( "snapshot-sequential", Bool, NULL,
+ CONFIG_BOOL( "snapshot-sequential",
snapshotsSequentialNumbering );
CONFIG_GENERIC( "snapshot-format", StringList, ui.arLabel,
snapshotsFormat );
******************************/
START_SPREFS_CAT( Audio, qtr("Audio Settings") );
- CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
+ CONFIG_BOOL( "audio", enableAudio );
ui.SPrefsAudio_zone->setEnabled( ui.enableAudio->isChecked() );
CONNECT( ui.enableAudio, toggled( bool ),
ui.SPrefsAudio_zone, setEnabled( bool ) );
#ifdef WIN32
audioControl( DirectX );
optionWidgets.append( DirectXControl );
- CONFIG_GENERIC2( "directx-audio-device-name", StringList,
- NULL, DirectXDevice );
+ CONFIG_GENERIC_NO_UI( "directx-audio-device-name", StringList,
+ DirectXLabel, DirectXDevice );
#else
if( module_exists( "alsa" ) )
{
audioControl( alsa );
optionWidgets.append( alsaControl );
- CONFIG_GENERIC2( "alsa-audio-device" , StringList, NULL,
+ CONFIG_GENERIC_NO_UI( "alsa-audio-device" , StringList, alsaLabel,
alsaDevice );
}
else
CONNECT( ui.defaultVolume, valueChanged( int ),
this, updateAudioVolume( int ) );
- CONFIG_GENERIC( "qt-autosave-volume", Bool, NULL, keepVolumeRadio );
+ CONFIG_BOOL( "qt-autosave-volume", keepVolumeRadio );
ui.defaultVolume_zone->setEnabled( ui.resetVolumeRadio->isChecked() );
CONNECT( ui.resetVolumeRadio, toggled( bool ),
ui.defaultVolume_zone, setEnabled( bool ) );
CONFIG_GENERIC( "audio-language" , String , ui.langLabel,
preferredAudioLanguage );
- CONFIG_GENERIC( "spdif", Bool, NULL, spdifBox );
+ CONFIG_BOOL( "spdif", spdifBox );
CONFIG_GENERIC( "force-dolby-surround", IntegerList, ui.dolbyLabel,
detectionDolby );
replayCombo );
CONFIG_GENERIC( "audio-visual" , Module , ui.visuLabel,
visualisation);
+ CONFIG_BOOL( "audio-time-stretch", autoscaleBox );
/* Audio Output Specifics */
CONFIG_GENERIC( "aout", Module, ui.outputLabel, outputModule );
CONFIG_GENERIC( "avi-index", IntegerList, ui.aviLabel, AviRepair );
/* live555 module prefs */
- CONFIG_GENERIC( "rtsp-tcp", Bool, NULL,
+ CONFIG_BOOL( "rtsp-tcp",
live555TransportRTSP_TCPRadio );
if ( !module_exists( "live555" ) )
{
ui.live555TransportLabel->hide();
}
#ifdef WIN32
- CONFIG_GENERIC( "prefer-system-codecs", Bool, NULL, systemCodecBox );
+ CONFIG_BOOL( "prefer-system-codecs", systemCodecBox );
#else
ui.systemCodecBox->hide();
#endif
- CONFIG_GENERIC( "ffmpeg-hw", Bool, NULL, hwAccelBox );
+ CONFIG_BOOL( "ffmpeg-hw", hwAccelBox );
optionWidgets.append( ui.DVDDevice );
optionWidgets.append( ui.cachingCombo );
CONFIG_GENERIC( "ffmpeg-skiploopfilter", IntegerList, ui.filterLabel, loopFilterBox );
CONFIG_GENERIC( "qt-display-mode", IntegerList, ui.displayLabel,
displayModeBox );
- CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo );
- CONFIG_GENERIC( "qt-fs-controller", Bool, NULL, fsController );
- CONFIG_GENERIC( "qt-system-tray", Bool, NULL, systrayBox );
+ CONFIG_BOOL( "embedded-video", embedVideo );
+ CONFIG_BOOL( "qt-fs-controller", fsController );
+ CONFIG_BOOL( "qt-system-tray", systrayBox );
+ CONFIG_BOOL( "qt-notification", sysPop );
CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel,
ui.fileSkin, ui.skinBrowse );
- CONFIG_GENERIC( "qt-video-autoresize", Bool, NULL, resizingBox );
+ CONFIG_BOOL( "qt-video-autoresize", resizingBox );
CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
artFetcher );
/* UPDATE options */
#ifdef UPDATE_CHECK
- CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, updatesBox );
+ CONFIG_BOOL( "qt-updates-notif", updatesBox );
CONFIG_GENERIC_NO_BOOL( "qt-updates-days", Integer, NULL,
updatesDays );
ui.updatesDays->setEnabled( ui.updatesBox->isChecked() );
#endif
/* ONE INSTANCE options */
#if defined( WIN32 ) || defined( HAVE_DBUS ) || defined(__APPLE__)
- CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
- CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
+ CONFIG_BOOL( "one-instance", OneInterfaceMode );
+ CONFIG_BOOL( "playlist-enqueue",
EnqueueOneInterfaceMode );
ui.EnqueueOneInterfaceMode->setEnabled( ui.OneInterfaceMode->isChecked() );
CONNECT( ui.OneInterfaceMode, toggled( bool ),
CONNECT( ui.saveRecentlyPlayed, toggled( bool ),
ui.recentlyPlayedFilters, setEnabled( bool ) );
ui.recentlyPlayedFilters->setEnabled( false );
- CONFIG_GENERIC( "qt-recentplay", Bool, NULL, saveRecentlyPlayed );
+ CONFIG_BOOL( "qt-recentplay", saveRecentlyPlayed );
CONFIG_GENERIC( "qt-recentplay-filter", String, ui.filterLabel,
recentlyPlayedFilters );
START_SPREFS_CAT( Subtitles,
qtr("Subtitles & On Screen Display Settings") );
- CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
- CONFIG_GENERIC( "video-title-show", Bool, NULL, OSDTitleBox);
+ CONFIG_BOOL( "osd", OSDBox);
+ CONFIG_BOOL( "video-title-show", OSDTitleBox);
CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel,
case SPrefsHotkeys:
{
- p_config = config_FindConfig( VLC_OBJECT(p_intf), "key-fullscreen" );
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), "key-play" );
QGridLayout *gLayout = new QGridLayout;
panel->setLayout( gLayout );
#undef START_SPREFS_CAT
#undef CONFIG_GENERIC_FILE
#undef CONFIG_GENERIC_NO_BOOL
-#undef CONFIG_GENERIC2
+#undef CONFIG_GENERIC_NO_UI
#undef CONFIG_GENERIC
+#undef CONFIG_BOOL
}
QString value = qobject_cast<QComboBox *>(optionWidgets[audioOutCoB])
->itemData( number ).toString();
#ifdef WIN32
- optionWidgets[directxW]->setVisible( ( value == "directx" ) );
+ optionWidgets[directxW]->setVisible( ( value == "aout_directx" ) );
#else
/* optionWidgets[ossW] can be NULL */
if( optionWidgets[ossW] )
optionWidgets[alsaW]->setVisible( ( value == "alsa" ) );
#endif
optionWidgets[fileW]->setVisible( ( value == "aout_file" ) );
- optionWidgets[spdifChB]->setVisible( ( value != "aout_file"
- && value != "dummy" ) );
+ optionWidgets[spdifChB]->setVisible( ( value == "alsa" || value == "oss" || value == "auhal" ||
+ value == "aout_directx" || value == "waveout" ) );
}
void SPrefsPanel::assoDialog()
{
- OSVERSIONINFO winVer;
- winVer.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
- //Vista specific file associations
- if( GetVersionEx(&winVer) && winVer.dwMajorVersion > 5 )
- {
- LPAPPASSOCREGUI p_appassoc;
- CoInitialize( 0 );
-
- if( S_OK == CoCreateInstance( &clsid_IApplication2,
- NULL, CLSCTX_INPROC_SERVER,
- &IID_IApplicationAssociationRegistrationUI,
- (void **)&p_appassoc) )
- {
- if(S_OK == p_appassoc->vt->LaunchAdvancedAssociationUI(p_appassoc, L"VLC" ) )
- {
- CoUninitialize();
- return;
- }
- }
+ LPAPPASSOCREGUI p_appassoc;
+ CoInitialize( 0 );
+ if( S_OK == CoCreateInstance( &clsid_IApplication2,
+ NULL, CLSCTX_INPROC_SERVER,
+ &IID_IApplicationAssociationRegistrationUI,
+ (void **)&p_appassoc) )
+ {
+ if(S_OK == p_appassoc->vt->LaunchAdvancedAssociationUI(p_appassoc, L"VLC" ) )
+ {
CoUninitialize();
+ return;
+ }
}
+
+ CoUninitialize();
+
QDialog *d = new QDialog( this );
QGridLayout *assoLayout = new QGridLayout( d );
aTa( ".a52" ); aTa( ".aac" ); aTa( ".ac3" ); aTa( ".dts" ); aTa( ".flac" );
aTa( ".m4a" ); aTa( ".m4p" ); aTa( ".mka" ); aTa( ".mod" ); aTa( ".mp1" );
aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".oma" ); aTa( ".oga" ); aTa( ".spx" );
- aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" );
+ aTa( ".tta" ); aTa( ".wav" ); aTa( ".wma" ); aTa( ".xm" );
audioType->setCheckState( 0, ( i_temp > 0 ) ?
( ( i_temp == audioType->childCount() ) ?
Qt::Checked : Qt::PartiallyChecked )
aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" );
aTv( ".mts" ); aTv( ".mxf" );
aTv( ".ogg" ); aTv( ".ogm" ); aTv( ".ogx" ); aTv( ".ogv" ); aTv( ".ts" );
- aTv( ".vob" ); aTv( ".wmv" );
+ aTv( ".vob" ); aTv( ".vro" ); aTv( ".wmv" );
videoType->setCheckState( 0, ( i_temp > 0 ) ?
( ( i_temp == audioType->childCount() ) ?
Qt::Checked : Qt::PartiallyChecked )
projects / vlc / blobdiff