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

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Change-Id: Ie93615076177662e75d46f3d13beeb88d424b4a6
This commit is contained in:
Frederik Gladhorn
2014-02-12 14:11:35 +01:00
parent 7a02bcaad1 db7f7cc565
commit c6ec402d25
19 changed files with 908 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);