Changeset 181 for smplayer/trunk/src/prefgeneral.cpp

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/prefgeneral.cpp (modified) (18 diffs)

smplayer/trunk/src/prefgeneral.cpp

@@ -74 +74 @@
 
         // Screensaver
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef Q_OS_WIN
         screensaver_check->hide();
         #ifndef SCREENSAVER_OFF
@@ -135 +135 @@
 
 QPixmap PrefGeneral::sectionIcon() {
-        return Images::icon("pref_general", 22);
+        return Images::icon("pref_general");
 }
 
@@ -215 +215 @@
 #endif
 
-        QString vo = pref->vo;
-        if (vo.isEmpty()) {
-#ifdef Q_OS_WIN
-                if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) {
-                        vo = "direct3d,";
-                } else {
-                        vo = "directx,";
-                }
-#else
-#ifdef Q_OS_OS2
-                vo = "kva";
-#else
-                vo = "xv,";
-#endif
-#endif
-        }
-        setVO( vo );
-
-        QString ao = pref->ao;
-
-#ifdef Q_OS_OS2
-        if (ao.isEmpty()) {
-                if (pref->mplayer_detected_version >= MPLAYER_KAI_VERSION) {
-                        ao = "kai";
-                } else {
-                        ao = "dart";
-                }
-        }
-#endif
-
-        setAO( ao );
-
-        setRememberSettings( !pref->dont_remember_media_settings );
-        setRememberTimePos( !pref->dont_remember_time_pos );
+        setVO( pref->vo );
+        setAO( pref->ao );
+
+        setRememberSettings( pref->remember_media_settings );
+        setRememberTimePos( pref->remember_time_pos );
+        remember_streams_check->setChecked(pref->remember_stream_settings);
+
         setFileSettingsMethod( pref->file_settings_method );
         setAudioLang( pref->audio_lang );
@@ -278 +251 @@
         setAutoq( pref->autoq );
 
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef Q_OS_WIN
         #ifdef SCREENSAVER_OFF
         setTurnScreensaverOff( pref->turn_screensaver_off );
@@ -331 +304 @@
         TEST_AND_SET(pref->ao, AO());
 
-        bool dont_remember_ms = !rememberSettings();
-    TEST_AND_SET(pref->dont_remember_media_settings, dont_remember_ms);
-
-        bool dont_remember_time = !rememberTimePos();
-        TEST_AND_SET(pref->dont_remember_time_pos, dont_remember_time);
+        TEST_AND_SET(pref->remember_media_settings, rememberSettings());
+        TEST_AND_SET(pref->remember_time_pos, rememberTimePos());
+        TEST_AND_SET(pref->remember_stream_settings, remember_streams_check->isChecked());
 
         if (pref->file_settings_method != fileSettingsMethod()) {
@@ -376 +347 @@
         TEST_AND_SET(pref->autoq, autoq());
 
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef Q_OS_WIN
         #ifdef SCREENSAVER_OFF
         TEST_AND_SET(pref->turn_screensaver_off, turnScreensaverOff());
@@ -408 +379 @@
         ao_combo->clear();
 
-        vo_combo->addItem(tr("Default"), "player_default");
-        ao_combo->addItem(tr("Default"), "player_default");
+        vo_combo->addItem(tr("Default"), "");
+        ao_combo->addItem(tr("Default"), "");
 
         QString vo;
         for ( int n = 0; n < vo_list.count(); n++ ) {
                 vo = vo_list[n].name();
-#ifdef Q_OS_WIN
+                #ifdef Q_OS_WIN
                 if ( vo == "directx" ) {
                         vo_combo->addItem( "directx (" + tr("fast") + ")", "directx" );
@@ -420 +391 @@
                 }
                 else
-#else
-#ifdef Q_OS_OS2
+                #else
+                #ifdef Q_OS_OS2
                 if ( vo == "kva") {
                         vo_combo->addItem( "kva (" + tr("fast") + ")", "kva" );
@@ -428 +399 @@
                 }
                 else
-#else
+                #else
                 /*
                 if (vo == "xv") vo_combo->addItem( "xv (" + tr("fastest") + ")", vo);
                 else
                 */
-#if USE_XV_ADAPTORS
+                #if USE_XV_ADAPTORS
                 if ((vo == "xv") && (!xv_adaptors.isEmpty())) {
                         vo_combo->addItem(vo, vo);
@@ -442 +413 @@
                 }
                 else
-#endif // USE_XV_ADAPTORS
-#endif
-#endif
+                #endif // USE_XV_ADAPTORS
+                #endif
+                #endif
                 if (vo == "x11") vo_combo->addItem( "x11 (" + tr("slow") + ")", vo);
                 else
@@ -478 +449 @@
                 ao = ao_list[n].name();
                 ao_combo->addItem( ao, ao );
-#ifdef Q_OS_OS2
+                #ifdef Q_OS_OS2
                 if ( ao == "kai") {
                         ao_combo->addItem( "kai (" + tr("uniaud mode") + ")", "kai:uniaud" );
                         ao_combo->addItem( "kai (" + tr("dart mode") + ")", "kai:dart" );
                 }
-#endif
-#if USE_ALSA_DEVICES
+                #endif
+                #if USE_ALSA_DEVICES
                 if ((ao == "alsa") && (!alsa_devices.isEmpty())) {
                         for (int n=0; n < alsa_devices.count(); n++) {
@@ -491 +462 @@
                         }
                 }
-#endif
-#if USE_DSOUND_DEVICES
+                #endif
+                #if USE_DSOUND_DEVICES
                 if ((ao == "dsound") && (!dsound_devices.isEmpty())) {
                         for (int n=0; n < dsound_devices.count(); n++) {
@@ -499 +470 @@
                         }
                 }
-#endif
+                #endif
         }
         ao_combo->addItem( tr("User defined..."), "user_defined" );
@@ -864 +835 @@
 }
 
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef Q_OS_WIN
 #ifdef AVOID_SCREENSAVER
 void PrefGeneral::setAvoidScreensaver(bool b) {
@@ -1005 +976 @@
            "of the file when you open it again. This option works only with "
            "regular files (not with DVDs, CDs, URLs...).") );
+
+        setWhatsThis(remember_streams_check, tr("Remember settings for streams"),
+                tr("When this option is enabled the settings for online streams will be remembered as well."));
 
         setWhatsThis(filesettings_method_combo, tr("Method to store the file settings"),
@@ -1064 +1038 @@
 
         setWhatsThis(vo_combo, tr("Video output driver"),
-                tr("Select the video output driver. %1 provides the best performance.")
-#ifdef Q_OS_WIN
-                  .arg("<b><i>directx</i></b>")
-#else
-#ifdef Q_OS_OS2
-                  .arg("<b><i>kva</i></b>")
-#else
-                  .arg("<b><i>xv</i></b>")
-#endif
-#endif
-                );
+                tr("Select the video output driver."));
 
 #if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
@@ -1135 +1099 @@
            "subtitles automatically in the black borders.") */ );
 
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
+#ifdef Q_OS_WIN
         #ifdef SCREENSAVER_OFF
         setWhatsThis(turn_screensaver_off_check, tr("Switch screensaver off"),
@@ -1162 +1126 @@
 
         setWhatsThis(ao_combo, tr("Audio output driver"),
-                tr("Select the audio output driver.") 
-#ifndef Q_OS_WIN
-#ifdef Q_OS_OS2
-        + " " +
-                tr("%1 is the recommended one. %2 is only available on older MPlayer (before version %3)")
-           .arg("<b><i>kai</i></b>")
-           .arg("<b><i>dart</i></b>")
-           .arg(MPLAYER_KAI_VERSION)
-#else
-        + " " + 
-                tr("%1 is the recommended one. Try to avoid %2 and %3, they are slow "
-           "and can have an impact on performance.")
-           .arg("<b><i>alsa</i></b>")
-           .arg("<b><i>esd</i></b>")
-           .arg("<b><i>arts</i></b>")
-#endif
-#endif
-                );
+                tr("Select the audio output driver."));
 
         setWhatsThis(audio_equalizer_check, tr("Enable the audio equalizer"),