Changeset 176 for smplayer/trunk/src/playerprocess.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/playerprocess.cpp (copied) (copied from smplayer/vendor/current/src/playerprocess.cpp ) (3 diffs)

smplayer/trunk/src/playerprocess.cpp

@@ -48 +48 @@
         if (isRunning()) {
                 qDebug("PlayerProcess::writeToStdin: %s", text.toUtf8().constData());
+#if !defined(Q_OS_OS2)
                 #ifdef Q_OS_WIN
                 write( text.toUtf8() + "\n");
@@ -53 +54 @@
                 write( text.toLocal8Bit() + "\n");
                 #endif
+#else
+                PpipeWrite( text.toLocal8Bit() + "\n");
+#endif
         } else {
                 qWarning("PlayerProcess::writeToStdin: process not running");
         }
+#ifdef Q_OS_OS2
+        if (text == "quit" || text == "quit\n") {
+                PpipeClose();
+        }
+#endif
+
 }
 
@@ -98 +108 @@
 #endif
 
+#ifdef Q_OS_OS2
+void PlayerProcess::PpipeOpen(const char *szPipeName) {
+        DosCreateNPipe( szPipeName, &hpipe, NP_ACCESS_DUPLEX, 1, 1024, 1024, 0 );
+}
+
+void PlayerProcess::PpipeClose( void ) {
+        DosClose( hpipe );
+}
+
+void PlayerProcess::PpipeWrite( const QByteArray text ) {
+        // MPlayer quitted ?
+        if ( !isRunning() )
+                return;
+
+// 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 sleep");
+                DosSleep(10);
+        }
+// 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");
+        }
+        delete pipeThread;
+}
+
+PipeThread::PipeThread(const QByteArray t, const HPIPE pipe) {
+        text = t;
+        hpipe = pipe;
+}
+
+PipeThread::~PipeThread() {
+}
+
+void PipeThread::run() {
+        ULONG cbActual;
+        APIRET rc = NO_ERROR; 
+
+        rc = DosConnectNPipe( hpipe );
+        if (rc != NO_ERROR) 
+                return;
+
+//      qDebug("pipe connected");    
+        DosWrite( hpipe, text.data(), strlen( text.data() ), &cbActual );
+
+        // Wait for ACK
+        DosRead( hpipe, &cbActual, sizeof( ULONG ), &cbActual );
+        DosDisConnectNPipe( hpipe );
+        return;
+}
+#endif
+
 #include "moc_playerprocess.cpp"