summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2001-07-11 15:52:07 +0000
committerJaroslav Kysela <perex@perex.cz>2001-07-11 15:52:07 +0000
commitdaebb1d1f081a4e413707c75e02f8f41be0db3a6 (patch)
tree93ccd00dab52e69521dba86874f1c29af2a229bb
parent3590f6ecd330349a9317fe999a619f6fadb3c7f2 (diff)
Merged hwdep_m4.h to hwdep.h
-rw-r--r--include/Makefile.am3
-rw-r--r--include/hwdep_m4.h26
2 files changed, 1 insertions, 28 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index e0c8c1c0..31bfe752 100644
--- 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
index f8b2f036..00000000
--- 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