Move definitions in *_types.h into *_func.h

Since the amount of code in *_types.h was reduced, let's merge.

16 files changed, 198 insertions, 228 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index e68b29c..a6270dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,25 +33,25 @@ alsaincludedir = $(includedir)/alsa
 
 alsainclude_HEADERS = asoundlib.h version.h recipe.h asound.h asoundef.h \
 	global.h input.h output.h error.h \
-	control.h ctl_func.h ctl_types.h ctl_macros.h \
-	pcm.h pcm_func.h pcm_types.h pcm_macros.h
+	control.h ctl_func.h ctl_macros.h \
+	pcm.h pcm_func.h pcm_macros.h
 
 if BUILD_MIXER
 alsainclude_HEADERS += \
-	hcontrol.h hctl_func.h hctl_types.h hctl_macros.h \
-	mixer.h mixer_func.h mixer_types.h mixer_macros.h
+	hcontrol.h hctl_func.h hctl_macros.h \
+	mixer.h mixer_func.h mixer_macros.h
 endif
 if BUILD_RAWMIDI
 alsainclude_HEADERS += \
-	rawmidi.h rawmidi_func.h rawmidi_types.h rawmidi_macros.h
+	rawmidi.h rawmidi_func.h rawmidi_macros.h
 endif
 if BUILD_HWDEP
 alsainclude_HEADERS += \
-	hwdep.h hwdep_func.h hwdep_types.h hwdep_macros.h
+	hwdep.h hwdep_func.h hwdep_macros.h
 endif
 if BUILD_TIMER
 alsainclude_HEADERS += \
-	timer.h timer_func.h timer_types.h timer_macros.h
+	timer.h timer_func.h timer_macros.h
 endif
 if BUILD_CONF
 alsainclude_HEADERS += \
diff --git a/src/asound.h b/src/asound.h
index aadadb1..fae323e 100644
--- a/src/asound.h
+++ b/src/asound.h
@@ -857,6 +857,17 @@ typedef struct snd_ctl_event {
 #define SND_CTL_NAME_IEC958_PCM_STREAM			"PCM Stream"
 #define SND_CTL_NAME_IEC958(expl,direction,what)	"IEC958 " expl SND_CTL_NAME_##direction SND_CTL_NAME_IEC958_##what
 
+/* TLV types */
+#define SND_CTL_TLVT_CONTAINER		0
+#define SND_CTL_TLVT_DB_SCALE		1
+#define SND_CTL_TLVT_DB_LINEAR		2
+#define SND_CTL_TLVT_DB_RANGE		3
+#define SND_CTL_TLVT_DB_MINMAX		4
+#define SND_CTL_TLVT_DB_MINMAX_MUTE	5
+
+/* Mute state */
+#define SND_CTL_TLV_DB_GAIN_MUTE	-9999999
+
 struct snd_xferv {
 	const struct iovec *vector;
 	unsigned long count;
diff --git a/src/ctl_func.h b/src/ctl_func.h
index 976848c..491735e 100644
--- a/src/ctl_func.h
+++ b/src/ctl_func.h
@@ -6,7 +6,20 @@
 
 #include "global.h"
 #include "asound.h"
-#include "ctl_types.h"
+
+#include <unistd.h>
+#include <stdint.h>
+
+typedef enum _snd_ctl_type {
+	SND_CTL_TYPE_HW,
+	SND_CTL_TYPE_SHM,	/* not used by SALSA */
+	SND_CTL_TYPE_INET,	/* not used by SALSA */
+	SND_CTL_TYPE_EXT	/* not used by SALSA */
+} snd_ctl_type_t;
+
+#define SND_CTL_NONBLOCK		0x0001
+#define SND_CTL_ASYNC			0x0002
+#define SND_CTL_READONLY		0x0004
 
 int snd_card_load(int card);
 int snd_card_next(int *card);
diff --git a/src/ctl_types.h b/src/ctl_types.h
deleted file mode 100644
index 5539e03..0000000
--- a/src/ctl_types.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __ALSA_CTL_TYPES_H
-#define __ALSA_CTL_TYPES_H
-
-#include <unistd.h>
-#include <stdint.h>
-
-/* TLV types */
-#define SND_CTL_TLVT_CONTAINER		0
-#define SND_CTL_TLVT_DB_SCALE		1
-#define SND_CTL_TLVT_DB_LINEAR		2
-#define SND_CTL_TLVT_DB_RANGE		3
-#define SND_CTL_TLVT_DB_MINMAX		4
-#define SND_CTL_TLVT_DB_MINMAX_MUTE	5
-
-/* Mute state */
-#define SND_CTL_TLV_DB_GAIN_MUTE	-9999999
-
-typedef enum _snd_ctl_type {
-	SND_CTL_TYPE_HW,
-	SND_CTL_TYPE_SHM,	/* not used by SALSA */
-	SND_CTL_TYPE_INET,	/* not used by SALSA */
-	SND_CTL_TYPE_EXT	/* not used by SALSA */
-} snd_ctl_type_t;
-
-#define SND_CTL_NONBLOCK		0x0001
-#define SND_CTL_ASYNC			0x0002
-#define SND_CTL_READONLY		0x0004
-
-#endif /* __ALSA_CTL_TYPES_H */
diff --git a/src/hctl_func.h b/src/hctl_func.h
index 523509a..5d925d0 100644
--- a/src/hctl_func.h
+++ b/src/hctl_func.h
@@ -5,7 +5,18 @@
  */
 
 #include "control.h"
-#include "hctl_types.h"
+
+typedef struct _snd_hctl_elem snd_hctl_elem_t;
+typedef struct _snd_hctl snd_hctl_t;
+typedef int (*snd_hctl_compare_t)(const snd_hctl_elem_t *e1,
+				  const snd_hctl_elem_t *e2);
+int snd_hctl_compare_fast(const snd_hctl_elem_t *c1,
+			  const snd_hctl_elem_t *c2);
+typedef int (*snd_hctl_callback_t)(snd_hctl_t *hctl,
+				   unsigned int mask,
+				   snd_hctl_elem_t *elem);
+typedef int (*snd_hctl_elem_callback_t)(snd_hctl_elem_t *elem,
+					unsigned int mask);
 
 int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode);
 int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl);
diff --git a/src/hctl_types.h b/src/hctl_types.h
deleted file mode 100644
index 5fd3e5d..0000000
--- a/src/hctl_types.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __ALSA_HCTL_TYPES_H
-#define __ALSA_HCTL_TYPES_H
-
-typedef struct _snd_hctl_elem snd_hctl_elem_t;
-typedef struct _snd_hctl snd_hctl_t;
-typedef int (*snd_hctl_compare_t)(const snd_hctl_elem_t *e1,
-				  const snd_hctl_elem_t *e2);
-int snd_hctl_compare_fast(const snd_hctl_elem_t *c1,
-			  const snd_hctl_elem_t *c2);
-typedef int (*snd_hctl_callback_t)(snd_hctl_t *hctl,
-				   unsigned int mask,
-				   snd_hctl_elem_t *elem);
-typedef int (*snd_hctl_elem_callback_t)(snd_hctl_elem_t *elem,
-					unsigned int mask);
-
-#endif /* __ALSA_HCTL_TYPES_H */
diff --git a/src/hwdep_func.h b/src/hwdep_func.h
index 7a84297..77ee193 100644
--- a/src/hwdep_func.h
+++ b/src/hwdep_func.h
@@ -4,7 +4,17 @@
  */
 
 #include "global.h"
-#include "hwdep_types.h"
+
+#define SND_HWDEP_OPEN_READ		(O_RDONLY)
+#define SND_HWDEP_OPEN_WRITE		(O_WRONLY)
+#define SND_HWDEP_OPEN_DUPLEX		(O_RDWR)
+#define SND_HWDEP_OPEN_NONBLOCK		(O_NONBLOCK)
+
+typedef enum _snd_hwdep_type {
+	SND_HWDEP_TYPE_HW,
+	SND_HWDEP_TYPE_SHM,	/* not used by SALSA */
+	SND_HWDEP_TYPE_INET	/* not used by SALSA */
+} snd_hwdep_type_t;
 
 int snd_hwdep_open(snd_hwdep_t **hwdep, const char *name, int mode);
 int snd_hwdep_close(snd_hwdep_t *hwdep);
diff --git a/src/hwdep_types.h b/src/hwdep_types.h
deleted file mode 100644
index fbb93cf..0000000
--- a/src/hwdep_types.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#define SND_HWDEP_OPEN_READ		(O_RDONLY)
-#define SND_HWDEP_OPEN_WRITE		(O_WRONLY)
-#define SND_HWDEP_OPEN_DUPLEX		(O_RDWR)
-#define SND_HWDEP_OPEN_NONBLOCK		(O_NONBLOCK)
-
-typedef enum _snd_hwdep_type {
-	SND_HWDEP_TYPE_HW,
-	SND_HWDEP_TYPE_SHM,	/* not used by SALSA */
-	SND_HWDEP_TYPE_INET	/* not used by SALSA */
-} snd_hwdep_type_t;
diff --git a/src/mixer_func.h b/src/mixer_func.h
index 94cd1ed..841c5fa 100644
--- a/src/mixer_func.h
+++ b/src/mixer_func.h
@@ -4,7 +4,57 @@
  */
 
 #include "hcontrol.h"
-#include "mixer_types.h"
+
+#include "pcm.h"
+
+typedef struct _snd_mixer snd_mixer_t;
+typedef struct _snd_mixer_elem snd_mixer_elem_t;
+#define snd_mixer_class_t	snd_mixer_t
+
+typedef int (*snd_mixer_callback_t)(snd_mixer_t *ctl,
+				    unsigned int mask,
+				    snd_mixer_elem_t *elem);
+
+typedef int (*snd_mixer_elem_callback_t)(snd_mixer_elem_t *elem,
+					 unsigned int mask);
+
+typedef int (*snd_mixer_compare_t)(const snd_mixer_elem_t *e1,
+				   const snd_mixer_elem_t *e2);
+
+typedef enum _snd_mixer_elem_type {
+	SND_MIXER_ELEM_SIMPLE,
+	SND_MIXER_ELEM_LAST = SND_MIXER_ELEM_SIMPLE
+} snd_mixer_elem_type_t;
+
+typedef enum _snd_mixer_selem_channel_id {
+	SND_MIXER_SCHN_UNKNOWN = -1,
+	SND_MIXER_SCHN_FRONT_LEFT = 0,
+	SND_MIXER_SCHN_FRONT_RIGHT,
+	SND_MIXER_SCHN_REAR_LEFT,
+	SND_MIXER_SCHN_REAR_RIGHT,
+	SND_MIXER_SCHN_FRONT_CENTER,
+	SND_MIXER_SCHN_WOOFER,
+	SND_MIXER_SCHN_SIDE_LEFT,
+	SND_MIXER_SCHN_SIDE_RIGHT,
+	SND_MIXER_SCHN_REAR_CENTER,
+	SND_MIXER_SCHN_LAST = 31,
+	SND_MIXER_SCHN_MONO = SND_MIXER_SCHN_FRONT_LEFT
+} snd_mixer_selem_channel_id_t;
+
+enum snd_mixer_selem_regopt_abstract {
+	SND_MIXER_SABSTRACT_NONE = 0,
+	SND_MIXER_SABSTRACT_BASIC,
+};
+
+struct snd_mixer_selem_regopt {
+	int ver;
+	enum snd_mixer_selem_regopt_abstract abstract;
+	const char *device;
+	snd_pcm_t *playback_pcm;
+	snd_pcm_t *capture_pcm;
+};
+
+typedef struct _snd_mixer_selem_id snd_mixer_selem_id_t;
 
 int snd_mixer_open(snd_mixer_t **mixer, int mode);
 int snd_mixer_close(snd_mixer_t *mixer);
diff --git a/src/mixer_types.h b/src/mixer_types.h
deleted file mode 100644
index ad97723..0000000
--- a/src/mixer_types.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef __ALSA_MIXER_TYPES_H
-#define __ALSA_MIXER_TYPES_H
-
-#include "pcm.h"
-
-typedef struct _snd_mixer snd_mixer_t;
-typedef struct _snd_mixer_elem snd_mixer_elem_t;
-#define snd_mixer_class_t	snd_mixer_t
-
-typedef int (*snd_mixer_callback_t)(snd_mixer_t *ctl,
-				    unsigned int mask,
-				    snd_mixer_elem_t *elem);
-
-typedef int (*snd_mixer_elem_callback_t)(snd_mixer_elem_t *elem,
-					 unsigned int mask);
-
-typedef int (*snd_mixer_compare_t)(const snd_mixer_elem_t *e1,
-				   const snd_mixer_elem_t *e2);
-
-typedef enum _snd_mixer_elem_type {
-	SND_MIXER_ELEM_SIMPLE,
-	SND_MIXER_ELEM_LAST = SND_MIXER_ELEM_SIMPLE
-} snd_mixer_elem_type_t;
-
-typedef enum _snd_mixer_selem_channel_id {
-	SND_MIXER_SCHN_UNKNOWN = -1,
-	SND_MIXER_SCHN_FRONT_LEFT = 0,
-	SND_MIXER_SCHN_FRONT_RIGHT,
-	SND_MIXER_SCHN_REAR_LEFT,
-	SND_MIXER_SCHN_REAR_RIGHT,
-	SND_MIXER_SCHN_FRONT_CENTER,
-	SND_MIXER_SCHN_WOOFER,
-	SND_MIXER_SCHN_SIDE_LEFT,
-	SND_MIXER_SCHN_SIDE_RIGHT,
-	SND_MIXER_SCHN_REAR_CENTER,
-	SND_MIXER_SCHN_LAST = 31,
-	SND_MIXER_SCHN_MONO = SND_MIXER_SCHN_FRONT_LEFT
-} snd_mixer_selem_channel_id_t;
-
-enum snd_mixer_selem_regopt_abstract {
-	SND_MIXER_SABSTRACT_NONE = 0,
-	SND_MIXER_SABSTRACT_BASIC,
-};
-
-struct snd_mixer_selem_regopt {
-	int ver;
-	enum snd_mixer_selem_regopt_abstract abstract;
-	const char *device;
-	snd_pcm_t *playback_pcm;
-	snd_pcm_t *capture_pcm;
-};
-
-typedef struct _snd_mixer_selem_id snd_mixer_selem_id_t;
-
-#endif /* __ALSA_MIXER_TYPES_H */
diff --git a/src/pcm_func.h b/src/pcm_func.h
index 0191eb6..69915b9 100644
--- a/src/pcm_func.h
+++ b/src/pcm_func.h
@@ -7,7 +7,75 @@
 #include "global.h"
 #include "asound.h"
 #include "output.h"
-#include "pcm_types.h"
+
+#include <unistd.h>
+#include <stdint.h>
+
+typedef snd_mask_t snd_pcm_access_mask_t;
+typedef snd_mask_t snd_pcm_format_mask_t;
+typedef snd_mask_t snd_pcm_subformat_mask_t;
+
+/* deprecated */
+typedef enum _snd_pcm_start {
+	SND_PCM_START_DATA = 0,
+	SND_PCM_START_EXPLICIT,
+	SND_PCM_START_LAST = SND_PCM_START_EXPLICIT
+} snd_pcm_start_t;
+
+/* deprecated */
+typedef enum _snd_pcm_xrun {
+	SND_PCM_XRUN_NONE = 0,
+	SND_PCM_XRUN_STOP,
+	SND_PCM_XRUN_LAST = SND_PCM_XRUN_STOP
+} snd_pcm_xrun_t;
+
+#define SND_PCM_NONBLOCK		0x00000001
+#define SND_PCM_ASYNC			0x00000002
+#define SND_PCM_NO_AUTO_RESAMPLE	0x00010000
+#define SND_PCM_NO_AUTO_CHANNELS	0x00020000
+#define SND_PCM_NO_AUTO_FORMAT		0x00040000
+#define SND_PCM_NO_SOFTVOL		0x00080000
+
+typedef enum _snd_pcm_type {
+	SND_PCM_TYPE_HW = 0,
+	/* the rest are not supported by SALSA (of course!) */
+	SND_PCM_TYPE_HOOKS,
+	SND_PCM_TYPE_MULTI,
+	SND_PCM_TYPE_FILE,
+	SND_PCM_TYPE_NULL,
+	SND_PCM_TYPE_SHM,
+	SND_PCM_TYPE_INET,
+	SND_PCM_TYPE_COPY,
+	SND_PCM_TYPE_LINEAR,
+	SND_PCM_TYPE_ALAW,
+	SND_PCM_TYPE_MULAW,
+	SND_PCM_TYPE_ADPCM,
+	SND_PCM_TYPE_RATE,
+	SND_PCM_TYPE_ROUTE,
+	SND_PCM_TYPE_PLUG,
+	SND_PCM_TYPE_SHARE,
+	SND_PCM_TYPE_METER,
+	SND_PCM_TYPE_MIX,
+	SND_PCM_TYPE_DROUTE,
+	SND_PCM_TYPE_LBSERVER,
+	SND_PCM_TYPE_LINEAR_FLOAT,
+	SND_PCM_TYPE_LADSPA,
+	SND_PCM_TYPE_DMIX,
+	SND_PCM_TYPE_JACK,
+	SND_PCM_TYPE_DSNOOP,
+	SND_PCM_TYPE_DSHARE,
+	SND_PCM_TYPE_IEC958,
+	SND_PCM_TYPE_SOFTVOL,
+	SND_PCM_TYPE_IOPLUG,
+	SND_PCM_TYPE_EXTPLUG,
+	SND_PCM_TYPE_LAST = SND_PCM_TYPE_EXTPLUG
+} snd_pcm_type_t;
+
+typedef struct _snd_pcm_channel_area {
+	void *addr;
+	unsigned int first;
+	unsigned int step;
+} snd_pcm_channel_area_t;
 
 int snd_pcm_open(snd_pcm_t **pcm, const char *name, 
 		 snd_pcm_stream_t stream, int mode);
diff --git a/src/pcm_types.h b/src/pcm_types.h
deleted file mode 100644
index 79c523c..0000000
--- a/src/pcm_types.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef __ALSA_PCM_TYPES_H
-#define __ALSA_PCM_TYPES_H
-
-#include <unistd.h>
-#include <stdint.h>
-
-typedef snd_mask_t snd_pcm_access_mask_t;
-typedef snd_mask_t snd_pcm_format_mask_t;
-typedef snd_mask_t snd_pcm_subformat_mask_t;
-
-/* deprecated */
-typedef enum _snd_pcm_start {
-	SND_PCM_START_DATA = 0,
-	SND_PCM_START_EXPLICIT,
-	SND_PCM_START_LAST = SND_PCM_START_EXPLICIT
-} snd_pcm_start_t;
-
-/* deprecated */
-typedef enum _snd_pcm_xrun {
-	SND_PCM_XRUN_NONE = 0,
-	SND_PCM_XRUN_STOP,
-	SND_PCM_XRUN_LAST = SND_PCM_XRUN_STOP
-} snd_pcm_xrun_t;
-
-#define SND_PCM_NONBLOCK		0x00000001
-#define SND_PCM_ASYNC			0x00000002
-#define SND_PCM_NO_AUTO_RESAMPLE	0x00010000
-#define SND_PCM_NO_AUTO_CHANNELS	0x00020000
-#define SND_PCM_NO_AUTO_FORMAT		0x00040000
-#define SND_PCM_NO_SOFTVOL		0x00080000
-
-typedef enum _snd_pcm_type {
-	SND_PCM_TYPE_HW = 0,
-	/* the rest are not supported by SALSA (of course!) */
-	SND_PCM_TYPE_HOOKS,
-	SND_PCM_TYPE_MULTI,
-	SND_PCM_TYPE_FILE,
-	SND_PCM_TYPE_NULL,
-	SND_PCM_TYPE_SHM,
-	SND_PCM_TYPE_INET,
-	SND_PCM_TYPE_COPY,
-	SND_PCM_TYPE_LINEAR,
-	SND_PCM_TYPE_ALAW,
-	SND_PCM_TYPE_MULAW,
-	SND_PCM_TYPE_ADPCM,
-	SND_PCM_TYPE_RATE,
-	SND_PCM_TYPE_ROUTE,
-	SND_PCM_TYPE_PLUG,
-	SND_PCM_TYPE_SHARE,
-	SND_PCM_TYPE_METER,
-	SND_PCM_TYPE_MIX,
-	SND_PCM_TYPE_DROUTE,
-	SND_PCM_TYPE_LBSERVER,
-	SND_PCM_TYPE_LINEAR_FLOAT,
-	SND_PCM_TYPE_LADSPA,
-	SND_PCM_TYPE_DMIX,
-	SND_PCM_TYPE_JACK,
-	SND_PCM_TYPE_DSNOOP,
-	SND_PCM_TYPE_DSHARE,
-	SND_PCM_TYPE_IEC958,
-	SND_PCM_TYPE_SOFTVOL,
-	SND_PCM_TYPE_IOPLUG,
-	SND_PCM_TYPE_EXTPLUG,
-	SND_PCM_TYPE_LAST = SND_PCM_TYPE_EXTPLUG
-} snd_pcm_type_t;
-
-typedef struct _snd_pcm_channel_area {
-	void *addr;
-	unsigned int first;
-	unsigned int step;
-} snd_pcm_channel_area_t;
-
-#endif /* __ALSA_PCM_TYPES_H */
diff --git a/src/rawmidi_func.h b/src/rawmidi_func.h
index 2c53a63..c6c49fd 100644
--- a/src/rawmidi_func.h
+++ b/src/rawmidi_func.h
@@ -4,7 +4,17 @@
  */
 
 #include "global.h"
-#include "rawmidi_types.h"
+
+#define SND_RAWMIDI_APPEND	0x0001
+#define SND_RAWMIDI_NONBLOCK	0x0002
+#define SND_RAWMIDI_SYNC	0x0004
+
+typedef enum _snd_rawmidi_type {
+	SND_RAWMIDI_TYPE_HW,
+	SND_RAWMIDI_TYPE_SHM,		/* not used by SALSA */
+	SND_RAWMIDI_TYPE_INET,		/* not used by SALSA */
+	SND_RAWMIDI_TYPE_VIRTUAL	/* not used by SALSA */
+} snd_rawmidi_type_t;
 
 int snd_rawmidi_open(snd_rawmidi_t **in_rmidi, snd_rawmidi_t **out_rmidi,
 		     const char *name, int mode);
diff --git a/src/rawmidi_types.h b/src/rawmidi_types.h
deleted file mode 100644
index d05d1f0..0000000
--- a/src/rawmidi_types.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ALSA_RAWMIDI_TYPES_H
-#define __ALSA_RAWMIDI_TYPES_H
-
-#define SND_RAWMIDI_APPEND	0x0001
-#define SND_RAWMIDI_NONBLOCK	0x0002
-#define SND_RAWMIDI_SYNC	0x0004
-
-typedef enum _snd_rawmidi_type {
-	SND_RAWMIDI_TYPE_HW,
-	SND_RAWMIDI_TYPE_SHM,		/* not used by SALSA */
-	SND_RAWMIDI_TYPE_INET,		/* not used by SALSA */
-	SND_RAWMIDI_TYPE_VIRTUAL	/* not used by SALSA */
-} snd_rawmidi_type_t;
-
-#endif /* __ALSA_RAWMIDI_TYPES_H */
diff --git a/src/timer_func.h b/src/timer_func.h
index 65be841..a1d97d8 100644
--- a/src/timer_func.h
+++ b/src/timer_func.h
@@ -5,7 +5,18 @@
 
 #include "global.h"
 #include "hcontrol.h"
-#include "timer_types.h"
+
+#define SND_TIMER_OPEN_NONBLOCK		(1<<0)
+#define SND_TIMER_OPEN_TREAD		(1<<1)
+
+typedef enum _snd_timer_type {
+	SND_TIMER_TYPE_HW = 0,
+	SND_TIMER_TYPE_SHM,	/* not used by SALSA */
+	SND_TIMER_TYPE_INET	/* not used by SALSA */
+} snd_timer_type_t;
+
+typedef struct _snd_timer_query snd_timer_query_t;
+typedef struct _snd_timer snd_timer_t;
 
 int snd_timer_open(snd_timer_t **handle, const char *name, int mode);
 int snd_timer_close(snd_timer_t *handle);
diff --git a/src/timer_types.h b/src/timer_types.h
deleted file mode 100644
index cb4e40f..0000000
--- a/src/timer_types.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __ALSA_TIMER_TYPES_H
-#define __ALSA_TIMER_TYPES_H
-
-#define SND_TIMER_OPEN_NONBLOCK		(1<<0)
-#define SND_TIMER_OPEN_TREAD		(1<<1)
-
-typedef enum _snd_timer_type {
-	SND_TIMER_TYPE_HW = 0,
-	SND_TIMER_TYPE_SHM,	/* not used by SALSA */
-	SND_TIMER_TYPE_INET	/* not used by SALSA */
-} snd_timer_type_t;
-
-typedef struct _snd_timer_query snd_timer_query_t;
-typedef struct _snd_timer snd_timer_t;
-
-#endif /* __ALSA_TIMER_TYPES_H */