|
 |
6142c0 |
From 24a9694bfb3734b410b81c4d1a4bdfe0ed16b00b Mon Sep 17 00:00:00 2001
|
|
|
6142c0 |
From: Olaf Hering <olaf@aepfle.de>
|
|
|
6142c0 |
Date: Wed, 27 Mar 2019 09:35:05 +0100
|
|
|
6142c0 |
Subject: [PATCH 2/3] alsa: Use correct header path
|
|
|
6142c0 |
|
|
|
6142c0 |
Consumers are expected to use <alsa/asoundlib.h> instead of
|
|
|
6142c0 |
<asoundlib.h>.
|
|
|
6142c0 |
|
|
|
6142c0 |
This is in preparation of an change to pkgconfig(alsa) to
|
|
|
6142c0 |
not pollute CFLAGS with -I/usr/include/alsa anymore.
|
|
|
6142c0 |
|
|
|
6142c0 |
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
6142c0 |
---
|
|
|
6142c0 |
src/modules/alsa/alsa-mixer.c | 2 +-
|
|
|
6142c0 |
src/modules/alsa/alsa-mixer.h | 2 +-
|
|
|
6142c0 |
src/modules/alsa/alsa-sink.c | 2 +-
|
|
|
6142c0 |
src/modules/alsa/alsa-source.c | 2 +-
|
|
|
6142c0 |
src/modules/alsa/alsa-ucm.c | 2 +-
|
|
|
6142c0 |
src/modules/alsa/alsa-util.c | 2 +-
|
|
|
6142c0 |
src/modules/alsa/alsa-util.h | 2 +-
|
|
|
6142c0 |
src/modules/alsa/module-alsa-source.c | 2 +-
|
|
|
6142c0 |
8 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
6142c0 |
|
|
|
6142c0 |
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
|
|
|
6142c0 |
index 7de1c7deb..b2c50e611 100644
|
|
|
6142c0 |
--- a/src/modules/alsa/alsa-mixer.c
|
|
|
6142c0 |
+++ b/src/modules/alsa/alsa-mixer.c
|
|
|
6142c0 |
@@ -23,7 +23,7 @@
|
|
|
6142c0 |
#endif
|
|
|
6142c0 |
|
|
|
6142c0 |
#include <sys/types.h>
|
|
|
6142c0 |
-#include <asoundlib.h>
|
|
|
6142c0 |
+#include <alsa/asoundlib.h>
|
|
|
6142c0 |
#include <math.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
|
6142c0 |
diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
|
|
|
6142c0 |
index 4ebf1922b..8474a3d19 100644
|
|
|
6142c0 |
--- a/src/modules/alsa/alsa-mixer.h
|
|
|
6142c0 |
+++ b/src/modules/alsa/alsa-mixer.h
|
|
|
6142c0 |
@@ -21,7 +21,7 @@
|
|
|
6142c0 |
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
|
6142c0 |
***/
|
|
|
6142c0 |
|
|
|
6142c0 |
-#include <asoundlib.h>
|
|
|
6142c0 |
+#include <alsa/asoundlib.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
#include <pulse/sample.h>
|
|
|
6142c0 |
#include <pulse/mainloop-api.h>
|
|
|
6142c0 |
diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
|
|
|
6142c0 |
index 827a65081..9eb9913ff 100644
|
|
|
6142c0 |
--- a/src/modules/alsa/alsa-sink.c
|
|
|
6142c0 |
+++ b/src/modules/alsa/alsa-sink.c
|
|
|
6142c0 |
@@ -25,7 +25,7 @@
|
|
|
6142c0 |
#include <signal.h>
|
|
|
6142c0 |
#include <stdio.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
-#include <asoundlib.h>
|
|
|
6142c0 |
+#include <alsa/asoundlib.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
|
6142c0 |
#include <valgrind/memcheck.h>
|
|
|
6142c0 |
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
|
|
|
6142c0 |
index 6bec188ea..ac919770a 100644
|
|
|
6142c0 |
--- a/src/modules/alsa/alsa-source.c
|
|
|
6142c0 |
+++ b/src/modules/alsa/alsa-source.c
|
|
|
6142c0 |
@@ -25,7 +25,7 @@
|
|
|
6142c0 |
#include <signal.h>
|
|
|
6142c0 |
#include <stdio.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
-#include <asoundlib.h>
|
|
|
6142c0 |
+#include <alsa/asoundlib.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
#include <pulse/rtclock.h>
|
|
|
6142c0 |
#include <pulse/timeval.h>
|
|
|
6142c0 |
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
|
|
|
6142c0 |
index b42c04079..235276af2 100644
|
|
|
6142c0 |
--- a/src/modules/alsa/alsa-ucm.c
|
|
|
6142c0 |
+++ b/src/modules/alsa/alsa-ucm.c
|
|
|
6142c0 |
@@ -27,7 +27,7 @@
|
|
|
6142c0 |
#include <ctype.h>
|
|
|
6142c0 |
#include <sys/types.h>
|
|
|
6142c0 |
#include <limits.h>
|
|
|
6142c0 |
-#include <asoundlib.h>
|
|
|
6142c0 |
+#include <alsa/asoundlib.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
|
6142c0 |
#include <valgrind/memcheck.h>
|
|
|
6142c0 |
diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
|
|
|
6142c0 |
index 61fb4903c..f0e5b3642 100644
|
|
|
6142c0 |
--- a/src/modules/alsa/alsa-util.c
|
|
|
6142c0 |
+++ b/src/modules/alsa/alsa-util.c
|
|
|
6142c0 |
@@ -23,7 +23,7 @@
|
|
|
6142c0 |
#endif
|
|
|
6142c0 |
|
|
|
6142c0 |
#include <sys/types.h>
|
|
|
6142c0 |
-#include <asoundlib.h>
|
|
|
6142c0 |
+#include <alsa/asoundlib.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
#include <pulse/sample.h>
|
|
|
6142c0 |
#include <pulse/xmalloc.h>
|
|
|
6142c0 |
diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
|
|
|
6142c0 |
index 8345a0ba5..24f8d70ee 100644
|
|
|
6142c0 |
--- a/src/modules/alsa/alsa-util.h
|
|
|
6142c0 |
+++ b/src/modules/alsa/alsa-util.h
|
|
|
6142c0 |
@@ -21,7 +21,7 @@
|
|
|
6142c0 |
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
|
6142c0 |
***/
|
|
|
6142c0 |
|
|
|
6142c0 |
-#include <asoundlib.h>
|
|
|
6142c0 |
+#include <alsa/asoundlib.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
#include <pulse/sample.h>
|
|
|
6142c0 |
#include <pulse/channelmap.h>
|
|
|
6142c0 |
diff --git a/src/modules/alsa/module-alsa-source.c b/src/modules/alsa/module-alsa-source.c
|
|
|
6142c0 |
index 45fb1aca8..bbf02af28 100644
|
|
|
6142c0 |
--- a/src/modules/alsa/module-alsa-source.c
|
|
|
6142c0 |
+++ b/src/modules/alsa/module-alsa-source.c
|
|
|
6142c0 |
@@ -24,7 +24,7 @@
|
|
|
6142c0 |
|
|
|
6142c0 |
#include <stdio.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
-#include <asoundlib.h>
|
|
|
6142c0 |
+#include <alsa/asoundlib.h>
|
|
|
6142c0 |
|
|
|
6142c0 |
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
|
6142c0 |
#include <valgrind/memcheck.h>
|
|
|
6142c0 |
--
|
|
|
6142c0 |
2.21.0
|
|
|
6142c0 |
|