Changeset 175 for smplayer/vendor/current/src/infoprovider.cpp

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

• smplayer/vendor/current/src/infoprovider.cpp (modified) (3 diffs)

smplayer/vendor/current/src/infoprovider.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -20 +20 @@
 #include "global.h"
 #include "preferences.h"
-#include "mplayerprocess.h"
+#include "playerprocess.h"
+#include "playerid.h"
 #include <QFileInfo>
 
@@ -26 +27 @@
         qDebug("InfoProvider::getInfo: %s", filename.toUtf8().data());
 
-        MplayerProcess proc;
-
         QFileInfo fi(mplayer_bin);
-    if (fi.exists() && fi.isExecutable() && !fi.isDir()) {
-        mplayer_bin = fi.absoluteFilePath();
+        if (fi.exists() && fi.isExecutable() && !fi.isDir()) {
+                mplayer_bin = fi.absoluteFilePath();
         }
 
-        proc.addArgument(mplayer_bin);
-        proc.addArgument("-identify");
-        proc.addArgument("-frames");
-        proc.addArgument("0");
-        proc.addArgument("-vo");
-        proc.addArgument("null");
-        proc.addArgument("-ao");
-        proc.addArgument("null");
-        proc.addArgument(filename);
+        PlayerProcess * proc = PlayerProcess::createPlayerProcess(mplayer_bin, 0);
 
-        proc.start();
-        if (!proc.waitForFinished()) {
+        proc->setExecutable(mplayer_bin);
+        proc->setFixedOptions();
+        proc->setOption("frames", "1");
+        proc->setOption("vo", "null");
+        proc->setOption("ao", "null");
+        #ifdef Q_OS_WIN
+        proc->setOption("fontconfig", false);
+        #endif
+        proc->setMedia(filename);
+
+        QString commandline = proc->arguments().join(" ");
+        qDebug("InfoProvider::getInfo: command: '%s'", commandline.toUtf8().data());
+
+        proc->start();
+        if (!proc->waitForFinished()) {
                 qWarning("InfoProvider::getInfo: process didn't finish. Killing it...");
-                proc.kill();
+                proc->kill();
         }
 
-        return proc.mediaData();
+        MediaData md = proc->mediaData();
+        delete proc;
+
+        return md;
 }