Changeset 110

Timestamp:

Jun 30, 2010, 6:45:00 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Smplayer: fixed a 1second delay

Location:

smplayer/trunk

Files:

• build_os2.cmd (modified) (2 diffs)
• liesmich.os2 (modified) (2 diffs)
• lisezmoi.os2 (modified) (2 diffs)
• readme.os2 (modified) (2 diffs)
• src/mplayerprocess.cpp (modified) (2 diffs)
• src/svn_revision.h (modified) (1 diff)

smplayer/trunk/build_os2.cmd

@@ -10 +10 @@
 /* version 0.2.6 from 29.01.2010 Silvan (added more readmes) */
 /* 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) */
 
 /* init the version string (don't forget to change) */
-version = "0.2.7"
-version_date = "29.04.2010"
+version = "0.2.8"
+version_date = "20.05.2010"
 smplayer_version = "0.6.9"
 smplayer_build = "beta1"
+internal_build = "0_6_9-b2"
 '@echo off'
 
@@ -134 +136 @@
 /* zip all up */
         ok = directory(installDir)
-        address cmd 'zip -r smplayer.zip *'
+        cmdtorun = 'zip -r smplayer-' || internal_build || '.zip *'
+        address cmd cmdtorun
         ok = directory(rootdir)
     end

smplayer/trunk/liesmich.os2

@@ -93 +93 @@
 * Qt4 dll
 
-    ftp://ftp.netlabs.org/pub/qt4/qt-lib-4_5_1-xx.wpi (ersetzen Sie xx mit der aktuellsten version)
-    falls die GA verfgbar ist, befindet sie sich im Unterverzeichniss 4.5.1-ga.
-
+    unter http://svn.netlabs.org/qt4 finden Sie die n”tigen Angaben wo Sie Qt4 bekommen und wie man es installiert
+ 
 * MPlayer
 
@@ -271 +270 @@
 =========================
 
+2010-06-30
+  * fixed a nasty 1 second delay
+
 2010-04-29
   * updated to Qt4 4.6.2

smplayer/trunk/lisezmoi.os2

@@ -113 +113 @@
 * Qt4 dll
 
-    ftp://ftp.netlabs.org/pub/qt4/qt-lib-4_5_1-xx.wpi (exchange xx with the most current available)
-    if GA is available it's in it's own subdir 4.5.1-ga
+    see http://svn.netlabs.org/qt4 for more information whats needed
 
 * MPlayer
@@ -310 +309 @@
 ==========================
 
+2010-06-30
+  * fixed a nasty 1 second delay
+
 2010-04-29
   * updated to Qt4 4.6.2

smplayer/trunk/readme.os2

@@ -80 +80 @@
 * Qt4 dll
 
-    ftp://ftp.netlabs.org/pub/qt4/qt-lib-4_5_1-xx.wpi (exchange xx with the most current available)
-    if GA is available it's in it's own subdir 4.5.1-ga
+    see http://svn.netlabs.org/qt4 for more information whats needed
 
 * MPlayer
@@ -261 +260 @@
 ==========
 
+2010-06-30
+  * fixed a nasty 1 second delay
+
 2010-04-29
   * updated to Qt4 4.6.2

smplayer/trunk/src/mplayerprocess.cpp

@@ -129 +129 @@
           return;
 
-// as things could hang when pipe communication is done direct here, i do a seperate thread for it */
+// as things could hang when pipe communication is done direct here, i do a seperate thread for it
     pipeThread = new PipeThread(text, hpipe);
     
     pipeThread->start();
     while (!pipeThread->isRunning() && !pipeThread->isFinished()) {
-       qDebug("we spleep");
+       qDebug("we sleep");
        DosSleep(10);
     }
-    if (!pipeThread->wait(2000)) {
+// we wait for max 2 seconds for the thread to be ended (we to this with max 20 loops)
+    int count = 0;
+    while (!pipeThread->wait(100) && count < 20) {
+       count ++;
+    }
+    if (count >= 20) {
        pipeThread->terminate();
        qDebug("pipe communication terminated");
@@ -889 +894 @@
        return;
 
-    qDebug("pipe connected");    
+//    qDebug("pipe connected");    
     DosWrite( hpipe, text.data(), strlen( text.data() ), &cbActual );
 

smplayer/trunk/src/svn_revision.h

@@ -1 @@
-#define SVN_REVISION "SVN-rUNKNOWN"
+#define SVN_REVISION "SVN-r92"