diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:04:02 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:17:52 -0500 |
commit | c7e0b5bf9fff1b726495081447c107a2333fb82c (patch) | |
tree | f4d9ec9a6446f8e2afde4c94e10a39f2b86a0bc9 /include/sound/seq_midi_emul.h | |
parent | 6ac77bc180fbd985988015020c2e2347e802959d (diff) |
[ALSA] Remove xxx_t typedefs: Sequencer
Modules: ALSA sequencer
Remove xxx_t typedefs from the core sequencer codes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/seq_midi_emul.h')
-rw-r--r-- | include/sound/seq_midi_emul.h | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/include/sound/seq_midi_emul.h b/include/sound/seq_midi_emul.h index e58ca45bc73b..d6c4615901b9 100644 --- a/include/sound/seq_midi_emul.h +++ b/include/sound/seq_midi_emul.h | |||
@@ -29,7 +29,7 @@ | |||
29 | * channel. All drivers for hardware that does not understand midi | 29 | * channel. All drivers for hardware that does not understand midi |
30 | * directly will probably need to use this structure. | 30 | * directly will probably need to use this structure. |
31 | */ | 31 | */ |
32 | typedef struct snd_midi_channel { | 32 | struct snd_midi_channel { |
33 | void *private; /* A back pointer to driver data */ | 33 | void *private; /* A back pointer to driver data */ |
34 | int number; /* The channel number */ | 34 | int number; /* The channel number */ |
35 | int client; /* The client associated with this channel */ | 35 | int client; /* The client associated with this channel */ |
@@ -53,41 +53,43 @@ typedef struct snd_midi_channel { | |||
53 | short gm_rpn_fine_tuning; /* Master fine tuning */ | 53 | short gm_rpn_fine_tuning; /* Master fine tuning */ |
54 | short gm_rpn_coarse_tuning; /* Master coarse tuning */ | 54 | short gm_rpn_coarse_tuning; /* Master coarse tuning */ |
55 | 55 | ||
56 | } snd_midi_channel_t; | 56 | }; |
57 | 57 | ||
58 | /* | 58 | /* |
59 | * A structure that represets a set of channels bound to a port. There | 59 | * A structure that represets a set of channels bound to a port. There |
60 | * would usually be 16 channels per port. But fewer could be used for | 60 | * would usually be 16 channels per port. But fewer could be used for |
61 | * particular cases. | 61 | * particular cases. |
62 | * The channel set consists of information describing the client and | 62 | * The channel set consists of information describing the client and |
63 | * port for this midi synth and an array of snd_midi_channel_t structures. | 63 | * port for this midi synth and an array of snd_midi_channel structures. |
64 | * A driver that had no need for snd_midi_channel_t could still use the | 64 | * A driver that had no need for snd_midi_channel could still use the |
65 | * channel set type if it wished with the channel array null. | 65 | * channel set type if it wished with the channel array null. |
66 | */ | 66 | */ |
67 | typedef struct snd_midi_channel_set { | 67 | struct snd_midi_channel_set { |
68 | void *private_data; /* Driver data */ | 68 | void *private_data; /* Driver data */ |
69 | int client; /* Client for this port */ | 69 | int client; /* Client for this port */ |
70 | int port; /* The port number */ | 70 | int port; /* The port number */ |
71 | 71 | ||
72 | int max_channels; /* Size of the channels array */ | 72 | int max_channels; /* Size of the channels array */ |
73 | snd_midi_channel_t *channels; | 73 | struct snd_midi_channel *channels; |
74 | 74 | ||
75 | unsigned char midi_mode; /* MIDI operating mode */ | 75 | unsigned char midi_mode; /* MIDI operating mode */ |
76 | unsigned char gs_master_volume; /* SYSEX master volume: 0-127 */ | 76 | unsigned char gs_master_volume; /* SYSEX master volume: 0-127 */ |
77 | unsigned char gs_chorus_mode; | 77 | unsigned char gs_chorus_mode; |
78 | unsigned char gs_reverb_mode; | 78 | unsigned char gs_reverb_mode; |
79 | 79 | ||
80 | } snd_midi_channel_set_t; | 80 | }; |
81 | 81 | ||
82 | typedef struct snd_seq_midi_op { | 82 | struct snd_midi_op { |
83 | void (*note_on)(void *private_data, int note, int vel, snd_midi_channel_t *chan); | 83 | void (*note_on)(void *private_data, int note, int vel, struct snd_midi_channel *chan); |
84 | void (*note_off)(void *private_data,int note, int vel, snd_midi_channel_t *chan); /* release note */ | 84 | void (*note_off)(void *private_data,int note, int vel, struct snd_midi_channel *chan); /* release note */ |
85 | void (*key_press)(void *private_data, int note, int vel, snd_midi_channel_t *chan); | 85 | void (*key_press)(void *private_data, int note, int vel, struct snd_midi_channel *chan); |
86 | void (*note_terminate)(void *private_data, int note, snd_midi_channel_t *chan); /* terminate note immediately */ | 86 | void (*note_terminate)(void *private_data, int note, struct snd_midi_channel *chan); /* terminate note immediately */ |
87 | void (*control)(void *private_data, int type, snd_midi_channel_t *chan); | 87 | void (*control)(void *private_data, int type, struct snd_midi_channel *chan); |
88 | void (*nrpn)(void *private_data, snd_midi_channel_t *chan, snd_midi_channel_set_t *chset); | 88 | void (*nrpn)(void *private_data, struct snd_midi_channel *chan, |
89 | void (*sysex)(void *private_data, unsigned char *buf, int len, int parsed, snd_midi_channel_set_t *chset); | 89 | struct snd_midi_channel_set *chset); |
90 | } snd_midi_op_t; | 90 | void (*sysex)(void *private_data, unsigned char *buf, int len, int parsed, |
91 | struct snd_midi_channel_set *chset); | ||
92 | }; | ||
91 | 93 | ||
92 | /* | 94 | /* |
93 | * These defines are used so that pitchbend, aftertouch etc, can be | 95 | * These defines are used so that pitchbend, aftertouch etc, can be |
@@ -186,10 +188,10 @@ enum { | |||
186 | }; | 188 | }; |
187 | 189 | ||
188 | /* Prototypes for midi_process.c */ | 190 | /* Prototypes for midi_process.c */ |
189 | void snd_midi_process_event(snd_midi_op_t *ops, snd_seq_event_t *ev, | 191 | void snd_midi_process_event(struct snd_midi_op *ops, struct snd_seq_event *ev, |
190 | snd_midi_channel_set_t *chanset); | 192 | struct snd_midi_channel_set *chanset); |
191 | void snd_midi_channel_set_clear(snd_midi_channel_set_t *chset); | 193 | void snd_midi_channel_set_clear(struct snd_midi_channel_set *chset); |
192 | snd_midi_channel_set_t *snd_midi_channel_alloc_set(int n); | 194 | struct snd_midi_channel_set *snd_midi_channel_alloc_set(int n); |
193 | void snd_midi_channel_free_set(snd_midi_channel_set_t *chset); | 195 | void snd_midi_channel_free_set(struct snd_midi_channel_set *chset); |
194 | 196 | ||
195 | #endif /* __SOUND_SEQ_MIDI_EMUL_H */ | 197 | #endif /* __SOUND_SEQ_MIDI_EMUL_H */ |