diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2009-07-13 07:50:57 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-15 05:57:08 -0400 |
| commit | 08d033405a5a537d4197dad0fcb6be47062be2a9 (patch) | |
| tree | ad8ed78322227831ca710586cd70aed05e9e6e75 | |
| parent | b86c87288c2205376ee213d6a03ac9422faf014a (diff) | |
sound: seq_oss_midi: remove magic numbers
Instead of using magic numbers for the controlles sent when resetting
a port, use the symbols from asoundef.h.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/core/seq/oss/seq_oss_midi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/core/seq/oss/seq_oss_midi.c b/sound/core/seq/oss/seq_oss_midi.c index 0a711d2d04f0..9dfb2f77be60 100644 --- a/sound/core/seq/oss/seq_oss_midi.c +++ b/sound/core/seq/oss/seq_oss_midi.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <sound/asoundef.h> | ||
| 23 | #include "seq_oss_midi.h" | 24 | #include "seq_oss_midi.h" |
| 24 | #include "seq_oss_readq.h" | 25 | #include "seq_oss_readq.h" |
| 25 | #include "seq_oss_timer.h" | 26 | #include "seq_oss_timer.h" |
| @@ -476,19 +477,20 @@ snd_seq_oss_midi_reset(struct seq_oss_devinfo *dp, int dev) | |||
| 476 | ev.source.port = dp->port; | 477 | ev.source.port = dp->port; |
| 477 | if (dp->seq_mode == SNDRV_SEQ_OSS_MODE_SYNTH) { | 478 | if (dp->seq_mode == SNDRV_SEQ_OSS_MODE_SYNTH) { |
| 478 | ev.type = SNDRV_SEQ_EVENT_SENSING; | 479 | ev.type = SNDRV_SEQ_EVENT_SENSING; |
| 479 | snd_seq_oss_dispatch(dp, &ev, 0, 0); /* active sensing */ | 480 | snd_seq_oss_dispatch(dp, &ev, 0, 0); |
| 480 | } | 481 | } |
| 481 | for (c = 0; c < 16; c++) { | 482 | for (c = 0; c < 16; c++) { |
| 482 | ev.type = SNDRV_SEQ_EVENT_CONTROLLER; | 483 | ev.type = SNDRV_SEQ_EVENT_CONTROLLER; |
| 483 | ev.data.control.channel = c; | 484 | ev.data.control.channel = c; |
| 484 | ev.data.control.param = 123; | 485 | ev.data.control.param = MIDI_CTL_ALL_NOTES_OFF; |
| 485 | snd_seq_oss_dispatch(dp, &ev, 0, 0); /* all notes off */ | 486 | snd_seq_oss_dispatch(dp, &ev, 0, 0); |
| 486 | if (dp->seq_mode == SNDRV_SEQ_OSS_MODE_MUSIC) { | 487 | if (dp->seq_mode == SNDRV_SEQ_OSS_MODE_MUSIC) { |
| 487 | ev.data.control.param = 121; | 488 | ev.data.control.param = |
| 488 | snd_seq_oss_dispatch(dp, &ev, 0, 0); /* reset all controllers */ | 489 | MIDI_CTL_RESET_CONTROLLERS; |
| 490 | snd_seq_oss_dispatch(dp, &ev, 0, 0); | ||
| 489 | ev.type = SNDRV_SEQ_EVENT_PITCHBEND; | 491 | ev.type = SNDRV_SEQ_EVENT_PITCHBEND; |
| 490 | ev.data.control.value = 0; | 492 | ev.data.control.value = 0; |
| 491 | snd_seq_oss_dispatch(dp, &ev, 0, 0); /* bender off */ | 493 | snd_seq_oss_dispatch(dp, &ev, 0, 0); |
| 492 | } | 494 | } |
| 493 | } | 495 | } |
| 494 | } | 496 | } |
