-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 | |||
@@ -26,2 +26,3 @@ | |||
26 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
27 | #include <qpe/custom.h> | ||
27 | #include <qmessagebox.h> | 28 | #include <qmessagebox.h> |
@@ -33,4 +34,4 @@ | |||
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 |
@@ -47,4 +48,4 @@ | |||
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 |
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 @@ | |||
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> |
@@ -41,5 +42,3 @@ | |||
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 | ||