-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 9 | ||||
-rw-r--r-- | core/multimedia/opieplayer/loopcontrol_threaded.cpp | 7 |
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 | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <stdio.h> | 24 | #include <stdio.h> |
25 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
27 | #include <qpe/custom.h> | ||
27 | #include <qmessagebox.h> | 28 | #include <qmessagebox.h> |
28 | 29 | ||
29 | #include "audiodevice.h" | 30 | #include "audiodevice.h" |
@@ -31,8 +32,8 @@ | |||
31 | 32 | ||
32 | #include <errno.h> | 33 | #include <errno.h> |
33 | 34 | ||
34 | #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP) | 35 | #if !defined(QT_NO_COP) |
35 | #include "qpe/qcopenvelope_qws.h" | 36 | #include <qpe/qcopenvelope_qws.h> |
36 | #endif | 37 | #endif |
37 | 38 | ||
38 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) | 39 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) |
@@ -45,8 +46,8 @@ | |||
45 | #include <unistd.h> | 46 | #include <unistd.h> |
46 | #endif | 47 | #endif |
47 | 48 | ||
48 | # if defined(QT_QWS_IPAQ) | 49 | #ifdef OPIE_SOUND_FRAGMENT_SHIFT |
49 | static const int sound_fragment_shift = 14; | 50 | static const int sound_fragment_shift = OPIE_SOUND_FRAGMENT_SHIFT; |
50 | # else | 51 | # else |
51 | static const int sound_fragment_shift = 16; | 52 | static const int sound_fragment_shift = 16; |
52 | # endif | 53 | # endif |
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 | |||
@@ -20,9 +20,10 @@ | |||
20 | #define _REENTRANT | 20 | #define _REENTRANT |
21 | 21 | ||
22 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
23 | #include <qpe/custom.h> | ||
23 | #include <qimage.h> | 24 | #include <qimage.h> |
24 | #include <qpainter.h> | 25 | #include <qpainter.h> |
25 | #ifdef Q_WS_QWS | 26 | #if !defined(QT_NO_COP) |
26 | #include <qpe/qcopenvelope_qws.h> | 27 | #include <qpe/qcopenvelope_qws.h> |
27 | #endif | 28 | #endif |
28 | #include "mediaplayerplugininterface.h" | 29 | #include "mediaplayerplugininterface.h" |
@@ -39,9 +40,7 @@ | |||
39 | #include "mediaplayerstate.h" | 40 | #include "mediaplayerstate.h" |
40 | 41 | ||
41 | 42 | ||
42 | #if defined(QT_QWS_SL5XXX) || defined(QT_QWS_IPAQ) || defined(QT_QWS_RAMSES) | 43 | |
43 | #define USE_REALTIME_AUDIO_THREAD | ||
44 | #endif | ||
45 | 44 | ||
46 | 45 | ||
47 | extern VideoWidget *videoUI; // now only needed to tell it to play a frame | 46 | extern VideoWidget *videoUI; // now only needed to tell it to play a frame |