Changeset 176 for smplayer/trunk/src/helper.cpp

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/helper.cpp (modified) (6 diffs)

smplayer/trunk/src/helper.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
@@ -25 +25 @@
 #include <QTextCodec>
 #include <QWidget>
-//#include <QDebug>
+#include <QDebug>
 #include "config.h"
 #include "extensions.h"
@@ -61 +61 @@
 
 QString Helper::formatTime(int secs) {
+        bool negative = (secs < 0);
+        secs = abs(secs);
+
         int t = secs;
-    int hours = (int) t / 3600;
-    t -= hours*3600;
-    int minutes = (int) t / 60;
-    t -= minutes*60;
-    int seconds = t;
-
-    QString tf;
-    return tf.sprintf("%02d:%02d:%02d",hours,minutes,seconds);
+        int hours = (int) t / 3600;
+        t -= hours*3600;
+        int minutes = (int) t / 60;
+        t -= minutes*60;
+        int seconds = t;
+
+        //qDebug() << "Helper::formatTime:" << hours << ":" << minutes << ":" << seconds;
+
+        return QString("%1%2:%3:%4").arg(negative ? "-" : "").arg(hours, 2, 10, QChar('0')).arg(minutes, 2, 10, QChar('0')).arg(seconds, 2, 10, QChar('0'));
 }
 
@@ -243 +247 @@
                 while ( !matching_files.isEmpty() ) {
                         qDebug("Helper::searchForConsecutiveFiles: '%s' exists, added to the list", matching_files[0].toUtf8().constData());
-                        files_to_add << path  + "/" + matching_files[0];
+                        QString filename = path  + "/" + matching_files[0];
+                        #ifdef Q_OS_WIN
+                        filename = QDir::toNativeSeparators(filename);
+                        #endif
+                        files_to_add << filename;
                         current_number++;
                         next_name = basename.left(pos) + QString("%1").arg(current_number, digits, 10, QLatin1Char('0'));
@@ -269 +277 @@
         QStringList r;
         for (int n = 0; n < all_files.count(); n++) {
-                if (all_files[n] != current_file) {
+                //if (all_files[n] != current_file) {
                         QString s = path +"/" + all_files[n];
+                        #ifdef Q_OS_WIN
+                        s = QDir::toNativeSeparators(s);
+                        #endif
                         r << s;
-                }
+                //}
         }
 
@@ -313 +324 @@
 }
 #endif
+
+#ifndef Q_OS_WIN
+QString Helper::findExecutable(const QString & name) {
+        QByteArray env = qgetenv("PATH");
+#ifdef Q_OS_OS2
+        QString newName = name;
+        if (!newName.endsWith(".exe", Qt::CaseInsensitive))
+                newName.append(".exe");
+#endif
+        QStringList search_paths = QString::fromLocal8Bit(env.constData()).split(':', QString::SkipEmptyParts);
+        for (int n = 0; n < search_paths.count(); n++) {
+#ifdef Q_OS_OS2
+                QString candidate = search_paths[n] + "/" + newName;
+#else
+                QString candidate = search_paths[n] + "/" + name;
+#endif
+                qDebug("Helper::findExecutable: candidate: %s", candidate.toUtf8().constData());
+                QFileInfo info(candidate);
+                if (info.isFile() && info.isExecutable()) {
+                        qDebug("Helper::findExecutable: executable found: %s", candidate.toUtf8().constData());
+                        return candidate;
+                }
+        }
+        return QString::null;
+}
+#endif