Changed location of asoundlib.h from sys dir to alsa dir.

(it means that official location is '#include <alsa/asoundlib.h>')

diff --git a/include/Makefile.am b/include/Makefile.am
index 31bfe7526b009cbf52e5a8d2e6d9da1f47d6d823..58bb7b25a0f73af086a57f887d0467e42ec713e4 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,5 +1,5 @@
-sysincludedir = ${includedir}/sys
-sysinclude_HEADERS = asoundlib.h
+alsaincludedir = ${includedir}/alsa
+alsainclude_HEADERS = asoundlib.h
 
 # This is the order they will be concatenated into asoundlib.h!
 #
@@ -39,3 +39,7 @@ stamp-vh: $(top_builddir)/configure.in
        -@rm -f ver.tmp
 
 INCLUDES=-I$(top_srcdir)/include
+
+install-exec-hook:
+       rm -f $(alsaincludedir)/asoundef.h
+       (cd $(DESTDIR)$(alsaincludedir) && $(LN_S) ../sound/asoundef.h asoundef.h)

diff --git a/include/header.h b/include/header.h
index fb7150c55b4750f5d9a4fb13bb7e806b5a00ce39..88accc668ae7ae6e1a1f10c4ae6afe58b89ad682 100644 (file)
--- a/include/header.h
+++ b/include/header.h
@@ -28,7 +28,9 @@
 #ifndef __ASOUNDLIB_H
 #define __ASOUNDLIB_H
 
-#include <sound/asoundef.h>
+#ifndef __ASOUNDEF_H
+#include <alsa/asoundef.h>
+#endif
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/include/local.h b/include/local.h
index 7712b89a5ac2eadfef592fecb841da919cf27bbe..2bd79e3377dd7f49ca3a35687009a570511145ef 100644 (file)
--- a/include/local.h
+++ b/include/local.h
@@ -74,6 +74,7 @@ typedef struct sndrv_seq_event snd_seq_event_t;
 #define _snd_timer_status sndrv_timer_status
 
 #include <sound/asound.h>
+#include <sound/asoundef.h>
 #include <sound/asequencer.h>
 #include "asoundlib.h"
 #include "list.h"

diff --git a/src/pcm/scopes/level.c b/src/pcm/scopes/level.c
index 750a28ef5db1af6024b1e0eb74f5c753ee13fa1a..ac30eeac4b3749e70c144bf8a5d7a3fa6443c99b 100644 (file)
--- a/src/pcm/scopes/level.c
+++ b/src/pcm/scopes/level.c
@@ -20,7 +20,7 @@
 
 #include <curses.h>
 #include <errno.h>
-#include <sys/asoundlib.h>
+#include <alsa/asoundlib.h>
 
 #define BAR_WIDTH 70
 /* milliseconds to go from 32767 to 0 */

diff --git a/test/midiloop.c b/test/midiloop.c
index 2720ac81d3db555d65d917bd6fb572bf7b837c67..a3a31738047c1c003de2be7216b84abef5dac5b9 100644 (file)
--- a/test/midiloop.c
+++ b/test/midiloop.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <sys/asoundlib.h>
+#include "../include/asoundlib.h"
 #include <string.h>
 #include <signal.h>
 

diff --git a/test/mixer.c b/test/mixer.c
deleted file mode 100644 (file)
index d6c7705..0000000
--- a/test/mixer.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "../include/asoundlib.h"
-
-static void mixer_test(int card, int device)
-{
-       int err;
-       snd_mixer_t *handle;
-       snd_mixer_info_t info;
-
-       if ((err = snd_mixer_open(&handle, card, device)) < 0) {
-               printf("Mixer open error: %s\n", snd_strerror(err));
-               return;
-       }
-       printf("Mixer %i/%i open ok...\n", card, device);
-       if ((err = snd_mixer_info(handle, &info)) < 0) {
-               printf("Mixer info error: %s\n", snd_strerror(err));
-               return;
-       }
-       printf("  Info:\n");
-       printf("    type - %i\n", info.type);
-       printf("    elements - %i\n", info.elements);
-       printf("    groups - %i\n", info.groups);
-       printf("    switches - %i\n", info.switches);
-       printf("    attrib - 0x%x\n", info.attrib);
-       printf("    id - '%s'\n", info.id);
-       printf("    name - '%s'\n", info.name);
-       snd_mixer_close(handle);
-}
-
-int main(void)
-{
-       int idx, idx1, cards, err;
-       snd_ctl_t *handle;
-       snd_ctl_card_info_t info;
-
-       cards = snd_cards();
-       printf("Detected %i soundcard%s...\n", cards, cards > 1 ? "s" : "");
-       if (cards <= 0) {
-               printf("Giving up...\n");
-               return 0;
-       }
-       for (idx = 0; idx < cards; idx++) {
-               if ((err = snd_ctl_open(&handle, idx)) < 0) {
-                       printf("Open error: %s\n", snd_strerror(err));
-                       continue;
-               }
-               if ((err = snd_ctl_card_info(handle, &info)) < 0) {
-                       printf("HW info error: %s\n", snd_strerror(err));
-                       continue;
-               }
-               for (idx1 = 0; idx1 < info.mixerdevs; idx1++)
-                       mixer_test(idx, idx1);
-               snd_ctl_close(handle);
-       }
-       return 0;
-}

diff --git a/test/rawmidi.c b/test/rawmidi.c
index a584df8ffa2869031b26822609b60365a24e8e8a..6b95385028828af244f2a888fa2f09bac71de591 100644 (file)
--- a/test/rawmidi.c
+++ b/test/rawmidi.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <sys/asoundlib.h>
+#include "../include/asoundlib.h"
 #include <signal.h>
 
 static void usage(void)