1 files changed, 16 insertions, 17 deletions

diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
index 364e77b..3796549 100644
--- a/core/multimedia/opieplayer/loopcontrol_threaded.cpp
+++ b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
@@ -15,38 +15,37 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #define _REENTRANT
 
 #include <qpe/qpeapplication.h>
+#include <qpe/custom.h>
 #include <qimage.h>
 #include <qpainter.h>
-#ifdef Q_WS_QWS
+#if !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 #include "mediaplayerplugininterface.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 #include <pthread.h>
 #include "loopcontrol.h"
 #include "audiodevice.h"
 #include "videowidget.h"
 #include "audiowidget.h"
 #include "mediaplayerstate.h"
 
 
-#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_IPAQ) || defined(QT_QWS_RAMSES)
-#define USE_REALTIME_AUDIO_THREAD
-#endif
+
 
 
 extern VideoWidget *videoUI; // now only needed to tell it to play a frame
 extern MediaPlayerState *mediaPlayerState;
 
 
 #define DecodeLoopDebug(x)  qDebug x
 //#define DecodeLoopDebug(x)
@@ -251,17 +250,17 @@ void LoopControl::startVideo() {
 
     do {
 
 
 /*
         videoMutex->lock();
         current_frame = int( (double)playtime.elapsed() * (double)framerate / 1000.0 );
         //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC;
-  
+
         // Sync to Audio
 //        current_frame = (long)((double)(audioSampleCounter - 1000) * framerate / (double)freq);
 
         long mSecsToNextFrame = 0;
 
         if ( current_frame == prev_frame ) {
       int nf = current_frame + 1;
       if ( nf > 0 && nf != total_video_frames )
@@ -307,35 +306,35 @@ void LoopControl::startVideo() {
 
       if ( check ) {
     videoMutex->lock();
     if ( current_frame > prev_frame + 1 ) {
        //       qDebug("skipped a frame");
         mediaPlayerState->curDecoder()->videoSetFrame( current_frame, stream );
     }
     prev_frame = current_frame;
-    if ( moreVideo = videoUI->playVideo() ) 
+    if ( moreVideo = videoUI->playVideo() )
         emitChangePos = TRUE;
     videoMutex->unlock();
       }
 
-  } else 
+  } else
       moreVideo = FALSE;
 
     }
 
-    if ( !moreVideo && !moreAudio ) 
+    if ( !moreVideo && !moreAudio )
   emitPlayFinished = TRUE;
 
     pthread_exit(NULL);
 }
 
 void LoopControl::startAudio() {
     moreAudio = TRUE;
-    
+
     while ( moreAudio ) {
 
   if ( !isMuted && mediaPlayerState->curDecoder() && hasAudioChannel ) {
 
       audioMutex->lock();
       currentSample = mediaPlayerState->curDecoder()->audioGetSample( stream );
 
       if ( currentSample == 0 )
@@ -399,17 +398,17 @@ void LoopControl::startAudio() {
       else
     moreAudio = FALSE;
 
   }
     }
 
     //    qDebug( "End of file" );
 
-    if ( !moreVideo && !moreAudio ) 
+    if ( !moreVideo && !moreAudio )
   emitPlayFinished = TRUE;
 
     pthread_exit(NULL);
 }
 
 void LoopControl::killTimers() {
     if ( hasVideoChannel ) {
   if ( pthread_self() != video_tid ) {
@@ -479,17 +478,17 @@ void LoopControl::setPaused( bool pause ) {
     }
 }
 
 
 void LoopControl::stop( bool willPlayAgainShortly ) {
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     if ( !willPlayAgainShortly && disabledSuspendScreenSaver ) {
-  disabledSuspendScreenSaver = FALSE; 
+  disabledSuspendScreenSaver = FALSE;
   // Re-enable the suspend mode
   QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
     }
 #endif
 
     if ( mediaPlayerState->curDecoder() && mediaPlayerState->curDecoder()->isOpen() ) {
 
   killTimers();
@@ -507,19 +506,19 @@ void LoopControl::stop( bool willPlayAgainShortly ) {
 }
 
 
 bool LoopControl::init( const QString& filename ) {
     stop();
     fileName = filename;
     stream = 0; // only play stream 0 for now
     current_frame = total_video_frames = total_audio_samples = 0;
-    
+
     //    qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
-   
+
     // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin
     if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) {
   if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename ) ) {
       total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 );
       mediaPlayerState->libMpeg3Decoder()->close();
   }
     }
 
@@ -529,22 +528,22 @@ bool LoopControl::init( const QString& filename ) {
     hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0;
     hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0;
 
     if ( hasAudioChannel ) {
   int astream = 0;
 
   channels = mediaPlayerState->curDecoder()->audioChannels( astream );
   DecodeLoopDebug(( "channels = %d\n", channels ));
-  
+
   if ( !total_audio_samples )
       total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
 
   mediaPlayerState->setLength( total_audio_samples );
-  
+
   freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
   DecodeLoopDebug(( "frequency = %d\n", freq ));
 
   audioSampleCounter = 0;
 
   static const int bytes_per_sample = 2; //16 bit
 
   audioDevice = new AudioDevice( freq, channels, bytes_per_sample );
@@ -589,19 +588,19 @@ bool LoopControl::init( const QString& filename ) {
     return TRUE;
 }
 
 
 void LoopControl::play() {
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     if ( !disabledSuspendScreenSaver ) {
-  disabledSuspendScreenSaver = TRUE; 
+  disabledSuspendScreenSaver = TRUE;
         // Stop the screen from blanking and power saving state
-  QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) 
+  QCopEnvelope("QPE/System", "setScreenSaverMode(int)" )
       << ( hasVideoChannel ? QPEApplication::Disable : QPEApplication::DisableSuspend );
     }
 #endif
 
     //begin = clock();
     playtime.start();
     startTimers();
     //updateGeometry();