Linux ALSA was not enabled

sphair · Mar 30, 2021 · ced1f55 · ced1f55
1 parent 29c2bae
commit ced1f55
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/Sources/Sound/Platform/Linux/soundoutput_alsa.h b/Sources/Sound/Platform/Linux/soundoutput_alsa.h
@@ -32,12 +32,7 @@
 #ifdef __linux__
 
 #include "../../soundoutput_impl.h"
-#ifdef HAVE_ALSA_ASOUNDLIB_H
-#include <alsa/asoundlib.h> 
-#endif
-#ifdef HAVE_ASOUNDLIB_H
-#include <asoundlib.h>
-#endif
+#include <alsa/asoundlib.h>
 
 namespace clan
 {

diff --git a/Sources/Sound/soundoutput.cpp b/Sources/Sound/soundoutput.cpp
@@ -84,7 +84,6 @@ namespace clan
 #else
 #if defined(__linux__) && defined(HAVE_ALSA_ASOUNDLIB_H)
 		// Try building ALSA
-
 		std::shared_ptr<SoundOutput_Impl> alsa_impl(std::make_shared<SoundOutput_alsa>(desc.get_mixing_frequency(), desc.get_mixing_latency()));
 		if ( ( (SoundOutput_alsa *) (alsa_impl.get()))->handle)
 		{

diff --git a/configure.ac b/configure.ac
@@ -424,6 +424,7 @@ if test "$enable_clanSound" != "no"; then
 		AC_CHECK_LIB(ossaudio, _oss_ioctl, sound_libs=-lossaudio)
 		AC_CHECK_HEADERS(asoundlib.h alsa/asoundlib.h, [have_alsa=yes && break])
 		if test "$have_alsa" != "no"; then
+    		AC_DEFINE(HAVE_ALSA_ASOUNDLIB_H)
 			sound_libs="$sound_libs -lasound"
 		fi