diff options
| author | Bartosz Golaszewski <brgl@bgdev.pl> | 2017-07-12 09:41:17 +0200 |
|---|---|---|
| committer | Bartosz Golaszewski <brgl@bgdev.pl> | 2017-07-12 09:27:46 +0000 |
| commit | 87c39fe66964e2c4b56d0628a4215b07e258545a (patch) | |
| tree | 5e5926344adbc38fd64362add33f36f574a82a3d /src/multimedia/audio | |
| parent | acdec68b25aa99f6ae466100f112002b74b695dd (diff) | |
| download | qtmultimedia-87c39fe66964e2c4b56d0628a4215b07e258545a.tar.gz | |
PulseAudio: allow to disable the pulseaudio autospawn feature
By default pa_context_connect() tries to spawn a new pulseaudio
instance if it the connection fails. This is not always desirable.
Add a new environment variable: QT_PULSE_NOAUTOSPAWN which - when
set - will make QSoundEffect pass the PA_CONTEXT_NOAUTOSPAWN flag
to pa_context_connect() thus disabling the autospawn feature.
Change-Id: I623639fd5a262c8fefbd683fa9481916e79bdf0e
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/qsoundeffect_pulse_p.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/audio/qsoundeffect_pulse_p.cpp b/src/multimedia/audio/qsoundeffect_pulse_p.cpp index 76cb657e3..5dbc1a0c9 100644 --- a/src/multimedia/audio/qsoundeffect_pulse_p.cpp +++ b/src/multimedia/audio/qsoundeffect_pulse_p.cpp @@ -192,8 +192,9 @@ private Q_SLOTS: const QByteArray srvStrEnv = qgetenv("QT_PULSE_SERVER_STRING"); const char *srvStr = srvStrEnv.isNull() ? 0 : srvStrEnv.constData(); + pa_context_flags_t flags = qEnvironmentVariableIsSet("QT_PULSE_NOAUTOSPAWN") ? PA_CONTEXT_NOAUTOSPAWN : (pa_context_flags_t)0; - if (pa_context_connect(m_context, srvStr, (pa_context_flags_t)0, 0) < 0) { + if (pa_context_connect(m_context, srvStr, flags, 0) < 0) { qWarning("PulseAudioService: pa_context_connect() failed"); pa_context_unref(m_context); unlock(); |