[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 4/6] audio: check for pulseaudio daemon pidfile
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v3 4/6] audio: check for pulseaudio daemon pidfile |
Date: |
Thu, 24 Jan 2019 12:20:53 +0100 |
Check whenever the pulseaudio daemon pidfile is present before trying to
initialize the pulseaudio backend. Just return NULL if that is not the
case, so qemu will check the next backend in line.
In case the user explicitly configured a non-default pulseaudio server
skip the check.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
audio/paaudio.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 4c100bc318..6153b908da 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -814,6 +814,21 @@ static PAConf glob_conf = {
static void *qpa_audio_init (void)
{
+ if (glob_conf.server == NULL) {
+ char pidfile[64];
+ char *runtime;
+ struct stat st;
+
+ runtime = getenv("XDG_RUNTIME_DIR");
+ if (!runtime) {
+ return NULL;
+ }
+ snprintf(pidfile, sizeof(pidfile), "%s/pulse/pid", runtime);
+ if (stat(pidfile, &st) != 0) {
+ return NULL;
+ }
+ }
+
paaudio *g = g_malloc(sizeof(paaudio));
g->conf = glob_conf;
g->mainloop = NULL;
--
2.9.3
- [Qemu-devel] [PATCH v3 0/6] audio: rework driver probing., Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 2/6] audio: allow optional audio drivers., Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 4/6] audio: check for pulseaudio daemon pidfile,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v3 1/6] audio: use pkg-config, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 6/6] audio: probe audio drivers by default, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 3/6] audio: use try-sdl for openbsd, Gerd Hoffmann, 2019/01/24
- [Qemu-devel] [PATCH v3 5/6] audio: error message tweak, Gerd Hoffmann, 2019/01/24