axfer, topology: use only <alsa/asoundlib.h> include instead specific alsa-lib headers

See commit ea8972c8 ("include: prefer alsa/asoundlib.h for apps, dependency cleanups")
in alsa-lib.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/axfer/waiter.h b/axfer/waiter.h
index 0f4e9b9f054834e4d86838817487f535dc65d5e4..6c4f4cbf7243b87943d742cbc5cb6549ec09b52e 100644 (file)
--- a/axfer/waiter.h
+++ b/axfer/waiter.h
@@ -9,7 +9,7 @@
 #ifndef __ALSA_UTILS_AXFER_WAITER__H_
 #define __ALSA_UTILS_AXFER_WAITER__H_
 
-#include <alsa/global.h>
+#include <alsa/asoundlib.h>
 #include <poll.h>
 
 enum waiter_type {

diff --git a/configure.ac b/configure.ac
index 5624add09eb4fc073b99979f5d582e1232099b9a..be627bda571d5749f662d3e270a0d8082f8c4a6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE([enable])
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.22.5])
 
 dnl Checks for programs.
 

diff --git a/topology/nhlt/intel/dmic-nhlt.c b/topology/nhlt/intel/dmic-nhlt.c
index de659cfdbd1f06efa06578eb12a19661ee3b2809..7c98a3baa662135aae48df23a673b4403e84e26b 100644 (file)
--- a/topology/nhlt/intel/dmic-nhlt.c
+++ b/topology/nhlt/intel/dmic-nhlt.c
@@ -10,11 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alsa/global.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "dmic-nhlt.h"
 #include "dmic/dmic-process.h"
 

diff --git a/topology/nhlt/intel/dmic/dmic-debug.c b/topology/nhlt/intel/dmic/dmic-debug.c
index a977c93f2a2d750ece81742229f0326014a9f488..82c611379c3cec60de830205bbb65284de2c598d 100644 (file)
--- a/topology/nhlt/intel/dmic/dmic-debug.c
+++ b/topology/nhlt/intel/dmic/dmic-debug.c
@@ -8,7 +8,7 @@
 #include "aconfig.h"
 #include <stdio.h>
 #include <stdint.h>
-#include <alsa/global.h>
+#include <alsa/asoundlib.h>
 #include "dmic-debug.h"
 
 #ifdef NHLT_DEBUG

diff --git a/topology/nhlt/intel/dmic/dmic-process.c b/topology/nhlt/intel/dmic/dmic-process.c
index adbec79be219b0e03196048be1a4ac22a4833990..b9395cfb32b2e6dc34399ae5858577fa61ef5039 100644 (file)
--- a/topology/nhlt/intel/dmic/dmic-process.c
+++ b/topology/nhlt/intel/dmic/dmic-process.c
@@ -11,10 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "../intel-nhlt.h"
 #include "dmic-process.h"
 #include "dmic-internal.h"

diff --git a/topology/nhlt/intel/intel-nhlt.h b/topology/nhlt/intel/intel-nhlt.h
index 72e61fb0206b4d3b6e80f164ad1cb6980d763256..657b5382b812e17cac776f3058d793bcffd92b2f 100644 (file)
--- a/topology/nhlt/intel/intel-nhlt.h
+++ b/topology/nhlt/intel/intel-nhlt.h
@@ -12,10 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 
 #define MIN(a, b) ({           \
        typeof(a) __a = (a);    \

diff --git a/topology/nhlt/intel/ssp-nhlt.c b/topology/nhlt/intel/ssp-nhlt.c
index 1137819b4f49c4f096486e8c4786251126b1cd8c..168e6bcde4e2d8e89ad3fcd810d614e4715022d7 100644 (file)
--- a/topology/nhlt/intel/ssp-nhlt.c
+++ b/topology/nhlt/intel/ssp-nhlt.c
@@ -10,10 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "intel-nhlt.h"
 #include "ssp-nhlt.h"
 #include "ssp/ssp-process.h"

diff --git a/topology/nhlt/intel/ssp/ssp-debug.c b/topology/nhlt/intel/ssp/ssp-debug.c
index 154c83a6add4cca21af2f22d296c8963d1fe1a50..afb8ac216781415dd3f245ee4c4f9789686308e6 100644 (file)
--- a/topology/nhlt/intel/ssp/ssp-debug.c
+++ b/topology/nhlt/intel/ssp/ssp-debug.c
@@ -7,7 +7,7 @@
 #include "aconfig.h"
 #include <stdio.h>
 #include <stdint.h>
-#include <alsa/global.h>
+#include <alsa/asoundlib.h>
 #include "ssp-debug.h"
 #include "../intel-nhlt.h"
 

diff --git a/topology/nhlt/intel/ssp/ssp-process.c b/topology/nhlt/intel/ssp/ssp-process.c
index 3a1db9fccbd047950ad400d350bfbe11400bbe68..bffbc5affd0357002ed0c96af5f7888b917d46e7 100644 (file)
--- a/topology/nhlt/intel/ssp/ssp-process.c
+++ b/topology/nhlt/intel/ssp/ssp-process.c
@@ -14,11 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <alsa/global.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "../intel-nhlt.h"
 #include "../../nhlt.h"
 #include "ssp-process.h"

diff --git a/topology/nhlt/nhlt-processor.c b/topology/nhlt/nhlt-processor.c
index ca539c3de5bb8be2b9bba57c246c220b97a70ef1..8197201819dd9b295374a17f6951e720c8ed61e1 100644 (file)
--- a/topology/nhlt/nhlt-processor.c
+++ b/topology/nhlt/nhlt-processor.c
@@ -11,11 +11,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include <inttypes.h>
-#include <alsa/global.h>
-#include <alsa/input.h>
-#include <alsa/output.h>
-#include <alsa/conf.h>
-#include <alsa/error.h>
+#include <alsa/asoundlib.h>
 #include "pre-process-external.h"
 #include "nhlt.h"
 #include "intel/intel-nhlt.h"