forked from pool/smplayer
Dominique Leuenberger
12366e2103
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/407790 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/smplayer?expand=0&rev=9
56 lines
1.2 KiB
Diff
56 lines
1.2 KiB
Diff
--- a/src/core.cpp
|
|
+++ b/src/core.cpp
|
|
@@ -1716,6 +1716,8 @@ void Core::startMplayer( QString file, d
|
|
QString ao = pref->ao;
|
|
if (!ao.endsWith(",")) ao += ",";
|
|
proc->setOption("ao", ao);
|
|
+ } else {
|
|
+ proc->setOption("ao", "pulse," );
|
|
}
|
|
|
|
#if !defined(Q_OS_WIN) && !defined(Q_OS_OS2)
|
|
--- a/src/preferences.cpp
|
|
+++ b/src/preferences.cpp
|
|
@@ -371,11 +371,7 @@ void Preferences::reset() {
|
|
resize_method = Never;
|
|
|
|
#if STYLE_SWITCHING
|
|
- #if QT_VERSION >= 0x050000
|
|
- style = "Fusion";
|
|
- #else
|
|
style="";
|
|
- #endif
|
|
#endif
|
|
|
|
center_window = false;
|
|
@@ -443,7 +439,7 @@ void Preferences::reset() {
|
|
allow_video_movement = false;
|
|
|
|
gui = "DefaultGUI";
|
|
- iconset = "H2O";
|
|
+ iconset = "Tango";
|
|
|
|
|
|
#if USE_MINIMUMSIZE
|
|
@@ -597,7 +593,7 @@ void Preferences::reset() {
|
|
|
|
#ifdef CHECK_UPGRADED
|
|
smplayer_stable_version = "";
|
|
- check_if_upgraded = true;
|
|
+ check_if_upgraded = false;
|
|
#endif
|
|
#ifdef FONTCACHE_DIALOG
|
|
smplayer_version = "";
|
|
--- a/src/prefgeneral.cpp
|
|
+++ b/src/prefgeneral.cpp
|
|
@@ -545,6 +545,9 @@ void PrefGeneral::setVO( QString vo_driv
|
|
}
|
|
|
|
void PrefGeneral::setAO( QString ao_driver ) {
|
|
+ if (ao_driver.isEmpty())
|
|
+ ao_driver = "pulse,";
|
|
+
|
|
int idx = ao_combo->findData( ao_driver );
|
|
if (idx != -1) {
|
|
ao_combo->setCurrentIndex(idx);
|