summaryrefslogtreecommitdiff
path: root/src/multimedia/audio
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-02-12 14:11:35 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-02-12 14:11:35 +0100
commitc6ec402d257dfc49a98d2f88989b6dfee7bc4e8a (patch)
tree92a278d08342bb85e2fe18d2ea78d66530984aca /src/multimedia/audio
parent7a02bcaad18d7aa133944a23f863c2f9efcbf5fe (diff)
parentdb7f7cc5654ddec60297259bc9f86f5f777749cd (diff)
downloadqtmultimedia-c6ec402d257dfc49a98d2f88989b6dfee7bc4e8a.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie93615076177662e75d46f3d13beeb88d424b4a6
Diffstat (limited to 'src/multimedia/audio')
-rw-r--r--src/multimedia/audio/qsoundeffect_pulse_p.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
index 23e8d727f..ef09cd90a 100644
--- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp
+++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp
@@ -928,12 +928,8 @@ void QSoundEffectPrivate::createPulseStream()
return;
pa_proplist *propList = pa_proplist_new();
- if (m_category.isNull()) {
- // Meant to be one of the strings "video", "music", "game", "event", "phone", "animation", "production", "a11y", "test"
- pa_proplist_sets(propList, PA_PROP_MEDIA_ROLE, "game");
- } else {
+ if (!m_category.isNull())
pa_proplist_sets(propList, PA_PROP_MEDIA_ROLE, m_category.toLatin1().constData());
- }
pa_stream *stream = pa_stream_new_with_proplist(pulseDaemon()->context(), m_name.constData(), &m_pulseSpec, 0, propList);
pa_proplist_free(propList);