From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Brad Smith" <brad@comstyle.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH v3 4/6] audio: check for pulseaudio daemon pidfile
Date: Thu, 24 Jan 2019 12:20:53 +0100 [thread overview]
Message-ID: <20190124112055.547-5-kraxel@redhat.com> (raw)
In-Reply-To: <20190124112055.547-1-kraxel@redhat.com>
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 <kraxel@redhat.com>
---
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
next prev parent reply other threads:[~2019-01-24 11:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 11:20 [Qemu-devel] [PATCH v3 0/6] audio: rework driver probing Gerd Hoffmann
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 1/6] audio: use pkg-config Gerd Hoffmann
2019-01-24 11:39 ` Philippe Mathieu-Daudé
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 2/6] audio: allow optional audio drivers Gerd Hoffmann
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 3/6] audio: use try-sdl for openbsd Gerd Hoffmann
2019-01-24 11:20 ` Gerd Hoffmann [this message]
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 5/6] audio: error message tweak Gerd Hoffmann
2019-01-24 11:40 ` Philippe Mathieu-Daudé
2019-01-24 11:20 ` [Qemu-devel] [PATCH v3 6/6] audio: probe audio drivers by default Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190124112055.547-5-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=brad@comstyle.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).