slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set volume only if volume was explicitly set.

Browse Source 
Change-Id: I0d5abab0ffbf61a74c59ce240fd39e756479026b
Done-with: Juho Hämäläinen <juho.hamalainen@tieto.com>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
This commit is contained in:
Robin Burchell
2014-07-22 18:24:41 +02:00
committed by Robin Burchell
parent e316aa6491
commit 9be98e09bc
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/multimedia/audio/qsoundeffect_pulse_p.cpp
View File

@@ -57,7 +57,7 @@
#include "qsoundeffect_pulse_p.h" #include "qsoundeffect_pulse_p.h"
#if defined(Q_WS_MAEMO_6) #if defined(Q_WS_MAEMO_6) || defined(NEMO_AUDIO)
#include <pulse/ext-stream-restore.h> #include <pulse/ext-stream-restore.h>
#endif #endif
@@ -240,7 +240,7 @@ private:
case PA_CONTEXT_SETTING_NAME: case PA_CONTEXT_SETTING_NAME:
break; break;
case PA_CONTEXT_READY: case PA_CONTEXT_READY:
#if defined(Q_WS_MAEMO_6) #if defined(Q_WS_MAEMO_6) || defined(NEMO_AUDIO)
pa_ext_stream_restore_read(c, &stream_restore_info_callback, self); pa_ext_stream_restore_read(c, &stream_restore_info_callback, self);
pa_ext_stream_restore_set_subscribe_cb(c, &stream_restore_monitor_callback, self); pa_ext_stream_restore_set_subscribe_cb(c, &stream_restore_monitor_callback, self);
pa_ext_stream_restore_subscribe(c, 1, 0, self); pa_ext_stream_restore_subscribe(c, 1, 0, self);
@@ -255,7 +255,7 @@ private:
} }
} }
#if defined(Q_WS_MAEMO_6) #if defined(Q_WS_MAEMO_6) || defined(NEMO_AUDIO)
static void stream_restore_monitor_callback(pa_context *c, void *userdata) static void stream_restore_monitor_callback(pa_context *c, void *userdata)
{ {
@@ -393,6 +393,9 @@ QSoundEffectPrivate::QSoundEffectPrivate(QObject* parent):
m_sample(0), m_sample(0),
m_position(0), m_position(0),
m_resourcesAvailable(false) m_resourcesAvailable(false)
#if defined(Q_WS_MAEMO_6) || defined(NEMO_AUDIO)
, m_customVolume(false)
#endif
{ {
m_ref = new QSoundEffectRef(this); m_ref = new QSoundEffectRef(this);
pa_sample_spec_init(&m_pulseSpec); pa_sample_spec_init(&m_pulseSpec);
@@ -548,6 +551,9 @@ qreal QSoundEffectPrivate::volume() const
void QSoundEffectPrivate::setVolume(qreal volume) void QSoundEffectPrivate::setVolume(qreal volume)
{ {
#if defined(Q_WS_MAEMO_6) || defined(NEMO_AUDIO)
m_customVolume = true;
#endif
m_volume = volume; m_volume = volume;
emit volumeChanged(); emit volumeChanged();
updateVolume(); updateVolume();
@@ -557,6 +563,10 @@ void QSoundEffectPrivate::updateVolume()
{ {
if (m_sinkInputId < 0) if (m_sinkInputId < 0)
return; return;
#if defined(Q_WS_MAEMO_6) || defined(NEMO_AUDIO)
if (!m_customVolume)
return;
#endif
PulseDaemonLocker locker; PulseDaemonLocker locker;
pa_cvolume volume; pa_cvolume volume;
volume.channels = m_pulseSpec.channels; volume.channels = m_pulseSpec.channels;

4
src/multimedia/audio/qsoundeffect_pulse_p.h
View File

@@ -181,6 +181,10 @@ private:
bool m_resourcesAvailable; bool m_resourcesAvailable;
QMediaPlayerResourceSetInterface *m_resources; QMediaPlayerResourceSetInterface *m_resources;
#if defined(Q_WS_MAEMO_6) || defined(NEMO_AUDIO)
bool m_customVolume;
#endif
}; };
QT_END_NAMESPACE QT_END_NAMESPACE