diff options
Diffstat (limited to 'src/prefgeneral.cpp')
| -rw-r--r-- | src/prefgeneral.cpp | 45 |
1 files changed, 38 insertions, 7 deletions
diff --git a/src/prefgeneral.cpp b/src/prefgeneral.cpp index bf71783..beebe74 100644 --- a/src/prefgeneral.cpp +++ b/src/prefgeneral.cpp @@ -1,5 +1,5 @@ /* smplayer, GUI front-end for mplayer. - Copyright (C) 2006-2009 Ricardo Villalba <rvm@escomposlinux.org> + Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -59,6 +59,10 @@ PrefGeneral::PrefGeneral(QWidget * parent, Qt::WindowFlags f) screensaver_group->hide(); #endif +#ifdef Q_OS_WIN + vdpau_filters_check->hide(); +#endif + // Channels combo channels_combo->addItem( "2", MediaSettings::ChStereo ); channels_combo->addItem( "4", MediaSettings::ChSurround ); @@ -157,9 +161,6 @@ void PrefGeneral::setData(Preferences * pref) { setVO( vo ); QString ao = pref->ao; -#ifndef Q_OS_WIN - if (ao.isEmpty()) ao = "alsa,"; -#endif setAO( ao ); setRememberSettings( !pref->dont_remember_media_settings ); @@ -181,7 +182,7 @@ void PrefGeneral::setData(Preferences * pref) { setAmplification( pref->softvol_max ); setInitialPostprocessing( pref->initial_postprocessing ); setInitialDeinterlace( pref->initial_deinterlace ); - setInitialZoom( pref->initial_panscan_factor ); + setInitialZoom( pref->initial_zoom_factor ); setDirectRendering( pref->use_direct_rendering ); setDoubleBuffer( pref->use_double_buffer ); setUseSlices( pref->use_slices ); @@ -196,6 +197,10 @@ void PrefGeneral::setData(Preferences * pref) { setDisableScreensaver( pref->disable_screensaver ); #endif +#ifndef Q_OS_WIN + setDisableFiltersWithVdpau( pref->disable_video_filters_with_vdpau ); +#endif + setAudioChannels( pref->initial_audio_channels ); setScaleTempoFilter( pref->use_scaletempo ); @@ -256,7 +261,7 @@ void PrefGeneral::getData(Preferences * pref) { TEST_AND_SET(pref->softvol_max, amplification()); pref->initial_postprocessing = initialPostprocessing(); pref->initial_deinterlace = initialDeinterlace(); - pref->initial_panscan_factor = initialZoom(); + pref->initial_zoom_factor = initialZoom(); TEST_AND_SET(pref->use_direct_rendering, directRendering()); TEST_AND_SET(pref->use_double_buffer, doubleBuffer()); TEST_AND_SET(pref->use_slices, useSlices()); @@ -274,6 +279,10 @@ void PrefGeneral::getData(Preferences * pref) { TEST_AND_SET(pref->disable_screensaver, disableScreensaver()); #endif +#ifndef Q_OS_WIN + TEST_AND_SET(pref->disable_video_filters_with_vdpau, disableFiltersWithVdpau()); +#endif + pref->initial_audio_channels = audioChannels(); TEST_AND_SET(pref->use_scaletempo, scaleTempoFilter()); @@ -417,10 +426,12 @@ QString PrefGeneral::VO() { QString vo = vo_combo->itemData(vo_combo->currentIndex()).toString(); if (vo == "user_defined") { vo = vo_user_defined_edit->text(); + /* if (vo.isEmpty()) { vo = vo_combo->itemData(0).toString(); qDebug("PrefGeneral::VO: user defined vo is empty, using %s", vo.toUtf8().constData()); } + */ } return vo; } @@ -429,10 +440,12 @@ QString PrefGeneral::AO() { QString ao = ao_combo->itemData(ao_combo->currentIndex()).toString(); if (ao == "user_defined") { ao = ao_user_defined_edit->text(); + /* if (ao.isEmpty()) { ao = ao_combo->itemData(0).toString(); qDebug("PrefGeneral::AO: user defined ao is empty, using %s", ao.toUtf8().constData()); } + */ } return ao; } @@ -711,6 +724,16 @@ bool PrefGeneral::disableScreensaver() { } #endif +#ifndef Q_OS_WIN +void PrefGeneral::setDisableFiltersWithVdpau(bool b) { + vdpau_filters_check->setChecked(b); +} + +bool PrefGeneral::disableFiltersWithVdpau() { + return vdpau_filters_check->isChecked(); +} +#endif + void PrefGeneral::setBlackbordersOnFullscreen(bool b) { blackborders_on_fs_check->setChecked(b); } @@ -811,6 +834,12 @@ void PrefGeneral::createHelp() { #endif ); +#ifndef Q_OS_WIN + setWhatsThis(vdpau_filters_check, tr("Disable video filters when using vdpau"), + tr("Usually video filters won't work when using vdpau as video output " + "driver, so it's wise to keep this option checked.") ); +#endif + setWhatsThis(postprocessing_check, tr("Enable postprocessing by default"), tr("Postprocessing will be used by default on new opened files.") ); @@ -901,7 +930,9 @@ void PrefGeneral::createHelp() { tr("Check this option if you want to use the audio equalizer.") ); setWhatsThis(hwac3_check, tr("AC3/DTS pass-through S/PDIF"), - tr("Uses hardware AC3 passthrough") ); + tr("Uses hardware AC3 passthrough.") + "<br>" + + tr("<b>Note:</b> none of the audio filters will be used when this " + "option is enabled.") ); setWhatsThis(channels_combo, tr("Channels by default"), tr("Requests the number of playback channels. MPlayer " |