summaryrefslogtreecommitdiff
authorzecke <zecke>2003-10-07 12:53:39 (UTC)
committer zecke <zecke>2003-10-07 12:53:39 (UTC)
commite65d5c86b5fff521dfb94282a96606546bad9585 (patch) (side-by-side diff)
tree7aee07687deec9dec91031a0a7f70fc802d47c06
parent877f982ab6996b85870befffcacdef84a6700746 (diff)
downloadopie-e65d5c86b5fff521dfb94282a96606546bad9585.zip
opie-e65d5c86b5fff521dfb94282a96606546bad9585.tar.gz
opie-e65d5c86b5fff521dfb94282a96606546bad9585.tar.bz2
-Kill stupid QCOP check
-introduce OPIE_SOUND_FRAGMENT_SHIFT -USE_REALTIME_AUDIO_THREAD is now defined in custom.h
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp9
-rw-r--r--core/multimedia/opieplayer/loopcontrol_threaded.cpp7
2 files changed, 8 insertions, 8 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index 6a38fc9..d296d27 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -23,17 +23,18 @@
#include <stdlib.h>
#include <stdio.h>
#include <qpe/qpeapplication.h>
#include <qpe/config.h>
+#include <qpe/custom.h>
#include <qmessagebox.h>
#include "audiodevice.h"
#include <errno.h>
-#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
-#include "qpe/qcopenvelope_qws.h"
+#if !defined(QT_NO_COP)
+#include <qpe/qcopenvelope_qws.h>
#endif
#if defined(Q_WS_X11) || defined(Q_WS_QWS)
#include <fcntl.h>
@@ -44,10 +45,10 @@
#include <sys/types.h>
#include <unistd.h>
#endif
-# if defined(QT_QWS_IPAQ)
-static const int sound_fragment_shift = 14;
+#ifdef OPIE_SOUND_FRAGMENT_SHIFT
+static const int sound_fragment_shift = OPIE_SOUND_FRAGMENT_SHIFT;
# else
static const int sound_fragment_shift = 16;
# endif
static const int sound_fragment_bytes = (1<<sound_fragment_shift);
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
@@ -19,11 +19,12 @@
**********************************************************************/
#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>
@@ -38,11 +39,9 @@
#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;