Changeset 181 for smplayer/trunk/src/mpvoptions.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/mpvoptions.cpp (modified) (7 diffs)

smplayer/trunk/src/mpvoptions.cpp

@@ -48 +48 @@
 
                         "INFO_DEMUXER=${=demuxer}\n"
+                        "INFO_SEEKABLE=${=seekable}\n"
                         "INFO_TITLES=${=disc-titles}\n"
                         "INFO_CHAPTERS=${=chapters}\n"
@@ -150 +151 @@
         }
         else
+        if (option_name == "cache_auto") {
+                arg << "--cache=auto";
+        }
+        else
         if (option_name == "ss") {
                 arg << "--start=" + value.toString();
@@ -243 +248 @@
         else
         if (option_name == "softvol") {
-                arg << "--softvol=yes";
-        }
-        else
-        if (option_name == "softvol-max") {
-                int v = value.toInt();
-                if (v < 100) v = 100;
-                arg << "--softvol-max=" + QString::number(v);
+                if (value.toString() == "off") {
+                        if (isOptionAvailable("--volume-max")) {
+                                arg << "--volume-max=100";
+                        }
+                } else {
+                        int v = value.toInt();
+                        if (v < 100) v = 100;
+                        if (isOptionAvailable("--volume-max")) {
+                                arg << "--volume-max=" + QString::number(v);
+                        } else {
+                                arg << "--softvol=yes";
+                                arg << "--softvol-max=" + QString::number(v);
+                        }
+                }
         }
         else
@@ -338 +350 @@
         if (option_name == "mute") {
                 arg << "--mute=yes";
+        }
+        else
+        if (option_name == "scaletempo") {
+                if (isOptionAvailable("--audio-pitch-correction")) {
+                        bool enabled = value.toBool();
+                        if (enabled) arg << "--audio-pitch-correction=yes"; else arg << "--audio-pitch-correction=no";
+                }
         }
         else
@@ -367 +386 @@
             option_name == "dvd-device" || option_name == "cdrom-device" ||
             option_name == "demuxer" ||
-            option_name == "frames")
+            option_name == "frames" ||
+            option_name == "ab-loop-a" || option_name == "ab-loop-b")
         {
                 QString s = "--" + option_name;
@@ -713 +733 @@
         }
         writeToStdin(QString("set loop %1").arg(o));
+}
+
+void MPVProcess::setAMarker(int sec) {
+        writeToStdin(QString("set ab-loop-a %1").arg(sec));
+}
+
+void MPVProcess::setBMarker(int sec) {
+        writeToStdin(QString("set ab-loop-b %1").arg(sec));
+}
+
+void MPVProcess::clearABMarkers() {
+        writeToStdin("set ab-loop-a no");
+        writeToStdin("set ab-loop-b no");
 }
 
@@ -910 +943 @@
         }
 
+        if (isOptionAvailable("--sub-text-italic")) {
+                arg << QString("--sub-text-italic=%1").arg(styles.italic ? "yes" : "no");
+        }
+
         QString halign;
         switch (styles.halignment) {