Merged hwdep_m4.h to hwdep.h

diff --git a/include/Makefile.am b/include/Makefile.am
index e0c8c1c006a82b8434aa78dfb0af07b2cb2ee52a..31bfe7526b009cbf52e5a8d2e6d9da1f47d6d823 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -5,8 +5,7 @@ sysinclude_HEADERS = asoundlib.h
 #
 header_files=header.h version.h global.h input.h output.h error.h \
             conf.h pcm.h rawmidi.h timer.h \
-            hwdep.h hwdep_m4.h control.h \
-            mixer.h \
+            hwdep.h control.h mixer.h \
             seq_event.h seq.h seqmid.h seq_midi_event.h \
              conv.h instr.h footer.h
 

diff --git a/include/hwdep_m4.h b/include/hwdep_m4.h
deleted file mode 100644 (file)
index f8b2f03..0000000
--- a/include/hwdep_m4.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-size_t snd_hwdep_info_sizeof(void);
-#define snd_hwdep_info_alloca(ptr) do { assert(ptr); *ptr = (snd_hwdep_info_t *) alloca(snd_hwdep_info_sizeof()); memset(*ptr, 0, snd_hwdep_info_sizeof()); } while (0)
-int snd_hwdep_info_malloc(snd_hwdep_info_t **ptr);
-void snd_hwdep_info_free(snd_hwdep_info_t *obj);
-void snd_hwdep_info_copy(snd_hwdep_info_t *dst, const snd_hwdep_info_t *src);
-
-unsigned int snd_hwdep_info_get_device(const snd_hwdep_info_t *obj);
-
-int snd_hwdep_info_get_card(const snd_hwdep_info_t *obj);
-
-const char *snd_hwdep_info_get_id(const snd_hwdep_info_t *obj);
-
-const char *snd_hwdep_info_get_name(const snd_hwdep_info_t *obj);
-
-snd_hwdep_iface_t snd_hwdep_info_get_iface(const snd_hwdep_info_t *obj);
-
-void snd_hwdep_info_set_device(snd_hwdep_info_t *obj, unsigned int val);
-
-
-#ifdef __cplusplus
-}
-#endif