forked from pool/smplayer
e76409b9da
OBS-URL: https://build.opensuse.org/request/show/336289 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/smplayer?expand=0&rev=3
56 lines
1.2 KiB
Diff
56 lines
1.2 KiB
Diff
--- a/src/core.cpp
|
|
+++ b/src/core.cpp
|
|
@@ -1717,6 +1717,8 @@ void Core::startMplayer( QString file, d
|
|
if (pref->ao != "player_default") {
|
|
if (!pref->ao.isEmpty()) {
|
|
proc->setOption("ao", pref->ao );
|
|
+ } else {
|
|
+ proc->setOption("ao", "pulse," );
|
|
}
|
|
}
|
|
|
|
--- a/src/preferences.cpp
|
|
+++ b/src/preferences.cpp
|
|
@@ -79,9 +79,9 @@ void Preferences::reset() {
|
|
config_version = CURRENT_CONFIG_VERSION;
|
|
|
|
#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
|
|
- mplayer_bin= "mplayer/mplayer.exe";
|
|
+ mplayer_bin= "mplayer/mpv.exe";
|
|
#else
|
|
- mplayer_bin = "mplayer";
|
|
+ mplayer_bin = "mpv";
|
|
#endif
|
|
|
|
vo = "";
|
|
@@ -420,7 +420,7 @@ void Preferences::reset() {
|
|
allow_video_movement = false;
|
|
|
|
gui = "DefaultGUI";
|
|
- iconset = "H2O";
|
|
+ iconset = "Tango";
|
|
|
|
|
|
#if USE_MINIMUMSIZE
|
|
@@ -558,7 +558,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
|
|
@@ -193,6 +193,9 @@ void PrefGeneral::setData(Preferences *
|
|
|
|
QString ao = pref->ao;
|
|
|
|
+ if (ao.isEmpty())
|
|
+ ao = "pulse,";
|
|
+
|
|
#ifdef Q_OS_OS2
|
|
if (ao.isEmpty()) {
|
|
if (pref->mplayer_detected_version >= MPLAYER_KAI_VERSION) {
|