summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp37
-rw-r--r--core/multimedia/opieplayer/loopcontrol_threaded.cpp33
2 files changed, 35 insertions, 35 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 @@
#include <qpe/config.h>
+#include <qpe/custom.h>
#include <qmessagebox.h>
@@ -33,4 +34,4 @@
-#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
@@ -47,7 +48,7 @@
-# if defined(QT_QWS_IPAQ)
-static const int sound_fragment_shift = 14;
-# else
+#ifdef OPIE_SOUND_FRAGMENT_SHIFT
+static const int sound_fragment_shift = OPIE_SOUND_FRAGMENT_SHIFT;
+#else
static const int sound_fragment_shift = 16;
-# endif
+#endif
static const int sound_fragment_bytes = (1<<sound_fragment_shift);
@@ -147,6 +148,6 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
//#endif
-// qDebug( "setting volume to: 0x%x", volume );
+// qDebug( "setting volume to: 0x%x", volume );
#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
// Send notification that the volume has changed
- QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted;
+ QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << muted;
#endif
@@ -158,3 +159,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
// qDebug("creating new audio device");
-// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
+// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
d = new AudioDevicePrivate;
@@ -174,3 +175,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
-
+
#ifdef KEEP_DEVICE_OPEN
@@ -189,3 +190,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
}
-#ifdef KEEP_DEVICE_OPEN
+#ifdef KEEP_DEVICE_OPEN
AudioDevicePrivate::dspFd = d->handle;
@@ -211,3 +212,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
}
-// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
+// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
@@ -217,3 +218,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
d->can_GETOSPACE = TRUE; // until we find otherwise
-
+
//if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels );
@@ -224,5 +225,5 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
//if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" );
-
+
}
-
+
@@ -231,4 +232,4 @@ AudioDevice::~AudioDevice() {
// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
-
-# ifndef KEEP_DEVICE_OPEN
+
+# ifndef KEEP_DEVICE_OPEN
close( d->handle ); // Now it should be safe to shut the handle
@@ -238,3 +239,3 @@ AudioDevice::~AudioDevice() {
// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
-
+
}
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 );