Merge origin/master

3 files changed, 15 insertions, 3 deletions

diff --git a/plugins/audio/audio-alsa.c b/plugins/audio/audio-alsa.c
index 7310ea89..bc777fce 100644
--- a/plugins/audio/audio-alsa.c
+++ b/plugins/audio/audio-alsa.c
@@ -130,6 +130,8 @@ PUBLIC unsigned char _alsa_init (const char *name, audioCtxHandleT *ctx) {
     ctx->mute = _alsa_get_mute (num);
     ctx->idx = num;
 
+    if (verbose) fprintf (stderr, "Successfully initialized ALSA backend.\n");
+
     return 0;
 }
 
diff --git a/plugins/audio/audio-api.c b/plugins/audio/audio-api.c
index 4a8d0da1..637f9d03 100644
--- a/plugins/audio/audio-api.c
+++ b/plugins/audio/audio-api.c
@@ -22,10 +22,18 @@
 
 void _backend_init (const char *name, audioCtxHandleT *ctx) {
 
+    char *backend_env = getenv ("AFB_AUDIO_OUTPUT");
+    unsigned char res = -1;
+
 # ifdef HAVE_PULSE
-    if (_pulse_init (name, ctx) < 0)
-# endif
-    _alsa_init (name, ctx);
+    if (!backend_env || (strcasecmp (backend_env, "Alsa") != 0))
+        res = _pulse_init (name, ctx);
+    if (res < 0)
+#endif
+    res = _alsa_init (name, ctx);
+
+    if (res < 0 && verbose)
+        fprintf (stderr, "Could not initialize Audio backend\n");
 }
 
 void _backend_free (audioCtxHandleT *ctx) {
diff --git a/plugins/audio/audio-pulse.c b/plugins/audio/audio-pulse.c
index 4caf3db5..ceffcf7d 100644
--- a/plugins/audio/audio-pulse.c
+++ b/plugins/audio/audio-pulse.c
@@ -94,6 +94,8 @@ PUBLIC unsigned char _pulse_init (const char *name, audioCtxHandleT *ctx) {
 
     client_count++;
 
+    if (verbose) fprintf (stderr, "Successfully initialized PulseAudio backend.\n");
+
     return 0;
 }