Encapsulated hwdep. Converted all enums to type safety

16 files changed, 365 insertions, 203 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index d14edb8e..e6fcfe2b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -4,7 +4,8 @@ sysinclude_HEADERS = asoundlib.h
 # This is the order they will be concatenated into asoundlib.h!
 #
 header_files=header.h version.h global.h input.h output.h error.h mixer.h \
-	     pcm.h pcm_m4.h rawmidi.h rawmidi_m4.h timer.h hwdep.h control.h \
+	     pcm.h pcm_m4.h rawmidi.h rawmidi_m4.h timer.h \
+	     hwdep.h hwdep_m4.h control.h \
 	     seq.h seqmid.h seq_midi_event.h \
              conv.h instr.h conf.h footer.h
 
diff --git a/include/aserver.h b/include/aserver.h
index 4ad4f91d..de092bc6 100644
--- a/include/aserver.h
+++ b/include/aserver.h
@@ -20,6 +20,20 @@
   
 #include "../src/pcm/pcm_local.h"
 
+typedef enum _snd_dev_type {
+	SND_DEV_TYPE_PCM,
+	SND_DEV_TYPE_CONTROL,
+	SND_DEV_TYPE_RAWMIDI,
+	SND_DEV_TYPE_TIMER,
+	SND_DEV_TYPE_HWDEP,
+	SND_DEV_TYPE_SEQ,
+} snd_dev_type_t;
+
+typedef enum _snd_transport_type {
+	SND_TRANSPORT_TYPE_SHM,
+	SND_TRANSPORT_TYPE_TCP,
+} snd_transport_type_t;
+
 #define SND_PCM_IOCTL_STATE		_IO ('A', 0xf1)
 #define SND_PCM_IOCTL_MMAP		_IO ('A', 0xf2)
 #define SND_PCM_IOCTL_MUNMAP		_IO ('A', 0xf3)
diff --git a/include/conf.h b/include/conf.h
index 5b1091bc..6e83042a 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -1,10 +1,21 @@
 
-typedef enum _snd_config_type {
+enum _snd_config_type {
         SND_CONFIG_TYPE_INTEGER,
         SND_CONFIG_TYPE_REAL,
         SND_CONFIG_TYPE_STRING,
 	SND_CONFIG_TYPE_COMPOUND,
-} snd_config_type_t;
+};
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_config_type *snd_config_type_t;
+#else
+typedef enum _snd_config_type snd_config_type_t;
+#endif
+
+#define SND_CONFIG_TYPE_INTEGER ((snd_config_type_t) SND_CONFIG_TYPE_INTEGER)
+#define SND_CONFIG_TYPE_REAL ((snd_config_type_t) SND_CONFIG_TYPE_REAL)
+#define SND_CONFIG_TYPE_STRING ((snd_config_type_t) SND_CONFIG_TYPE_STRING)
+#define SND_CONFIG_TYPE_COMPOUND ((snd_config_type_t) SND_CONFIG_TYPE_COMPOUND)
 
 typedef struct _snd_config snd_config_t;
 
diff --git a/include/control.h b/include/control.h
index 4f7535f4..f033b70e 100644
--- a/include/control.h
+++ b/include/control.h
@@ -5,102 +5,118 @@
  *                                                                          *
  ****************************************************************************/
 
-/* sndrv aliasing */
-
 typedef struct sndrv_aes_iec958 snd_aes_iec958_t;
 typedef union sndrv_digital_audio snd_digital_audio_t;
-typedef enum sndrv_card_type snd_card_type;
 typedef struct sndrv_ctl_hw_info snd_ctl_hw_info_t;
-typedef enum sndrv_control_type snd_control_type_t;
-typedef enum sndrv_control_iface snd_control_iface_t;
 typedef struct sndrv_control_id snd_control_id_t;
 typedef struct sndrv_control_list snd_control_list_t;
 typedef struct sndrv_control_info snd_control_info_t;
 typedef struct sndrv_control snd_control_t;
-typedef enum sndrv_ctl_event_type snd_ctl_event_type_t;
 typedef struct sndrv_ctl_event snd_ctl_event_t;
-#define SND_CARD_TYPE_GUS_CLASSIC SNDRV_CARD_TYPE_GUS_CLASSIC
-#define SND_CARD_TYPE_GUS_EXTREME SNDRV_CARD_TYPE_GUS_EXTREME
-#define SND_CARD_TYPE_GUS_ACE SNDRV_CARD_TYPE_GUS_ACE
-#define SND_CARD_TYPE_GUS_MAX SNDRV_CARD_TYPE_GUS_MAX
-#define SND_CARD_TYPE_AMD_INTERWAVE SNDRV_CARD_TYPE_AMD_INTERWAVE
-#define SND_CARD_TYPE_SB_10 SNDRV_CARD_TYPE_SB_10
-#define SND_CARD_TYPE_SB_20 SNDRV_CARD_TYPE_SB_20
-#define SND_CARD_TYPE_SB_PRO SNDRV_CARD_TYPE_SB_PRO
-#define SND_CARD_TYPE_SB_16 SNDRV_CARD_TYPE_SB_16
-#define SND_CARD_TYPE_SB_AWE SNDRV_CARD_TYPE_SB_AWE
-#define SND_CARD_TYPE_ESS_ES1688 SNDRV_CARD_TYPE_ESS_ES1688
-#define SND_CARD_TYPE_OPL3_SA2 SNDRV_CARD_TYPE_OPL3_SA2
-#define SND_CARD_TYPE_MOZART SNDRV_CARD_TYPE_MOZART
-#define SND_CARD_TYPE_S3_SONICVIBES SNDRV_CARD_TYPE_S3_SONICVIBES
-#define SND_CARD_TYPE_ENS1370 SNDRV_CARD_TYPE_ENS1370
-#define SND_CARD_TYPE_ENS1371 SNDRV_CARD_TYPE_ENS1371
-#define SND_CARD_TYPE_CS4232 SNDRV_CARD_TYPE_CS4232
-#define SND_CARD_TYPE_CS4236 SNDRV_CARD_TYPE_CS4236
-#define SND_CARD_TYPE_AMD_INTERWAVE_STB SNDRV_CARD_TYPE_AMD_INTERWAVE_STB
-#define SND_CARD_TYPE_ESS_ES1938 SNDRV_CARD_TYPE_ESS_ES1938
-#define SND_CARD_TYPE_ESS_ES18XX SNDRV_CARD_TYPE_ESS_ES18XX
-#define SND_CARD_TYPE_CS4231 SNDRV_CARD_TYPE_CS4231
-#define SND_CARD_TYPE_OPTI92X SNDRV_CARD_TYPE_OPTI92X
-#define SND_CARD_TYPE_SERIAL SNDRV_CARD_TYPE_SERIAL
-#define SND_CARD_TYPE_AD1848 SNDRV_CARD_TYPE_AD1848
-#define SND_CARD_TYPE_TRID4DWAVEDX SNDRV_CARD_TYPE_TRID4DWAVEDX
-#define SND_CARD_TYPE_TRID4DWAVENX SNDRV_CARD_TYPE_TRID4DWAVENX
-#define SND_CARD_TYPE_SGALAXY SNDRV_CARD_TYPE_SGALAXY
-#define SND_CARD_TYPE_CS46XX SNDRV_CARD_TYPE_CS46XX
-#define SND_CARD_TYPE_WAVEFRONT SNDRV_CARD_TYPE_WAVEFRONT
-#define SND_CARD_TYPE_TROPEZ SNDRV_CARD_TYPE_TROPEZ
-#define SND_CARD_TYPE_TROPEZPLUS SNDRV_CARD_TYPE_TROPEZPLUS
-#define SND_CARD_TYPE_MAUI SNDRV_CARD_TYPE_MAUI
-#define SND_CARD_TYPE_CMI8330 SNDRV_CARD_TYPE_CMI8330
-#define SND_CARD_TYPE_DUMMY SNDRV_CARD_TYPE_DUMMY
-#define SND_CARD_TYPE_ALS100 SNDRV_CARD_TYPE_ALS100
-#define SND_CARD_TYPE_SHARE SNDRV_CARD_TYPE_SHARE
-#define SND_CARD_TYPE_SI_7018 SNDRV_CARD_TYPE_SI_7018
-#define SND_CARD_TYPE_OPTI93X SNDRV_CARD_TYPE_OPTI93X
-#define SND_CARD_TYPE_MTPAV SNDRV_CARD_TYPE_MTPAV
-#define SND_CARD_TYPE_VIRMIDI SNDRV_CARD_TYPE_VIRMIDI
-#define SND_CARD_TYPE_EMU10K1 SNDRV_CARD_TYPE_EMU10K1
-#define SND_CARD_TYPE_HAMMERFALL SNDRV_CARD_TYPE_HAMMERFALL
-#define SND_CARD_TYPE_HAMMERFALL_LIGHT SNDRV_CARD_TYPE_HAMMERFALL_LIGHT
-#define SND_CARD_TYPE_ICE1712 SNDRV_CARD_TYPE_ICE1712
-#define SND_CARD_TYPE_CMI8338 SNDRV_CARD_TYPE_CMI8338
-#define SND_CARD_TYPE_CMI8738 SNDRV_CARD_TYPE_CMI8738
-#define SND_CARD_TYPE_AD1816A SNDRV_CARD_TYPE_AD1816A
-#define SND_CARD_TYPE_INTEL8X0 SNDRV_CARD_TYPE_INTEL8X0
-#define SND_CARD_TYPE_ESS_ESOLDM1 SNDRV_CARD_TYPE_ESS_ESOLDM1
-#define SND_CARD_TYPE_ESS_ES1968 SNDRV_CARD_TYPE_ESS_ES1968
-#define SND_CARD_TYPE_ESS_ES1978 SNDRV_CARD_TYPE_ESS_ES1978
-#define SND_CARD_TYPE_DIGI96 SNDRV_CARD_TYPE_DIGI96
-#define SND_CARD_TYPE_VIA82C686A SNDRV_CARD_TYPE_VIA82C686A
-#define SND_CARD_TYPE_FM801 SNDRV_CARD_TYPE_FM801
-#define SND_CARD_TYPE_AZT2320 SNDRV_CARD_TYPE_AZT2320
-#define SND_CARD_TYPE_PRODIF_PLUS SNDRV_CARD_TYPE_PRODIF_PLUS
-#define SND_CARD_TYPE_YMFPCI SNDRV_CARD_TYPE_YMFPCI
-#define SND_CARD_TYPE_CS4281 SNDRV_CARD_TYPE_CS4281
-#define SND_CARD_TYPE_MPU401_UART SNDRV_CARD_TYPE_MPU401_UART
-#define SND_CARD_TYPE_ALS4000 SNDRV_CARD_TYPE_ALS4000
-#define SND_CARD_TYPE_ALLEGRO_1 SNDRV_CARD_TYPE_ALLEGRO_1
-#define SND_CARD_TYPE_ALLEGRO SNDRV_CARD_TYPE_ALLEGRO
-#define SND_CARD_TYPE_MAESTRO3 SNDRV_CARD_TYPE_MAESTRO3
-#define SND_CARD_TYPE_AWACS SNDRV_CARD_TYPE_AWACS
-#define SND_CARD_TYPE_NM256AV SNDRV_CARD_TYPE_NM256AV
-#define SND_CARD_TYPE_NM256ZX SNDRV_CARD_TYPE_NM256ZX
-#define SND_CARD_TYPE_VIA8233 SNDRV_CARD_TYPE_VIA8233
-#define SND_CARD_TYPE_LAST SNDRV_CARD_TYPE_LAST
-#define SND_CONTROL_TYPE_NONE SNDRV_CONTROL_TYPE_NONE
-#define SND_CONTROL_TYPE_BOOLEAN SNDRV_CONTROL_TYPE_BOOLEAN
-#define SND_CONTROL_TYPE_INTEGER SNDRV_CONTROL_TYPE_INTEGER
-#define SND_CONTROL_TYPE_ENUMERATED SNDRV_CONTROL_TYPE_ENUMERATED
-#define SND_CONTROL_TYPE_BYTES SNDRV_CONTROL_TYPE_BYTES
-#define SND_CONTROL_TYPE_IEC958 SNDRV_CONTROL_TYPE_IEC958
-#define SND_CONTROL_IFACE_CARD SNDRV_CONTROL_IFACE_CARD
-#define SND_CONTROL_IFACE_HWDEP SNDRV_CONTROL_IFACE_HWDEP
-#define SND_CONTROL_IFACE_MIXER SNDRV_CONTROL_IFACE_MIXER
-#define SND_CONTROL_IFACE_PCM SNDRV_CONTROL_IFACE_PCM
-#define SND_CONTROL_IFACE_RAWMIDI SNDRV_CONTROL_IFACE_RAWMIDI
-#define SND_CONTROL_IFACE_TIMER SNDRV_CONTROL_IFACE_TIMER
-#define SND_CONTROL_IFACE_SEQUENCER SNDRV_CONTROL_IFACE_SEQUENCER
+
+#ifdef SND_ENUM_TYPECHECK
+typedef enum sndrv_card_type snd_card_type;
+typedef enum sndrv_control_type snd_control_type_t;
+typedef enum sndrv_control_iface snd_control_iface_t;
+typedef enum sndrv_ctl_event_type snd_ctl_event_type_t;
+#else
+typedef struct __snd_card_type *snd_card_type;
+typedef struct __snd_control_type *snd_control_type_t;
+typedef struct __snd_control_iface *snd_control_iface_t;
+typedef struct __snd_ctl_event_type *snd_ctl_event_type_t;
+#endif
+
+#define SND_CARD_TYPE_GUS_CLASSIC ((snd_card_type_t) SNDRV_CARD_TYPE_GUS_CLASSIC)
+#define SND_CARD_TYPE_GUS_EXTREME ((snd_card_type_t) SNDRV_CARD_TYPE_GUS_EXTREME)
+#define SND_CARD_TYPE_GUS_ACE ((snd_card_type_t) SNDRV_CARD_TYPE_GUS_ACE)
+#define SND_CARD_TYPE_GUS_MAX ((snd_card_type_t) SNDRV_CARD_TYPE_GUS_MAX)
+#define SND_CARD_TYPE_AMD_INTERWAVE ((snd_card_type_t) SNDRV_CARD_TYPE_AMD_INTERWAVE)
+#define SND_CARD_TYPE_SB_10 ((snd_card_type_t) SNDRV_CARD_TYPE_SB_10)
+#define SND_CARD_TYPE_SB_20 ((snd_card_type_t) SNDRV_CARD_TYPE_SB_20)
+#define SND_CARD_TYPE_SB_PRO ((snd_card_type_t) SNDRV_CARD_TYPE_SB_PRO)
+#define SND_CARD_TYPE_SB_16 ((snd_card_type_t) SNDRV_CARD_TYPE_SB_16)
+#define SND_CARD_TYPE_SB_AWE ((snd_card_type_t) SNDRV_CARD_TYPE_SB_AWE)
+#define SND_CARD_TYPE_ESS_ES1688 ((snd_card_type_t) SNDRV_CARD_TYPE_ESS_ES1688)
+#define SND_CARD_TYPE_OPL3_SA2 ((snd_card_type_t) SNDRV_CARD_TYPE_OPL3_SA2)
+#define SND_CARD_TYPE_MOZART ((snd_card_type_t) SNDRV_CARD_TYPE_MOZART)
+#define SND_CARD_TYPE_S3_SONICVIBES ((snd_card_type_t) SNDRV_CARD_TYPE_S3_SONICVIBES)
+#define SND_CARD_TYPE_ENS1370 ((snd_card_type_t) SNDRV_CARD_TYPE_ENS1370)
+#define SND_CARD_TYPE_ENS1371 ((snd_card_type_t) SNDRV_CARD_TYPE_ENS1371)
+#define SND_CARD_TYPE_CS4232 ((snd_card_type_t) SNDRV_CARD_TYPE_CS4232)
+#define SND_CARD_TYPE_CS4236 ((snd_card_type_t) SNDRV_CARD_TYPE_CS4236)
+#define SND_CARD_TYPE_AMD_INTERWAVE_STB ((snd_card_type_t) SNDRV_CARD_TYPE_AMD_INTERWAVE_STB)
+#define SND_CARD_TYPE_ESS_ES1938 ((snd_card_type_t) SNDRV_CARD_TYPE_ESS_ES1938)
+#define SND_CARD_TYPE_ESS_ES18XX ((snd_card_type_t) SNDRV_CARD_TYPE_ESS_ES18XX)
+#define SND_CARD_TYPE_CS4231 ((snd_card_type_t) SNDRV_CARD_TYPE_CS4231)
+#define SND_CARD_TYPE_OPTI92X ((snd_card_type_t) SNDRV_CARD_TYPE_OPTI92X)
+#define SND_CARD_TYPE_SERIAL ((snd_card_type_t) SNDRV_CARD_TYPE_SERIAL)
+#define SND_CARD_TYPE_AD1848 ((snd_card_type_t) SNDRV_CARD_TYPE_AD1848)
+#define SND_CARD_TYPE_TRID4DWAVEDX ((snd_card_type_t) SNDRV_CARD_TYPE_TRID4DWAVEDX)
+#define SND_CARD_TYPE_TRID4DWAVENX ((snd_card_type_t) SNDRV_CARD_TYPE_TRID4DWAVENX)
+#define SND_CARD_TYPE_SGALAXY ((snd_card_type_t) SNDRV_CARD_TYPE_SGALAXY)
+#define SND_CARD_TYPE_CS46XX ((snd_card_type_t) SNDRV_CARD_TYPE_CS46XX)
+#define SND_CARD_TYPE_WAVEFRONT ((snd_card_type_t) SNDRV_CARD_TYPE_WAVEFRONT)
+#define SND_CARD_TYPE_TROPEZ ((snd_card_type_t) SNDRV_CARD_TYPE_TROPEZ)
+#define SND_CARD_TYPE_TROPEZPLUS ((snd_card_type_t) SNDRV_CARD_TYPE_TROPEZPLUS)
+#define SND_CARD_TYPE_MAUI ((snd_card_type_t) SNDRV_CARD_TYPE_MAUI)
+#define SND_CARD_TYPE_CMI8330 ((snd_card_type_t) SNDRV_CARD_TYPE_CMI8330)
+#define SND_CARD_TYPE_DUMMY ((snd_card_type_t) SNDRV_CARD_TYPE_DUMMY)
+#define SND_CARD_TYPE_ALS100 ((snd_card_type_t) SNDRV_CARD_TYPE_ALS100)
+#define SND_CARD_TYPE_SHARE ((snd_card_type_t) SNDRV_CARD_TYPE_SHARE)
+#define SND_CARD_TYPE_SI_7018 ((snd_card_type_t) SNDRV_CARD_TYPE_SI_7018)
+#define SND_CARD_TYPE_OPTI93X ((snd_card_type_t) SNDRV_CARD_TYPE_OPTI93X)
+#define SND_CARD_TYPE_MTPAV ((snd_card_type_t) SNDRV_CARD_TYPE_MTPAV)
+#define SND_CARD_TYPE_VIRMIDI ((snd_card_type_t) SNDRV_CARD_TYPE_VIRMIDI)
+#define SND_CARD_TYPE_EMU10K1 ((snd_card_type_t) SNDRV_CARD_TYPE_EMU10K1)
+#define SND_CARD_TYPE_HAMMERFALL ((snd_card_type_t) SNDRV_CARD_TYPE_HAMMERFALL)
+#define SND_CARD_TYPE_HAMMERFALL_LIGHT ((snd_card_type_t) SNDRV_CARD_TYPE_HAMMERFALL_LIGHT)
+#define SND_CARD_TYPE_ICE1712 ((snd_card_type_t) SNDRV_CARD_TYPE_ICE1712)
+#define SND_CARD_TYPE_CMI8338 ((snd_card_type_t) SNDRV_CARD_TYPE_CMI8338)
+#define SND_CARD_TYPE_CMI8738 ((snd_card_type_t) SNDRV_CARD_TYPE_CMI8738)
+#define SND_CARD_TYPE_AD1816A ((snd_card_type_t) SNDRV_CARD_TYPE_AD1816A)
+#define SND_CARD_TYPE_INTEL8X0 ((snd_card_type_t) SNDRV_CARD_TYPE_INTEL8X0)
+#define SND_CARD_TYPE_ESS_ESOLDM1 ((snd_card_type_t) SNDRV_CARD_TYPE_ESS_ESOLDM1)
+#define SND_CARD_TYPE_ESS_ES1968 ((snd_card_type_t) SNDRV_CARD_TYPE_ESS_ES1968)
+#define SND_CARD_TYPE_ESS_ES1978 ((snd_card_type_t) SNDRV_CARD_TYPE_ESS_ES1978)
+#define SND_CARD_TYPE_DIGI96 ((snd_card_type_t) SNDRV_CARD_TYPE_DIGI96)
+#define SND_CARD_TYPE_VIA82C686A ((snd_card_type_t) SNDRV_CARD_TYPE_VIA82C686A)
+#define SND_CARD_TYPE_FM801 ((snd_card_type_t) SNDRV_CARD_TYPE_FM801)
+#define SND_CARD_TYPE_AZT2320 ((snd_card_type_t) SNDRV_CARD_TYPE_AZT2320)
+#define SND_CARD_TYPE_PRODIF_PLUS ((snd_card_type_t) SNDRV_CARD_TYPE_PRODIF_PLUS)
+#define SND_CARD_TYPE_YMFPCI ((snd_card_type_t) SNDRV_CARD_TYPE_YMFPCI)
+#define SND_CARD_TYPE_CS4281 ((snd_card_type_t) SNDRV_CARD_TYPE_CS4281)
+#define SND_CARD_TYPE_MPU401_UART ((snd_card_type_t) SNDRV_CARD_TYPE_MPU401_UART)
+#define SND_CARD_TYPE_ALS4000 ((snd_card_type_t) SNDRV_CARD_TYPE_ALS4000)
+#define SND_CARD_TYPE_ALLEGRO_1 ((snd_card_type_t) SNDRV_CARD_TYPE_ALLEGRO_1)
+#define SND_CARD_TYPE_ALLEGRO ((snd_card_type_t) SNDRV_CARD_TYPE_ALLEGRO)
+#define SND_CARD_TYPE_MAESTRO3 ((snd_card_type_t) SNDRV_CARD_TYPE_MAESTRO3)
+#define SND_CARD_TYPE_AWACS ((snd_card_type_t) SNDRV_CARD_TYPE_AWACS)
+#define SND_CARD_TYPE_NM256AV ((snd_card_type_t) SNDRV_CARD_TYPE_NM256AV)
+#define SND_CARD_TYPE_NM256ZX ((snd_card_type_t) SNDRV_CARD_TYPE_NM256ZX)
+#define SND_CARD_TYPE_VIA8233 ((snd_card_type_t) SNDRV_CARD_TYPE_VIA8233)
+#define SND_CARD_TYPE_LAST ((snd_card_type_t) SNDRV_CARD_TYPE_LAST)
+
+#define SND_CONTROL_TYPE_NONE ((snd_control_type_t) SNDRV_CONTROL_TYPE_NONE)
+#define SND_CONTROL_TYPE_BOOLEAN ((snd_control_type_t) SNDRV_CONTROL_TYPE_BOOLEAN)
+#define SND_CONTROL_TYPE_INTEGER ((snd_control_type_t) SNDRV_CONTROL_TYPE_INTEGER)
+#define SND_CONTROL_TYPE_ENUMERATED ((snd_control_type_t) SNDRV_CONTROL_TYPE_ENUMERATED)
+#define SND_CONTROL_TYPE_BYTES ((snd_control_type_t) SNDRV_CONTROL_TYPE_BYTES)
+#define SND_CONTROL_TYPE_IEC958 ((snd_control_type_t) SNDRV_CONTROL_TYPE_IEC958)
+
+#define SND_CONTROL_IFACE_CARD ((snd_control_iface_t) SNDRV_CONTROL_IFACE_CARD)
+#define SND_CONTROL_IFACE_HWDEP ((snd_control_iface_t) SNDRV_CONTROL_IFACE_HWDEP)
+#define SND_CONTROL_IFACE_MIXER ((snd_control_iface_t) SNDRV_CONTROL_IFACE_MIXER)
+#define SND_CONTROL_IFACE_PCM ((snd_control_iface_t) SNDRV_CONTROL_IFACE_PCM)
+#define SND_CONTROL_IFACE_RAWMIDI ((snd_control_iface_t) SNDRV_CONTROL_IFACE_RAWMIDI)
+#define SND_CONTROL_IFACE_TIMER ((snd_control_iface_t) SNDRV_CONTROL_IFACE_TIMER)
+#define SND_CONTROL_IFACE_SEQUENCER ((snd_control_iface_t) SNDRV_CONTROL_IFACE_SEQUENCER)
+
+#define SND_CTL_EVENT_REBUILD ((snd_ctl_event_type_t) SNDRV_CTL_EVENT_REBUILD)
+#define SND_CTL_EVENT_VALUE ((snd_ctl_event_type_t) SNDRV_CTL_EVENT_VALUE)
+#define SND_CTL_EVENT_CHANGE ((snd_ctl_event_type_t) SNDRV_CTL_EVENT_CHANGE)
+#define SND_CTL_EVENT_ADD ((snd_ctl_event_type_t) SNDRV_CTL_EVENT_ADD)
+#define SND_CTL_EVENT_REMOVE ((snd_ctl_event_type_t) SNDRV_CTL_EVENT_REMOVE)
+
 #define SND_CONTROL_ACCESS_READ SNDRV_CONTROL_ACCESS_READ
 #define SND_CONTROL_ACCESS_WRITE SNDRV_CONTROL_ACCESS_WRITE
 #define SND_CONTROL_ACCESS_READWRITE SNDRV_CONTROL_ACCESS_READWRITE
@@ -108,18 +124,24 @@ typedef struct sndrv_ctl_event snd_ctl_event_t;
 #define SND_CONTROL_ACCESS_INACTIVE SNDRV_CONTROL_ACCESS_INACTIVE
 #define SND_CONTROL_ACCESS_LOCK SNDRV_CONTROL_ACCESS_LOCK
 #define SND_CONTROL_ACCESS_INDIRECT SNDRV_CONTROL_ACCESS_INDIRECT
-#define SND_CTL_EVENT_REBUILD SNDRV_CTL_EVENT_REBUILD
-#define SND_CTL_EVENT_VALUE SNDRV_CTL_EVENT_VALUE
-#define SND_CTL_EVENT_CHANGE SNDRV_CTL_EVENT_CHANGE
-#define SND_CTL_EVENT_ADD SNDRV_CTL_EVENT_ADD
-#define SND_CTL_EVENT_REMOVE SNDRV_CTL_EVENT_REMOVE
 
-typedef struct _snd_ctl snd_ctl_t;
+enum _snd_ctl_type {
+	SND_CTL_TYPE_HW,
+	SND_CTL_TYPE_SHM,
+	SND_CTL_TYPE_INET
+};
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_ctl_type *snd_ctl_type_t;
+#else
+typedef enum _snd_ctl_type snd_ctl_type_t;
+#endif
 
-typedef enum _snd_ctl_type { SND_CTL_TYPE_HW,
-	       SND_CTL_TYPE_SHM,
-	       SND_CTL_TYPE_INET
- } snd_ctl_type_t;
+#define SND_CTL_TYPE_HW ((snd_ctl_type_t) SND_CTL_TYPE_HW)
+#define SND_CTL_TYPE_SHM ((snd_ctl_type_t) SND_CTL_TYPE_SHM)
+#define SND_CTL_TYPE_INET ((snd_ctl_type_t) SND_CTL_TYPE_INET)
+
+typedef struct _snd_ctl snd_ctl_t;
 
 typedef struct _snd_ctl_callbacks {
 	void *private_data;	/* may be used by an application */
diff --git a/include/global.h b/include/global.h
index c3ab7b9d..1b69491b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -2,13 +2,39 @@
  *  Global defines
  */
 
-#define SND_DEV_TYPE_PCM	0
-#define SND_DEV_TYPE_CONTROL	1
-#define SND_DEV_TYPE_RAWMIDI	2
-#define SND_DEV_TYPE_TIMER	3
-#define SND_DEV_TYPE_HWDEP	4
-#define SND_DEV_TYPE_SEQ	5
-
-#define SND_TRANSPORT_TYPE_SHM	0
-#define SND_TRANSPORT_TYPE_TCP	1
+#ifdef SNDRV_LITTLE_ENDIAN
+#define SND_LITTLE_ENDIAN SNDRV_LITTLE_ENDIAN
+#endif
+
+#ifdef SNDRV_BIG_ENDIAN
+#define SND_BIG_ENDIAN SNDRV_BIG_ENDIAN
+#endif
+
+//#define SND_ENUM_TYPECHECK
+
+#ifdef SND_ENUM_TYPECHECK
+#define snd_enum_to_int(v) ((unsigned int)(unsigned long)(v))
+#define snd_int_to_enum(v) ((void *)(unsigned long)(v))
+#define snd_enum_incr(v) (++(unsigned long)(v))
+#else
+#define snd_enum_to_int(v) (v)
+#define snd_int_to_enum(v) (v)
+#define snd_enum_incr(v) (++(v))
+#endif
+
+enum _snd_set_mode {
+	SND_CHANGE,
+	SND_TRY,
+	SND_TEST,
+};
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_set_mode *snd_set_mode_t;
+#else
+typedef enum _snd_set_mode snd_set_mode_t;
+#endif
+
+#define SND_CHANGE ((snd_set_mode_t) SND_CHANGE)
+#define SND_TRY ((snd_set_mode_t) SND_TRY)
+#define SND_TEST ((snd_set_mode_t) SND_TEST)
 
diff --git a/include/header.h b/include/header.h
index 9fc487f1..f7356091 100644
--- a/include/header.h
+++ b/include/header.h
@@ -37,35 +37,3 @@
 #define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
 #endif
 
-#ifdef SNDRV_LITTLE_ENDIAN
-#define SND_LITTLE_ENDIAN SNDRV_LITTLE_ENDIAN
-#endif
-
-#ifdef SNDRV_BIG_ENDIAN
-#define SND_BIG_ENDIAN SNDRV_BIG_ENDIAN
-#endif
-
-
-enum _snd_set_mode {
-	SND_CHANGE,
-	SND_TRY,
-	SND_TEST,
-};
-
-//#define SND_ENUM_TYPECHECK
-
-#ifdef SND_ENUM_TYPECHECK
-typedef struct __snd_set_mode *snd_set_mode_t;
-#define snd_enum_to_int(v) ((unsigned int)(unsigned long)(v))
-#define snd_int_to_enum(v) ((void *)(unsigned long)(v))
-#define snd_enum_incr(v) (++(unsigned long)(v))
-#else
-typedef enum _snd_set_mode snd_set_mode_t;
-#define snd_enum_to_int(v) (v)
-#define snd_int_to_enum(v) (v)
-#define snd_enum_incr(v) (++(v))
-#endif
-
-#define SND_CHANGE ((snd_set_mode_t) SND_CHANGE)
-#define SND_TRY ((snd_set_mode_t) SND_TRY)
-#define SND_TEST ((snd_set_mode_t) SND_TEST)
diff --git a/include/hwdep.h b/include/hwdep.h
index 18135ac1..76bd4363 100644
--- a/include/hwdep.h
+++ b/include/hwdep.h
@@ -5,17 +5,22 @@
  *                                                                          *
  ****************************************************************************/
 
-/* sndrv aliasing */
+typedef struct _snd_hwdep_info snd_hwdep_info_t;
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_hwdep_type *snd_hwdep_type_t;
+#else
 typedef enum sndrv_hwdep_type snd_hwdep_type_t;
-typedef struct sndrv_hwdep_info snd_hwdep_info_t;
-#define SND_HWDEP_TYPE_OPL2 SNDRV_HWDEP_TYPE_OPL2
-#define SND_HWDEP_TYPE_OPL3 SNDRV_HWDEP_TYPE_OPL3
-#define SND_HWDEP_TYPE_OPL4 SNDRV_HWDEP_TYPE_OPL4
-#define SND_HWDEP_TYPE_SB16CSP SNDRV_HWDEP_TYPE_SB16CSP
-#define SND_HWDEP_TYPE_EMU10K1 SNDRV_HWDEP_TYPE_EMU10K1
-#define SND_HWDEP_TYPE_YSS225 SNDRV_HWDEP_TYPE_YSS225
-#define SND_HWDEP_TYPE_ICS2115 SNDRV_HWDEP_TYPE_ICS2115
-#define SND_HWDEP_TYPE_LAST SNDRV_HWDEP_TYPE_LAST
+#endif
+
+#define SND_HWDEP_TYPE_OPL2 ((snd_hwdep_type_t) SNDRV_HWDEP_TYPE_OPL2)
+#define SND_HWDEP_TYPE_OPL3 ((snd_hwdep_type_t) SNDRV_HWDEP_TYPE_OPL3)
+#define SND_HWDEP_TYPE_OPL4 ((snd_hwdep_type_t) SNDRV_HWDEP_TYPE_OPL4)
+#define SND_HWDEP_TYPE_SB16CSP ((snd_hwdep_type_t) SNDRV_HWDEP_TYPE_SB16CSP)
+#define SND_HWDEP_TYPE_EMU10K1 ((snd_hwdep_type_t) SNDRV_HWDEP_TYPE_EMU10K1)
+#define SND_HWDEP_TYPE_YSS225 ((snd_hwdep_type_t) SNDRV_HWDEP_TYPE_YSS225)
+#define SND_HWDEP_TYPE_ICS2115 ((snd_hwdep_type_t) SNDRV_HWDEP_TYPE_ICS2115)
+#define SND_HWDEP_TYPE_LAST ((snd_hwdep_type_t) SNDRV_HWDEP_TYPE_LAST)
 
 #define SND_HWDEP_OPEN_READ		(O_RDONLY)
 #define SND_HWDEP_OPEN_WRITE		(O_WRONLY)
diff --git a/include/hwdep_m4.h b/include/hwdep_m4.h
new file mode 100644
index 00000000..dd02c4d0
--- /dev/null
+++ b/include/hwdep_m4.h
@@ -0,0 +1,26 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+size_t snd_hwdep_info_sizeof();
+#define snd_hwdep_info_alloca(ptr) ({assert(ptr); *ptr = (snd_hwdep_info_t *) alloca(snd_hwdep_info_sizeof()); 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_type_t snd_hwdep_info_get_type(const snd_hwdep_info_t *obj);
+
+void snd_hwdep_info_set_device(snd_hwdep_info_t *obj, unsigned int val);
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/include/input.h b/include/input.h
index 7ed320b8..99e9864a 100644
--- a/include/input.h
+++ b/include/input.h
@@ -1,10 +1,19 @@
 
 typedef struct _snd_input snd_input_t;
 
-typedef enum _snd_input_type {
+enum _snd_input_type {
 	SND_INPUT_STDIO,
 	SND_INPUT_BUFFER,
-} snd_input_type_t;
+};
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_input_type *snd_input_type_t;
+#else
+typedef enum _snd_input_type snd_input_type_t;
+#endif
+
+#define SND_INPUT_STDIO ((snd_input_type_t) SND_INPUT_STDIO)
+#define SND_INPUT_BUFFER ((snd_input_type_t) SND_INPUT_BUFFER)
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/local.h b/include/local.h
index 5c5e08e2..ecf16653 100644
--- a/include/local.h
+++ b/include/local.h
@@ -29,6 +29,8 @@
 #define _snd_rawmidi_params sndrv_rawmidi_params
 #define _snd_rawmidi_status sndrv_rawmidi_status
 
+#define _snd_hwdep_info sndrv_hwdep_info
+
 #include "asoundlib.h"
 
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
diff --git a/include/mixer.h b/include/mixer.h
index 2382062d..93fff1d5 100644
--- a/include/mixer.h
+++ b/include/mixer.h
@@ -24,7 +24,8 @@ int snd_mixer_poll_descriptor(snd_mixer_t *handle);
  *  Simple (legacy) mixer API
  */
 
-typedef enum _snd_mixer_channel_id {
+enum _snd_mixer_channel_id {
+	SND_MIXER_CHN_UNKNOWN = -1,
 	SND_MIXER_CHN_FRONT_LEFT = 0,
 	SND_MIXER_CHN_FRONT_RIGHT,
 	SND_MIXER_CHN_FRONT_CENTER,
@@ -33,15 +34,31 @@ typedef enum _snd_mixer_channel_id {
 	SND_MIXER_CHN_WOOFER,
 	SND_MIXER_CHN_LAST = 31,
 	SND_MIXER_CHN_MONO = SND_MIXER_CHN_FRONT_LEFT
-} snd_mixer_channel_id_t;
-
-#define SND_MIXER_CHN_MASK_MONO		(1<<SND_MIXER_CHN_MONO)
-#define SND_MIXER_CHN_MASK_FRONT_LEFT	(1<<SND_MIXER_CHN_FRONT_LEFT)
-#define SND_MIXER_CHN_MASK_FRONT_RIGHT	(1<<SND_MIXER_CHN_FRONT_RIGHT)
-#define SND_MIXER_CHN_MASK_FRONT_CENTER	(1<<SND_MIXER_CHN_FRONT_CENTER)
-#define SND_MIXER_CHN_MASK_REAR_LEFT	(1<<SND_MIXER_CHN_REAR_LEFT)
-#define SND_MIXER_CHN_MASK_REAR_RIGHT	(1<<SND_MIXER_CHN_REAR_RIGHT)
-#define SND_MIXER_CHN_MASK_WOOFER	(1<<SND_MIXER_CHN_WOOFER)
+};
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_mixer_channel_id *snd_mixer_channel_id_t;
+#else
+typedef enum _snd_mixer_channel_id snd_mixer_channel_id_t;
+#endif
+
+#define SND_MIXER_CHN_UNKNOWN ((snd_mixer_channel_id_t) SND_MIXER_CHN_UNKNOWN)
+#define SND_MIXER_CHN_FRONT_LEFT ((snd_mixer_channel_id_t) SND_MIXER_CHN_FRONT_LEFT)
+#define SND_MIXER_CHN_FRONT_RIGHT ((snd_mixer_channel_id_t) SND_MIXER_CHN_FRONT_RIGHT)
+#define SND_MIXER_CHN_FRONT_CENTER ((snd_mixer_channel_id_t) SND_MIXER_CHN_FRONT_CENTER)
+#define SND_MIXER_CHN_REAR_LEFT ((snd_mixer_channel_id_t) SND_MIXER_CHN_REAR_LEFT)
+#define SND_MIXER_CHN_REAR_RIGHT ((snd_mixer_channel_id_t) SND_MIXER_CHN_REAR_RIGHT)
+#define SND_MIXER_CHN_WOOFER ((snd_mixer_channel_id_t) SND_MIXER_CHN_WOOFER)
+#define SND_MIXER_CHN_LAST ((snd_mixer_channel_id_t) SND_MIXER_CHN_LAST)
+#define SND_MIXER_CHN_MONO ((snd_mixer_channel_id_t) SND_MIXER_CHN_MONO)
+
+#define SND_MIXER_CHN_MASK_MONO		(1<<snd_enum_to_int(SND_MIXER_CHN_MONO))
+#define SND_MIXER_CHN_MASK_FRONT_LEFT	(1<<snd_enum_to_int(SND_MIXER_CHN_FRONT_LEFT))
+#define SND_MIXER_CHN_MASK_FRONT_RIGHT	(1<<snd_enum_to_int(SND_MIXER_CHN_FRONT_RIGHT))
+#define SND_MIXER_CHN_MASK_FRONT_CENTER	(1<<snd_enum_to_int(SND_MIXER_CHN_FRONT_CENTER))
+#define SND_MIXER_CHN_MASK_REAR_LEFT	(1<<snd_enum_to_int(SND_MIXER_CHN_REAR_LEFT))
+#define SND_MIXER_CHN_MASK_REAR_RIGHT	(1<<snd_enum_to_int(SND_MIXER_CHN_REAR_RIGHT))
+#define SND_MIXER_CHN_MASK_WOOFER	(1<<snd_enum_to_int(SND_MIXER_CHN_WOOFER))
 #define SND_MIXER_CHN_MASK_STEREO	(SND_MIXER_CHN_MASK_FRONT_LEFT|SND_MIXER_CHN_MASK_FRONT_RIGHT)
 
 #define SND_MIXER_SCTCAP_VOLUME         (1<<0)
@@ -103,7 +120,7 @@ typedef struct _snd_mixer_simple_callbacks {
 extern "C" {
 #endif
 
-const char *snd_mixer_simple_channel_name(int channel);
+const char *snd_mixer_simple_channel_name(snd_mixer_channel_id_t channel);
 int snd_mixer_simple_control_list(snd_mixer_t *handle, snd_mixer_simple_control_list_t *list);
 int snd_mixer_simple_control_read(snd_mixer_t *handle, snd_mixer_simple_control_t *simple);
 int snd_mixer_simple_control_write(snd_mixer_t *handle, snd_mixer_simple_control_t *simple);
diff --git a/include/output.h b/include/output.h
index c2301949..7bed44e4 100644
--- a/include/output.h
+++ b/include/output.h
@@ -1,10 +1,20 @@
 
 typedef struct _snd_output snd_output_t;
 
-typedef enum _snd_output_type {
+enum _snd_output_type {
 	SND_OUTPUT_STDIO,
 	SND_OUTPUT_BUFFER,
-} snd_output_type_t;
+};
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_output_type *snd_output_type_t;
+#else
+typedef enum _snd_output_type snd_output_type_t;
+#endif
+
+#define SND_OUTPUT_STDIO ((snd_output_type_t) SND_OUTPUT_STDIO)
+#define SND_OUTPUT_BUFFER ((snd_output_type_t) SND_OUTPUT_BUFFER)
+
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/pcm.h b/include/pcm.h
index be371a4b..0c3687ca 100644
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -13,18 +13,17 @@ typedef struct _snd_pcm_access_mask snd_pcm_access_mask_t;
 typedef struct _snd_pcm_format_mask snd_pcm_format_mask_t;
 typedef struct _snd_pcm_subformat_mask snd_pcm_subformat_mask_t;
 
-/* sndrv aliasing */
 #ifdef SND_ENUM_TYPECHECK
-typedef struct _snd_pcm_class *snd_pcm_class_t;
-typedef struct _snd_pcm_subclass *snd_pcm_subclass_t;
-typedef struct _snd_pcm_stream *snd_pcm_stream_t;
-typedef struct _snd_pcm_access *snd_pcm_access_t;
-typedef struct _snd_pcm_format *snd_pcm_format_t;
-typedef struct _snd_pcm_subformat *snd_pcm_subformat_t;
-typedef struct _snd_pcm_state *snd_pcm_state_t;
-typedef struct _snd_pcm_start *snd_pcm_start_t;
-typedef struct _snd_pcm_xrun *snd_pcm_xrun_t;
-typedef struct _snd_pcm_tstamp *snd_pcm_tstamp_t;
+typedef struct __snd_pcm_class *snd_pcm_class_t;
+typedef struct __snd_pcm_subclass *snd_pcm_subclass_t;
+typedef struct __snd_pcm_stream *snd_pcm_stream_t;
+typedef struct __snd_pcm_access *snd_pcm_access_t;
+typedef struct __snd_pcm_format *snd_pcm_format_t;
+typedef struct __snd_pcm_subformat *snd_pcm_subformat_t;
+typedef struct __snd_pcm_state *snd_pcm_state_t;
+typedef struct __snd_pcm_start *snd_pcm_start_t;
+typedef struct __snd_pcm_xrun *snd_pcm_xrun_t;
+typedef struct __snd_pcm_tstamp *snd_pcm_tstamp_t;
 #else
 typedef enum sndrv_pcm_class snd_pcm_class_t;
 typedef enum sndrv_pcm_subclass snd_pcm_subclass_t;
@@ -53,7 +52,7 @@ typedef enum sndrv_pcm_tstamp snd_pcm_tstamp_t;
 #define SND_PCM_ACCESS_RW_INTERLEAVED ((snd_pcm_access_t) SNDRV_PCM_ACCESS_RW_INTERLEAVED)
 #define SND_PCM_ACCESS_RW_NONINTERLEAVED ((snd_pcm_access_t) SNDRV_PCM_ACCESS_RW_NONINTERLEAVED)
 #define SND_PCM_ACCESS_LAST ((snd_pcm_access_t) SNDRV_PCM_ACCESS_LAST)
-#define SND_PCM_FORMAT_NONE ((snd_pcm_format_t) -1)
+#define SND_PCM_FORMAT_UNKNOWN ((snd_pcm_format_t) -1)
 #define SND_PCM_FORMAT_S8 ((snd_pcm_format_t) SNDRV_PCM_FORMAT_S8)
 #define SND_PCM_FORMAT_U8 ((snd_pcm_format_t) SNDRV_PCM_FORMAT_U8)
 #define SND_PCM_FORMAT_S16_LE ((snd_pcm_format_t) SNDRV_PCM_FORMAT_S16_LE)
@@ -145,7 +144,7 @@ typedef struct timeval snd_timestamp_t;
 
 typedef struct _snd_pcm snd_pcm_t;
 
-typedef enum _snd_pcm_type {
+enum _snd_pcm_type {
 	SND_PCM_TYPE_HW,
 	SND_PCM_TYPE_MULTI,
 	SND_PCM_TYPE_FILE,
@@ -164,7 +163,32 @@ typedef enum _snd_pcm_type {
 	SND_PCM_TYPE_MIX,
 	SND_PCM_TYPE_DROUTE,
 	SND_PCM_TYPE_LBSERVER,
-} snd_pcm_type_t;
+};
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_pcm_type *snd_pcm_type_t;
+#else
+typedef enum _snd_pcm_type snd_pcm_type_t;
+#endif
+
+#define	SND_PCM_TYPE_HW ((snd_pcm_type_t) SND_PCM_TYPE_HW)
+#define	SND_PCM_TYPE_MULTI ((snd_pcm_type_t) SND_PCM_TYPE_MULTI)
+#define	SND_PCM_TYPE_FILE ((snd_pcm_type_t) SND_PCM_TYPE_FILE)
+#define	SND_PCM_TYPE_NULL ((snd_pcm_type_t) SND_PCM_TYPE_NULL)
+#define	SND_PCM_TYPE_SHM ((snd_pcm_type_t) SND_PCM_TYPE_SHM)
+#define	SND_PCM_TYPE_INET ((snd_pcm_type_t) SND_PCM_TYPE_INET)
+#define	SND_PCM_TYPE_COPY ((snd_pcm_type_t) SND_PCM_TYPE_COPY)
+#define	SND_PCM_TYPE_LINEAR ((snd_pcm_type_t) SND_PCM_TYPE_LINEAR)
+#define	SND_PCM_TYPE_ALAW ((snd_pcm_type_t) SND_PCM_TYPE_ALAW)
+#define	SND_PCM_TYPE_MULAW ((snd_pcm_type_t) SND_PCM_TYPE_MULAW)
+#define	SND_PCM_TYPE_ADPCM ((snd_pcm_type_t) SND_PCM_TYPE_ADPCM)
+#define	SND_PCM_TYPE_RATE ((snd_pcm_type_t) SND_PCM_TYPE_RATE)
+#define	SND_PCM_TYPE_ROUTE ((snd_pcm_type_t) SND_PCM_TYPE_ROUTE)
+#define	SND_PCM_TYPE_PLUG ((snd_pcm_type_t) SND_PCM_TYPE_PLUG)
+#define	SND_PCM_TYPE_SHARE ((snd_pcm_type_t) SND_PCM_TYPE_SHARE)
+#define	SND_PCM_TYPE_MIX ((snd_pcm_type_t) SND_PCM_TYPE_MIX)
+#define	SND_PCM_TYPE_DROUTE ((snd_pcm_type_t) SND_PCM_TYPE_DROUTE)
+#define	SND_PCM_TYPE_LBSERVER ((snd_pcm_type_t) SND_PCM_TYPE_LBSERVER)
 
 typedef struct _snd_pcm_channel_area {
 	void *addr;			/* base address of channel samples */
diff --git a/include/rawmidi.h b/include/rawmidi.h
index cd9e33c1..dbcb8b42 100644
--- a/include/rawmidi.h
+++ b/include/rawmidi.h
@@ -9,15 +9,15 @@ typedef struct _snd_rawmidi_info snd_rawmidi_info_t;
 typedef struct _snd_rawmidi_params snd_rawmidi_params_t;
 typedef struct _snd_rawmidi_status snd_rawmidi_status_t;
 
-/* sndrv aliasing */
 #ifdef SND_ENUM_TYPECHECK
-typedef struct _snd_rawmidi_stream *snd_rawmidi_stream_t;
+typedef struct __snd_rawmidi_stream *snd_rawmidi_stream_t;
 #else
 typedef enum sndrv_rawmidi_stream snd_rawmidi_stream_t;
 #endif
 
 #define SND_RAWMIDI_STREAM_OUTPUT ((snd_rawmidi_stream_t) SNDRV_RAWMIDI_STREAM_OUTPUT)
 #define SND_RAWMIDI_STREAM_INPUT ((snd_rawmidi_stream_t) SNDRV_RAWMIDI_STREAM_INPUT)
+
 #define SND_RAWMIDI_INFO_OUTPUT SNDRV_RAWMIDI_INFO_OUTPUT
 #define SND_RAWMIDI_INFO_INPUT SNDRV_RAWMIDI_INFO_INPUT
 #define SND_RAWMIDI_INFO_DUPLEX SNDRV_RAWMIDI_INFO_DUPLEX
@@ -30,11 +30,21 @@ typedef enum sndrv_rawmidi_stream snd_rawmidi_stream_t;
 
 typedef struct _snd_rawmidi snd_rawmidi_t;
 
-typedef enum _snd_rawmidi_type {
+enum _snd_rawmidi_type {
 	SND_RAWMIDI_TYPE_HW,
 	SND_RAWMIDI_TYPE_SHM,
 	SND_RAWMIDI_TYPE_INET,
-} snd_rawmidi_type_t;
+};
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_rawmidi_type *snd_rawmidi_type_t;
+#else
+typedef enum _snd_rawmidi_type snd_rawmidi_type_t;
+#endif
+
+#define	SND_RAWMIDI_TYPE_HW ((snd_rawmidi_type_t) SND_RAWMIDI_TYPE_HW)
+#define	SND_RAWMIDI_TYPE_SHM ((snd_rawmidi_type_t) SND_RAWMIDI_TYPE_SHM)
+#define	SND_RAWMIDI_TYPE_INET ((snd_rawmidi_type_t) SND_RAWMIDI_TYPE_INET)
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/seq.h b/include/seq.h
index 80327b0c..80b2e3a8 100644
--- a/include/seq.h
+++ b/include/seq.h
@@ -5,13 +5,10 @@
  *                                                                          *
  ****************************************************************************/
 
-/* sndrv aliasing */
 typedef sndrv_seq_tick_time_t snd_seq_tick_time_t;
 typedef sndrv_seq_position_t snd_seq_position_t;
 typedef sndrv_seq_frequency_t snd_seq_frequency_t;
 typedef sndrv_seq_instr_cluster_t snd_seq_instr_cluster_t;
-typedef enum sndrv_seq_client_type snd_seq_client_type_t;
-typedef enum sndrv_seq_stop_mode snd_seq_stop_mode_t;
 typedef struct sndrv_seq_port_info snd_seq_port_info_t;
 typedef struct sndrv_seq_port_subscribe snd_seq_port_subscribe_t;
 typedef struct sndrv_seq_event snd_seq_event_t;
@@ -37,6 +34,9 @@ typedef struct sndrv_seq_instr_put snd_seq_instr_put_t;
 typedef struct sndrv_seq_instr_get snd_seq_instr_get_t;
 typedef union sndrv_seq_timestamp snd_seq_timestamp_t;
 
+typedef enum sndrv_seq_client_type snd_seq_client_type_t;
+typedef enum sndrv_seq_stop_mode snd_seq_stop_mode_t;
+
 #define snd_seq_event_bounce_ext_data	sndrv_seq_event_bounce_ext_data 
 #define snd_seq_ev_is_result_type	sndrv_seq_ev_is_result_type     
 #define snd_seq_ev_is_channel_type	sndrv_seq_ev_is_channel_type    
@@ -300,11 +300,21 @@ typedef union sndrv_seq_timestamp snd_seq_timestamp_t;
 
 #define SND_SEQ_NONBLOCK	1
 
-typedef enum _snd_seq_type {
+enum _snd_seq_type {
 	SND_SEQ_TYPE_HW,
 	SND_SEQ_TYPE_SHM,
 	SND_SEQ_TYPE_INET,
-} snd_seq_type_t;
+};
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_seq_type *snd_seq_type_t;
+#else
+typedef enum _snd_seq_type snd_seq_type_t;
+#endif
+
+#define	SND_SEQ_TYPE_HW ((snd_seq_type_t) SND_SEQ_TYPE_HW)
+#define	SND_SEQ_TYPE_SHM ((snd_seq_type_t) SND_SEQ_TYPE_SHM)
+#define	SND_SEQ_TYPE_INET ((snd_seq_type_t) SND_SEQ_TYPE_INET)
 
 typedef struct _snd_seq snd_seq_t;
 
diff --git a/include/timer.h b/include/timer.h
index 0278f3ad..f88623b8 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -5,27 +5,34 @@
  *                                                                          *
  ****************************************************************************/
 
-/* sndrv aliasing */
-typedef enum sndrv_timer_type snd_timer_type_t;
-typedef enum sndrv_timer_slave_type snd_timer_slave_type_t;
-typedef enum sndrv_timer_global snd_timer_global_t;
 typedef struct sndrv_timer_id snd_timer_id_t;
 typedef struct sndrv_timer_select snd_timer_select_t;
 typedef struct sndrv_timer_info snd_timer_info_t;
 typedef struct sndrv_timer_params snd_timer_params_t;
 typedef struct sndrv_timer_status snd_timer_status_t;
 typedef struct sndrv_timer_read snd_timer_read_t;
-#define SND_TIMER_TYPE_NONE SNDRV_TIMER_TYPE_NONE
-#define SND_TIMER_TYPE_SLAVE SNDRV_TIMER_TYPE_SLAVE
-#define SND_TIMER_TYPE_GLOBAL SNDRV_TIMER_TYPE_GLOBAL
-#define SND_TIMER_TYPE_CARD SNDRV_TIMER_TYPE_CARD
-#define SND_TIMER_TYPE_PCM SNDRV_TIMER_TYPE_PCM
-#define SND_TIMER_STYPE_NONE SNDRV_TIMER_STYPE_NONE
-#define SND_TIMER_STYPE_APPLICATION SNDRV_TIMER_STYPE_APPLICATION
-#define SND_TIMER_STYPE_SEQUENCER SNDRV_TIMER_STYPE_SEQUENCER
-#define SND_TIMER_STYPE_OSS_SEQUENCER SNDRV_TIMER_STYPE_OSS_SEQUENCER
+
+#ifdef SND_ENUM_TYPECHECK
+typedef struct __snd_timer_type *snd_timer_type_t;
+typedef struct __snd_timer_slave_type *snd_timer_slave_type_t;
+#else
+typedef enum sndrv_timer_type snd_timer_type_t;
+typedef enum sndrv_timer_slave_type snd_timer_slave_type_t;
+#endif
+
+#define SND_TIMER_TYPE_NONE ((snd_timer_type_t) SNDRV_TIMER_TYPE_NONE)
+#define SND_TIMER_TYPE_SLAVE ((snd_timer_type_t) SNDRV_TIMER_TYPE_SLAVE)
+#define SND_TIMER_TYPE_GLOBAL ((snd_timer_type_t) SNDRV_TIMER_TYPE_GLOBAL)
+#define SND_TIMER_TYPE_CARD ((snd_timer_type_t) SNDRV_TIMER_TYPE_CARD)
+#define SND_TIMER_TYPE_PCM ((snd_timer_type_t) SNDRV_TIMER_TYPE_PCM)
+#define SND_TIMER_STYPE_NONE ((snd_timer_slave_type_t) SNDRV_TIMER_STYPE_NONE
+#define SND_TIMER_STYPE_APPLICATION ((snd_timer_slave_type_t) SNDRV_TIMER_STYPE_APPLICATION
+#define SND_TIMER_STYPE_SEQUENCER ((snd_timer_slave_type_t) SNDRV_TIMER_STYPE_SEQUENCER
+#define SND_TIMER_STYPE_OSS_SEQUENCER ((snd_timer_slave_type_t) SNDRV_TIMER_STYPE_OSS_SEQUENCER
+
 #define SND_TIMER_GLOBAL_SYSTEM SNDRV_TIMER_GLOBAL_SYSTEM
 #define SND_TIMER_GLOBAL_RTC SNDRV_TIMER_GLOBAL_RTC
+
 #define SND_TIMER_FLG_SLAVE SNDRV_TIMER_FLG_SLAVE
 #define SND_TIMER_PARBIT_FLAGS SNDRV_TIMER_PARBIT_FLAGS
 #define SND_TIMER_PARBIT_TICKS SNDRV_TIMER_PARBIT_TICKS