From 3c7517357347d0aa74e2dd79a3b730433069a4ce Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Wed, 30 Dec 2020 20:31:05 +0100
Subject: [PATCH] Sound: autofoo cosmetics

---
 configure.ac    | 20 ++++++++++----------
 src/Makefile.am | 20 ++++++++++----------
 src/sound.c     |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7f6480c3..28e8ad16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,7 +137,7 @@ if test "x$enable_sound" = "xpulseaudio"; then
     AC_DEFINE(USE_SOUND_PULSE, 1, [PulseAudio sound support]),
     enable_sound=no)
 fi
-AM_CONDITIONAL(USE_LIBPA, test "x$enable_sound" = "xpulseaudio")
+AM_CONDITIONAL(USE_SOUND_PULSE, test "x$enable_sound" = "xpulseaudio")
 
 if test "x$enable_sound" = "xesound"; then
   AM_PATH_ESD(0.2.17,,[
@@ -148,7 +148,7 @@ if test "x$enable_sound" = "xesound"; then
     AC_DEFINE(USE_SOUND_ESD, 1, [EsounD sound support])
   fi
 fi
-AM_CONDITIONAL(USE_LIBESD, test "x$enable_sound" = "xesound")
+AM_CONDITIONAL(USE_SOUND_ESD, test "x$enable_sound" = "xesound")
 
 if test "x$enable_sound" = "xsndio"; then
   AC_CHECK_HEADERS(sndio.h,, enable_sound=no
@@ -159,7 +159,14 @@ if test "x$enable_sound" = "xsndio"; then
     AC_DEFINE(USE_SOUND_SNDIO, 1, [Sndio sound support])
   fi
 fi
-AM_CONDITIONAL(USE_LIBSNDIO, test "x$enable_sound" = "xsndio")
+AM_CONDITIONAL(USE_SOUND_SNDIO, test "x$enable_sound" = "xsndio")
+
+if test "x$enable_sound" = "xalsa"; then
+  PKG_CHECK_MODULES(ALSA, alsa,
+    AC_DEFINE(USE_SOUND_ALSA, 1, [ALSA sound support]),
+    enable_sound=no)
+fi
+AM_CONDITIONAL(USE_SOUND_ALSA, test "x$enable_sound" = "xalsa")
 
 if test "x$enable_sound" = "xplayer"; then
   AC_DEFINE(USE_SOUND_PLAYER, 1, [Play sounds using audio player])
@@ -170,13 +177,6 @@ if test "x$enable_sound" = "xplayer"; then
     AC_DEFINE_UNQUOTED(SOUND_PLAYER_FMT, "$with_sndplayer", [Audio player]),
 fi
 
-if test "x$enable_sound" = "xalsa"; then
-  PKG_CHECK_MODULES(ALSA, alsa,
-    AC_DEFINE(USE_SOUND_ALSA, 1, [ALSA sound support]),
-    enable_sound=no)
-fi
-AM_CONDITIONAL(USE_LIBALSA, test "x$enable_sound" = "xalsa")
-
 case x$enable_sound in
 xpulseaudio|xesound|xsndio|xalsa)
   if test "x$with_sndldr" = "xnone"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index a4145e66..fdfe437b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -176,9 +176,9 @@ MODULE_LIBS = $(DLOPEN_LIBS)
 
 libe16dir = $(pkglibdir)
 
-libe16_LTLIBRARIES = $(LIBSND_ESD) $(LIBSND_PA) $(LIBSND_SNDIO) $(LIBSND_ALSA) $(LIBFNT_IFT) $(LIBFNT_XFT) $(LIBFNT_PANGO)
+libe16_LTLIBRARIES = $(LIBSND_ESD) $(LIBSND_PULSE) $(LIBSND_SNDIO) $(LIBSND_ALSA) $(LIBFNT_IFT) $(LIBFNT_XFT) $(LIBFNT_PANGO)
 
-if USE_LIBESD
+if USE_SOUND_ESD
 LIBSND_ESD = libsound_esd.la
 libsound_esd_la_SOURCES   = sound_esd.c sound_load.c
 libsound_esd_la_CFLAGS    = $(ESD_CFLAGS) $(SNDLDR_CFLAGS)
@@ -186,15 +186,15 @@ libsound_esd_la_LIBADD    = $(ESD_LIBS) $(SNDLDR_LIBS)
 libsound_esd_la_LDFLAGS   = -module -avoid-version
 endif
 
-if USE_LIBPA
-LIBSND_PA = libsound_pa.la
-libsound_pa_la_SOURCES   = sound_pa.c sound_load.c
-libsound_pa_la_CFLAGS    = $(PA_CFLAGS) $(SNDLDR_CFLAGS)
-libsound_pa_la_LIBADD    = $(PA_LIBS) $(SNDLDR_LIBS)
-libsound_pa_la_LDFLAGS   = -module -avoid-version
+if USE_SOUND_PULSE
+LIBSND_PULSE = libsound_pulse.la
+libsound_pulse_la_SOURCES = sound_pa.c sound_load.c
+libsound_pulse_la_CFLAGS  = $(PA_CFLAGS) $(SNDLDR_CFLAGS)
+libsound_pulse_la_LIBADD  = $(PA_LIBS) $(SNDLDR_LIBS)
+libsound_pulse_la_LDFLAGS = -module -avoid-version
 endif
 
-if USE_LIBSNDIO
+if USE_SOUND_SNDIO
 LIBSND_SNDIO = libsound_sndio.la
 libsound_sndio_la_SOURCES = sound_sndio.c sound_load.c
 libsound_sndio_la_CFLAGS  = $(SNDIO_CFLAGS) $(SNDLDR_CFLAGS)
@@ -202,7 +202,7 @@ libsound_sndio_la_LIBADD  = $(SNDIO_LIBS) $(SNDLDR_LIBS)
 libsound_sndio_la_LDFLAGS = -module -avoid-version
 endif
 
-if USE_LIBALSA
+if USE_SOUND_ALSA
 LIBSND_ALSA = libsound_alsa.la
 libsound_alsa_la_SOURCES = sound_alsa.c sound_load.c
 libsound_alsa_la_CFLAGS  = $(ALSA_CFLAGS) $(SNDLDR_CFLAGS)
diff --git a/src/sound.c b/src/sound.c
index ace6db43..f8d35a6b 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -38,7 +38,7 @@
 #define SOUND_MODULE_NAME "esd"
 #elif USE_SOUND_PULSE
 #define SOUND_SERVER_NAME "pulseaudio"
-#define SOUND_MODULE_NAME "pa"
+#define SOUND_MODULE_NAME "pulse"
 #elif USE_SOUND_SNDIO
 #define SOUND_SERVER_NAME "sndio"
 #define SOUND_MODULE_NAME "sndio"