diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-02 11:34:47 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-03-02 11:34:47 (GMT) |
| commit | d0201585c4ba5513dc80f228723709aa8c8205d2 (patch) | |
| tree | bbd9db45afec26fa29214de6f156b54c4bb76b69 /src/multimedia | |
| parent | caaf11aeacaf8922413668b37834dbb4e63ac78c (diff) | |
| parent | 7afc26c45ba19ba1fa077629e388be32ea1664bc (diff) | |
| download | Qt-d0201585c4ba5513dc80f228723709aa8c8205d2.zip Qt-d0201585c4ba5513dc80f228723709aa8c8205d2.tar.gz Qt-d0201585c4ba5513dc80f228723709aa8c8205d2.tar.bz2 | |
Merge remote branch 'berlin/4.7' into 4.7
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/qml/qsoundeffect_pulse_p.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/qml/qsoundeffect_pulse_p.cpp b/src/multimedia/qml/qsoundeffect_pulse_p.cpp index 7e9a25c..d99bf4b 100644 --- a/src/multimedia/qml/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/qml/qsoundeffect_pulse_p.cpp @@ -63,7 +63,7 @@ #include "qsoundeffect_pulse_p.h" -#if(Q_WS_MAEMO_5) +#if defined(Q_WS_MAEMO_5) #include <pulse/ext-stream-restore.h> #endif @@ -157,7 +157,7 @@ private: lock(); m_context = pa_context_new(m_mainLoopApi, QString(QLatin1String("QtPulseAudio:%1")).arg(::getpid()).toAscii().constData()); -#if(Q_WS_MAEMO_5) +#if defined(Q_WS_MAEMO_5) pa_context_set_state_callback(m_context, context_state_callback, this); #endif if (m_context == 0) { @@ -185,7 +185,7 @@ private: m_prepared = false; } -#if(Q_WS_MAEMO_5) +#if defined(Q_WS_MAEMO_5) static void context_state_callback(pa_context *c, void *userdata) { PulseDaemon *self = reinterpret_cast<PulseDaemon*>(userdata); @@ -301,7 +301,7 @@ void QSoundEffectPrivate::play() pa_volume_t m_vol = PA_VOLUME_NORM; daemon()->lock(); -#if(Q_WS_MAEMO_5) +#if defined(Q_WS_MAEMO_5) m_vol = PA_VOLUME_NORM/100*((daemon()->volume()+m_vol)/2); #endif pa_operation_unref( |