Changeset 186 for smplayer/vendor/current/src/prefgeneral.cpp

Timestamp:

Jan 24, 2017, 12:24:46 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 17.1.0

File:

• smplayer/vendor/current/src/prefgeneral.cpp (modified) (15 diffs)

smplayer/vendor/current/src/prefgeneral.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -27 +27 @@
 #include "playerid.h"
 
-#if USE_ALSA_DEVICES || USE_DSOUND_DEVICES
+#if USE_ALSA_DEVICES || USE_PULSEAUDIO_DEVICES || USE_XV_ADAPTORS || USE_DSOUND_DEVICES
 #include "deviceinfo.h"
 #endif
@@ -65 +65 @@
 #if USE_ALSA_DEVICES
         alsa_devices = DeviceInfo::alsaDevices();
+#endif
+#if USE_MPV_ALSA_DEVICES
+        mpv_alsa_devices = DeviceInfo::mpvAlsaDevices();
+#endif
+#if USE_PULSEAUDIO_DEVICES
+        pa_devices = DeviceInfo::paDevices();
 #endif
 #if USE_XV_ADAPTORS
@@ -89 +95 @@
 #ifndef AUTO_SHUTDOWN_PC
         shutdown_widget->hide();
+#endif
+
+#ifndef ADD_BLACKBORDERS_FS
+        blackborders_on_fs_check->hide();
+#endif
+
+#ifndef INITIAL_BLACKBORDERS
+        blackborders_check->hide();
 #endif
 
@@ -245 +259 @@
         setUseSlices( pref->use_slices );
         setStartInFullscreen( pref->start_in_fullscreen );
+
+#ifdef ADD_BLACKBORDERS_FS
         setBlackbordersOnFullscreen( pref->add_blackborders_on_fullscreen );
+#endif
+
+#ifdef INITIAL_BLACKBORDERS
+        blackborders_check->setChecked(pref->initial_blackborders);
+#endif
+
         setAutoq( pref->autoq );
 
@@ -338 +360 @@
         TEST_AND_SET(pref->use_slices, useSlices());
         pref->start_in_fullscreen = startInFullscreen();
+
+#ifdef ADD_BLACKBORDERS_FS
         if (pref->add_blackborders_on_fullscreen != blackbordersOnFullscreen()) {
                 pref->add_blackborders_on_fullscreen = blackbordersOnFullscreen();
                 if (pref->fullscreen) requires_restart = true;
         }
+#endif
+
+#ifdef INITIAL_BLACKBORDERS
+        pref->initial_blackborders = blackborders_check->isChecked();
+#endif
+
         TEST_AND_SET(pref->autoq, autoq());
 
@@ -446 +476 @@
                 ao = ao_list[n].name();
                 ao_combo->addItem( ao, ao );
+                /*
                 #ifdef Q_OS_OS2
                 if ( ao == "kai") {
@@ -452 +483 @@
                 }
                 #endif
+                */
                 #if USE_ALSA_DEVICES
                 if ((ao == "alsa") && (!alsa_devices.isEmpty())) {
                         for (int n=0; n < alsa_devices.count(); n++) {
-                                ao_combo->addItem( "alsa (" + alsa_devices[n].ID().toString() + " - " + alsa_devices[n].desc() + ")", 
-                                   "alsa:device=hw=" + alsa_devices[n].ID().toString() );
+                                ao_combo->addItem( DeviceInfo::printableName("alsa", alsa_devices[n]), DeviceInfo::internalName("alsa", alsa_devices[n]) );
+                        }
+                }
+                #endif
+                #if USE_MPV_ALSA_DEVICES
+                if ((ao == "alsa") && (!mpv_alsa_devices.isEmpty())) {
+                        for (int n=0; n < mpv_alsa_devices.count(); n++) {
+                                ao_combo->addItem( DeviceInfo::printableName("alsa", mpv_alsa_devices[n]), DeviceInfo::internalName("alsa", mpv_alsa_devices[n]) );
+                        }
+                }
+                #endif
+                #if USE_PULSEAUDIO_DEVICES
+                if ((ao == "pulse") && (!pa_devices.isEmpty())) {
+                        for (int n=0; n < pa_devices.count(); n++) {
+                                ao_combo->addItem( DeviceInfo::printableName("pulse", pa_devices[n]), DeviceInfo::internalName("pulse", pa_devices[n]) );
                         }
                 }
@@ -463 +508 @@
                 if ((ao == "dsound") && (!dsound_devices.isEmpty())) {
                         for (int n=0; n < dsound_devices.count(); n++) {
-                                ao_combo->addItem( "dsound (" + dsound_devices[n].ID().toString() + " - " + dsound_devices[n].desc() + ")", 
-                                   "dsound:device=" + dsound_devices[n].ID().toString() );
+                                ao_combo->addItem( DeviceInfo::printableName("dsound", dsound_devices[n]), DeviceInfo::internalName("dsound", dsound_devices[n]) );
                         }
                 }
@@ -519 +563 @@
 
 QString PrefGeneral::screenshotDir() {
-        return screenshot_edit->text();
+        return screenshot_edit->text().trimmed();
 }
 
@@ -863 +907 @@
 #endif
 
+#ifdef ADD_BLACKBORDERS_FS
 void PrefGeneral::setBlackbordersOnFullscreen(bool b) {
         blackborders_on_fs_check->setChecked(b);
@@ -870 +915 @@
         return blackborders_on_fs_check->isChecked();
 }
+#endif
 
 void PrefGeneral::setAutoq(int n) {
@@ -1058 +1104 @@
         tr("<b>Note:</b> This option won't be used for TV channels.") );
 
+#ifdef INITIAL_BLACKBORDERS
+        setWhatsThis(blackborders_check, tr("Add black borders for subtitles by default"),
+                tr("If this option is enabled, black borders will be added to the image "
+           "by default on new opened files."));
+#endif
+
         setWhatsThis(zoom_spin, tr("Default zoom"),
                 tr("This option sets the default zoom which will be used for "
@@ -1088 +1140 @@
            "fullscreen mode.") );
 
+#ifdef ADD_BLACKBORDERS_FS
         setWhatsThis(blackborders_on_fs_check, tr("Add black borders on fullscreen"),
                 tr("If this option is enabled, black borders will be added to the "
@@ -1095 +1148 @@
            "some video drivers (like gl) are already able to display the "
            "subtitles automatically in the black borders.") */ );
+#endif
 
 #ifdef Q_OS_WIN