forked from pool/pulseaudio
Takashi Iwai
082de99859
- Use alsa API properly. Consumers are expected to use <alsa/asoundlib.h> instead of <asoundlib.h>. This is in preparation of an change to pkgconfig(alsa) to not pollute CFLAGS with -I/usr/include/alsa anymore (bsc#1130333) pulseaudio-alsa.patch OBS-URL: https://build.opensuse.org/request/show/688622 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=200
89 lines
2.0 KiB
Diff
89 lines
2.0 KiB
Diff
--- a/src/modules/alsa/alsa-mixer.c
|
|
+++ b/src/modules/alsa/alsa-mixer.c
|
|
@@ -23,7 +23,7 @@
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
#include <math.h>
|
|
|
|
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
--- a/src/modules/alsa/alsa-mixer.h
|
|
+++ b/src/modules/alsa/alsa-mixer.h
|
|
@@ -21,7 +21,7 @@
|
|
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#include <pulse/sample.h>
|
|
#include <pulse/mainloop-api.h>
|
|
--- a/src/modules/alsa/alsa-sink.c
|
|
+++ b/src/modules/alsa/alsa-sink.c
|
|
@@ -25,7 +25,7 @@
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
#include <valgrind/memcheck.h>
|
|
--- a/src/modules/alsa/alsa-source.c
|
|
+++ b/src/modules/alsa/alsa-source.c
|
|
@@ -25,7 +25,7 @@
|
|
#include <signal.h>
|
|
#include <stdio.h>
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#include <pulse/rtclock.h>
|
|
#include <pulse/timeval.h>
|
|
--- a/src/modules/alsa/alsa-ucm.c
|
|
+++ b/src/modules/alsa/alsa-ucm.c
|
|
@@ -27,7 +27,7 @@
|
|
#include <ctype.h>
|
|
#include <sys/types.h>
|
|
#include <limits.h>
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
#include <valgrind/memcheck.h>
|
|
--- a/src/modules/alsa/alsa-util.c
|
|
+++ b/src/modules/alsa/alsa-util.c
|
|
@@ -23,7 +23,7 @@
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#include <pulse/sample.h>
|
|
#include <pulse/xmalloc.h>
|
|
--- a/src/modules/alsa/alsa-util.h
|
|
+++ b/src/modules/alsa/alsa-util.h
|
|
@@ -21,7 +21,7 @@
|
|
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
***/
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#include <pulse/sample.h>
|
|
#include <pulse/channelmap.h>
|
|
--- a/src/modules/alsa/module-alsa-source.c
|
|
+++ b/src/modules/alsa/module-alsa-source.c
|
|
@@ -24,7 +24,7 @@
|
|
|
|
#include <stdio.h>
|
|
|
|
-#include <asoundlib.h>
|
|
+#include <alsa/asoundlib.h>
|
|
|
|
#ifdef HAVE_VALGRIND_MEMCHECK_H
|
|
#include <valgrind/memcheck.h>
|