-Kill stupid QCOP check

-introduce OPIE_SOUND_FRAGMENT_SHIFT
-USE_REALTIME_AUDIO_THREAD is now defined in custom.h

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
@@ -22,5 +22,6 @@
 #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>
@@ -41,5 +42,3 @@
 
-#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_IPAQ) || defined(QT_QWS_RAMSES)
-#define USE_REALTIME_AUDIO_THREAD
-#endif
+
 
@@ -258,3 +257,3 @@ void LoopControl::startVideo() {
         //current_frame = ( clock() - begin ) * (double)framerate / CLOCKS_PER_SEC;
-  
+
         // Sync to Audio
@@ -314,3 +313,3 @@ void LoopControl::startVideo() {
     prev_frame = current_frame;
-    if ( moreVideo = videoUI->playVideo() ) 
+    if ( moreVideo = videoUI->playVideo() )
         emitChangePos = TRUE;
@@ -319,3 +318,3 @@ void LoopControl::startVideo() {
 
-  } else 
+  } else
       moreVideo = FALSE;
@@ -324,3 +323,3 @@ void LoopControl::startVideo() {
 
-    if ( !moreVideo && !moreAudio ) 
+    if ( !moreVideo && !moreAudio )
   emitPlayFinished = TRUE;
@@ -332,3 +331,3 @@ void LoopControl::startAudio() {
     moreAudio = TRUE;
-    
+
     while ( moreAudio ) {
@@ -406,3 +405,3 @@ void LoopControl::startAudio() {
 
-    if ( !moreVideo && !moreAudio ) 
+    if ( !moreVideo && !moreAudio )
   emitPlayFinished = TRUE;
@@ -486,3 +485,3 @@ void LoopControl::stop( bool willPlayAgainShortly ) {
     if ( !willPlayAgainShortly && disabledSuspendScreenSaver ) {
-  disabledSuspendScreenSaver = FALSE; 
+  disabledSuspendScreenSaver = FALSE;
   // Re-enable the suspend mode
@@ -514,5 +513,5 @@ bool LoopControl::init( const QString& filename ) {
     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
@@ -536,3 +535,3 @@ bool LoopControl::init( const QString& filename ) {
   DecodeLoopDebug(( "channels = %d\n", channels ));
-  
+
   if ( !total_audio_samples )
@@ -541,3 +540,3 @@ bool LoopControl::init( const QString& filename ) {
   mediaPlayerState->setLength( total_audio_samples );
-  
+
   freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
@@ -596,5 +595,5 @@ void LoopControl::play() {
     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 );