diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2018-03-08 20:48:47 +0100 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2018-03-08 20:48:47 +0100 |
| commit | 6c3f8733e9723de625a14670a948419235504e64 (patch) | |
| tree | 183ca1da081ae14e3e05d7ae4374c484e0ff9def /src/prefgeneral.cpp | |
| parent | 2a89e521054ca07840269f4c9457c664497e12bd (diff) | |
New upstream version 18.2.2~ds0
Diffstat (limited to 'src/prefgeneral.cpp')
| -rw-r--r-- | src/prefgeneral.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/prefgeneral.cpp b/src/prefgeneral.cpp index a2fd72e..4643eaf 100644 --- a/src/prefgeneral.cpp +++ b/src/prefgeneral.cpp @@ -104,7 +104,7 @@ PrefGeneral::PrefGeneral(QWidget * parent, Qt::WindowFlags f) blackborders_check->hide(); #endif -#if SIMPLE_TRACK_SELECTION +#if !SELECT_TRACKS_ON_STARTUP tracks_frame->hide(); tracks_separator->hide(); #endif @@ -245,6 +245,8 @@ void PrefGeneral::setData(Preferences * pref) { #else setAudioLang( pref->audio_lang ); setSubtitleLang( pref->subtitle_lang ); +#endif +#if SELECT_TRACKS_ON_STARTUP setAudioTrack( pref->initial_audio_track ); setSubtitleTrack( pref->initial_subtitle_track ); #endif @@ -349,7 +351,8 @@ void PrefGeneral::getData(Preferences * pref) { #else pref->audio_lang = audioLang(); pref->subtitle_lang = subtitleLang(); - +#endif +#if SELECT_TRACKS_ON_STARTUP pref->initial_audio_track = audioTrack(); pref->initial_subtitle_track = subtitleTrack(); #endif @@ -479,7 +482,7 @@ void PrefGeneral::updateDriverCombos() { } else if (vo == "null" || vo == "png" || vo == "jpeg" || vo == "gif89a" || - vo == "tga" || vo == "pnm" || vo == "md5sum" ) + vo == "tga" || vo == "pnm" || vo == "md5sum" || vo == "image" || vo == "tct") { ; // Nothing to do } @@ -687,7 +690,7 @@ QString PrefGeneral::subtitleLang() { return subtitle_lang_edit->text(); } -#if !SIMPLE_TRACK_SELECTION +#if SELECT_TRACKS_ON_STARTUP void PrefGeneral::setAudioTrack(int track) { audio_track_spin->setValue(track); } @@ -1278,7 +1281,7 @@ void PrefGeneral::createHelp() { #endif ); -#if !SIMPLE_TRACK_SELECTION +#if SELECT_TRACKS_ON_STARTUP setWhatsThis(audio_track_spin, tr("Audio track"), tr("Specifies the default audio track which will be used when playing " "new files. If the track doesn't exist, the first one will be used. " |