Changeset 188 for smplayer/trunk/src/mplayeroptions.cpp

Timestamp:

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

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/mplayeroptions.cpp (modified) (4 diffs)

smplayer/trunk/src/mplayeroptions.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
@@ -18 +18 @@
 
 #include "subtracks.h"
+#include "deviceinfo.h"
 #include <QDir>
 #include <QDebug>
@@ -64 +65 @@
 
 void MplayerProcess::setOption(const QString & option_name, const QVariant & value) {
+        if (option_name == "ao") {
+                QString ao = value.toString();
+                if (ao.contains(":")) {
+                        QStringList l = DeviceInfo::extractDevice(ao);
+                        qDebug() << "MplayerProcess::setOption: ao:" << l;
+                        if (l.count() > 1) {
+                                #ifndef Q_OS_WIN
+                                if (l[0] == "alsa") {
+                                        ao = "alsa:device=hw=" + l[1];
+                                }
+                                else
+                                if (l[0] == "pulse") {
+                                        ao = "pulse::" + l[1];
+                                }
+                                #else
+                                if (l[0] == "dsound") {
+                                        ao = "dsound:device=" + l[1];
+                                }
+                                #endif
+                        }
+                }
+                arg << "-ao" << ao + ",";
+        }
+        else
         if (option_name == "cache") {
                 int cache = value.toInt();
@@ -284 +309 @@
 
 void MplayerProcess::showFilenameOnOSD() {
-        writeToStdin("osd_show_property_text \"${filename}\" 2000 0");
+        QString s = "${filename}";
+
+        if (!osd_media_info.isEmpty()) s = osd_media_info;
+
+        writeToStdin("osd_show_property_text \"" + s + "\" 2000 0");
 }