Changeset 119 for smplayer/trunk/src/mplayerprocess.cpp

Timestamp:

Dec 27, 2011, 5:44:12 PM (14 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: latest svn update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/mplayerprocess.cpp (modified) (5 diffs)

smplayer/trunk/src/mplayerprocess.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -83 +83 @@
         return waitForStarted();
 #else
-        bool r = waitForStarted();
-        if (r) {
-           pidMP = QProcess::pid();
-           qDebug("MPlayer PID %i", pidMP);
-           MPpipeOpen();
-        }
-        return r;
+        bool r = waitForStarted();
+        if (r) {
+                pidMP = QProcess::pid();
+                qDebug("MPlayer PID %i", pidMP);
+                MPpipeOpen();
+        }
+        return r;
 #endif
 }
@@ -99 +99 @@
                 write( text.toLocal8Bit() + "\n");
 #else
-                MPpipeWrite( text.toLocal8Bit() + "\n");
+                MPpipeWrite( text.toLocal8Bit() + "\n");
 #endif
         } else {
@@ -105 +105 @@
         }
 #ifdef Q_OS_OS2
-        if (text == "quit" || text == "quit\n") {
-           MPpipeClose();
-        }
-#endif
-}
+        if (text == "quit" || text == "quit\n") {
+                MPpipeClose();
+        }
+#endif
+}
+
 #ifdef Q_OS_OS2
-void MplayerProcess::MPpipeOpen()
-{
-    char    szPipeName[ 100 ];
-    sprintf( szPipeName, "\\PIPE\\MPLAYER\\%x", pidMP );
-    DosCreateNPipe( szPipeName, &hpipe, NP_ACCESS_DUPLEX, 1, 1024, 1024, 0 );
-}
-
-void MplayerProcess::MPpipeClose( void )
-{
-    DosClose( hpipe );
-}
-
-void MplayerProcess::MPpipeWrite( const QByteArray text )
-{
-       // MPlayer quitted ?
-    if ( !isRunning() )
-          return;
+void MplayerProcess::MPpipeOpen() {
+        char szPipeName[ 100 ];
+        sprintf( szPipeName, "\\PIPE\\MPLAYER\\%x", pidMP );
+        DosCreateNPipe( szPipeName, &hpipe, NP_ACCESS_DUPLEX, 1, 1024, 1024, 0 );
+}
+
+void MplayerProcess::MPpipeClose( void ) {
+        DosClose( hpipe );
+}
+
+void MplayerProcess::MPpipeWrite( 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 = new PipeThread(text, hpipe);
     
-    pipeThread->start();
-    while (!pipeThread->isRunning() && !pipeThread->isFinished()) {
-       qDebug("we sleep");
-       DosSleep(10);
-    }
+        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;
-
-}
-
+        int count = 0;
+        while (!pipeThread->wait(100) && count < 20) {
+                count ++;
+        }
+        if (count >= 20) {
+                pipeThread->terminate();
+                qDebug("pipe communication terminated");
+        }
+        delete pipeThread;
+}
 #endif
 
@@ -874 +870 @@
 
 #ifdef Q_OS_OS2
-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;
-}
-
+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