Changeset 116

Timestamp:

Dec 14, 2011, 2:31:02 PM (13 years ago)

Author:

Silvan Scherrer

Message:

smplayer: prevent some gui hang

Location:

smplayer/trunk

Files:

• build_os2.cmd (modified) (2 diffs)
• liesmich.os2 (modified) (1 diff)
• lisezmoi.os2 (modified) (1 diff)
• readme.os2 (modified) (1 diff)
• src/core.cpp (modified) (3 diffs)
• src/debug (deleted)
• src/release (deleted)

smplayer/trunk/build_os2.cmd

@@ -11 +11 @@
 /* version 0.2.7 from 29.04.2010 Silvan (added smplayer version for sed'ing readme's */
 /* version 0.2.8 from 20.05.2010 Silvan (added version to zip) */
+/* version 0.2.9 from 11.11.2011 Silvan (adapted to Qt 4.7.3) */
 
 /* init the version string (don't forget to change) */
-version = "0.2.8"
-version_date = "20.05.2010"
+version = "0.2.9"
+version_date = "11.11.2011"
 smplayer_version = "0.6.9"
-smplayer_build = "beta1"
-internal_build = "0_6_9-b2"
+smplayer_build = "build3"
+internal_build = "0_6_9-b3"
 '@echo off'
 
@@ -113 +114 @@
 
 /* copy the exe and the icon (including rename and setting the new LONGNAME EA) */
-        ok = SysCopyObject(srcDir||'\release\smplayer.exe',installDir)
+        ok = SysCopyObject(srcDir||'\smplayer.exe',installDir)
         ok = SysCopyObject(srcDir||'\smplayer_os2.ico',installDir)
         address cmd 'ren 'installDir'\smplayer_os2.ico smplayer.ico'

smplayer/trunk/liesmich.os2

@@ -270 +270 @@
 =========================
 
+2011-11-11
+  * updated to Qt 4.7.3
+  * fixed a possible hang when ending smplayer while playing a movie (patch by Rudi)
+
 2010-06-30
   * fixed a nasty 1 second delay

smplayer/trunk/lisezmoi.os2

@@ -309 +309 @@
 ==========================
 
+2011-11-11
+  * updated to Qt 4.7.3
+  * fixed a possible hang when ending smplayer while playing a movie (patch by Rudi)
+
 2010-06-30
   * fixed a nasty 1 second delay

smplayer/trunk/readme.os2

@@ -260 +260 @@
 ==========
 
+2011-11-11
+  * updated to Qt 4.7.3
+  * fixed a possible hang when ending smplayer while playing a movie (patch by Rudi)
+
 2010-06-30
   * fixed a nasty 1 second delay

smplayer/trunk/src/core.cpp

@@ -22 +22 @@
 #include <QRegExp>
 #include <QTextStream>
+#include <QEventLoop>
 
 #include <cmath>
@@ -2227 +2228 @@
         }
 
+#ifdef Q_OS_OS2
+        QEventLoop eventLoop;
+
+        connect(proc, SIGNAL(processExited()), &eventLoop, SLOT(quit()));
+
+        tellmp("quit");
+
+        QTimer::singleShot(5000, &eventLoop, SLOT(quit()));
+        eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
+
+        if (proc->isRunning()) {
+                qWarning("Core::stopMplayer: process didn't finish. Killing it...");
+                proc->kill();
+        }
+#else
     tellmp("quit");
     
@@ -2234 +2250 @@
                 proc->kill();
         }
+#endif
 
         qDebug("Core::stopMplayer: Finished. (I hope)");