Changeset 121 for smplayer/vendor/current/src/main.cpp

Timestamp:

Mar 15, 2012, 5:14:10 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer 0.7.1: vendor update

File:

• smplayer/vendor/current/src/main.cpp (modified) (7 diffs)

smplayer/vendor/current/src/main.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -20 +20 @@
 #include <QFile>
 #include <QTime>
+#include <QDir>
 
 #include "smplayer.h"
@@ -28 +29 @@
 #include <stdio.h>
 
+#if USE_QTLOCKEDFILE
 #define USE_LOCKS 1
 #if USE_LOCKS
-#ifdef USE_QXT
-#define USE_QXT_LOCKS 1
-#endif // USE_QXT
-#endif // USE_LOCKS
-
-#if USE_LOCKS && USE_QXT_LOCKS
-#include <QxtFileLock>
+#include "qtlockedfile/qtlockedfile.h"
+#endif
 #endif
 
@@ -126 +123 @@
 }
 
-#if USE_LOCKS
-#if USE_QXT_LOCKS
-bool create_lock(QFile * f, QxtFileLock * lock) {
-        bool success = false;
-        if (f->open(QIODevice::ReadWrite)) {
-                if (lock->lock()) {
-                        f->write("smplayer lock file");
-                        success = true;
-                }
-        }
-        if (!success) f->close();
-        return success;
-}
-
-void clean_lock(QFile * f, QxtFileLock * lock) {
-        qDebug("main: clean_lock: %s", f->fileName().toUtf8().data());
-        lock->unlock();
-        f->close();
-        f->remove();
-}
-#else
-void remove_lock(QString lock_file) {
-        if (QFile::exists(lock_file)) {
-                qDebug("main: remove_lock: %s", lock_file.toUtf8().data());
-                QFile::remove(lock_file);
-        }
-}
-#endif
-#endif
 
 class MyApplication : public QApplication
@@ -214 +182 @@
         qDebug("main: lock_file: %s", lock_file.toUtf8().data());
 
-#if USE_QXT_LOCKS
-        QFile f(lock_file);
-        QxtFileLock write_lock(&f, 0x10, 30, QxtFileLock::WriteLock);
-
-        bool lock_ok = create_lock(&f, &write_lock);
-
-        if (!lock_ok) {
-                //lock failed
-                qDebug("main: lock failed");
-
-                // Wait 10 secs max.
-                int n = 100;
-                while ( n > 0) {
-                        Helper::msleep(100); // wait 100 ms
-                        //if (!QFile::exists(lock_file)) break;
-                        if (create_lock(&f, &write_lock)) break;
-                        n--;
-                        if ((n % 10) == 0) qDebug("main: waiting %d...", n);
-                }
-                // Continue startup
-        }
-#else
-        if (QFile::exists(lock_file)) {
-                qDebug("main: %s exists, waiting...", lock_file.toUtf8().data());
-                // Wait 10 secs max.
-                int n = 100;
-                while ( n > 0) {
-                        Helper::msleep(100); // wait 100 ms
-                        if (!QFile::exists(lock_file)) break;
-                        n--;
-                        if ((n % 10) == 0) qDebug("main: waiting %d...", n);
-                }
-                remove_lock(lock_file);
-        } else {
-                // Create lock file
-                QFile f(lock_file);
-                if (f.open(QIODevice::WriteOnly)) {
-                        f.write("smplayer lock file");
-                        f.close();
-                } else {
-                        qWarning("main: can't open %s for writing", lock_file.toUtf8().data());
-                }
-                
-        }
-#endif // USE_QXT_LOCKS
+        QtLockedFile lk(lock_file);
+        lk.open(QFile::ReadWrite);
+
+        if (QDir().exists(Paths::iniPath())) {
+                bool lock_ok = lk.lock(QtLockedFile::WriteLock, false);
+
+                if (!lock_ok) {
+                        //lock failed
+                        qDebug("main: lock failed");
+
+                        // Wait 10 secs max.
+                        int n = 100;
+                        while ( n > 0) {
+                                Helper::msleep(100); // wait 100 ms
+
+                                if (lk.lock(QtLockedFile::WriteLock, false)) break;
+                                n--;
+                                if ((n % 10) == 0) qDebug("main: waiting %d...", n);
+                        }
+                        // Continue startup
+                }
+        }
 #endif // USE_LOCKS
 
@@ -265 +210 @@
         if (c != SMPlayer::NoExit) {
 #if USE_LOCKS
-#if USE_QXT_LOCKS
-                clean_lock(&f, &write_lock);
-#else
-                remove_lock(lock_file);
-#endif
+                lk.unlock();
 #endif
                 return c;
@@ -279 +220 @@
 
 #if USE_LOCKS
-#if USE_QXT_LOCKS
-        clean_lock(&f, &write_lock);
-#else
-        remove_lock(lock_file);
-#endif
+        bool success = lk.unlock();
+        qDebug("Unlocking: %d", success);
 #endif