From b0f7f5063ca14d2d81ac6bbbe221aac98343989f Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Tue, 12 May 2009 21:21:24 +0000 Subject: [PATCH] Report correct sound server name (noted by Don Harrop). SVN revision: 40606 --- src/sound.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/sound.c b/src/sound.c index 8ae5320d..43c20d5c 100644 --- a/src/sound.c +++ b/src/sound.c @@ -30,6 +30,14 @@ #include "sound.h" #include "sounds.h" +#if HAVE_SOUND_ESD +#define SOUND_SERVER_NAME "esd" +#elif HAVE_SOUND_PA +#define SOUND_SERVER_NAME "pulseaudio" +#else +#error Invalid sound configuration +#endif + #define N_SOUNDS (SOUND_NOT_USED - 1) typedef struct { @@ -301,8 +309,8 @@ SoundInit(void) Conf_sound.enable = 0; AlertX(_("Error initialising sound"), _("OK"), NULL, NULL, _("Audio was enabled for Enlightenment but there was an error\n" - "communicating with the audio server (Esound). Audio will\n" - "now be disabled.\n")); + "communicating with the audio server (%s).\n" + "Audio will now be disabled.\n"), SOUND_SERVER_NAME); } _SoundConfigLoad();