ChangeSet 1.2181.25.21, 2005/03/22 09:08:16+01:00, [EMAIL PROTECTED]
[ALSA] Fix typos
ALSA sequencer,ALSA Core
Fix typos in alsa-kernel code for MIDI sostenuto.
Signed-off-by: William <walsac3c AT orthoset.com>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
include/sound/asoundef.h | 2 +-
include/sound/seq_midi_emul.h | 4 ++--
sound/core/seq/seq_midi_emul.c | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff -Nru a/include/sound/asoundef.h b/include/sound/asoundef.h
--- a/include/sound/asoundef.h 2005-03-30 16:13:38 -08:00
+++ b/include/sound/asoundef.h 2005-03-30 16:13:38 -08:00
@@ -185,7 +185,7 @@
#define MIDI_CTL_LSB_GENERAL_PURPOSE4 0x33
#define MIDI_CTL_SUSTAIN 0x40
#define MIDI_CTL_PORTAMENTO 0x41
-#define MIDI_CTL_SUSTENUTO 0x42
+#define MIDI_CTL_SOSTENUTO 0x42
#define MIDI_CTL_SOFT_PEDAL 0x43
#define MIDI_CTL_LEGATO_FOOTSWITCH 0x44
#define MIDI_CTL_HOLD2 0x45
diff -Nru a/include/sound/seq_midi_emul.h b/include/sound/seq_midi_emul.h
--- a/include/sound/seq_midi_emul.h 2005-03-30 16:13:38 -08:00
+++ b/include/sound/seq_midi_emul.h 2005-03-30 16:13:38 -08:00
@@ -136,7 +136,7 @@
#define gm_sustain control[MIDI_CTL_SUSTAIN]
#define gm_hold gm_sustain
#define gm_portamento control[MIDI_CTL_PORTAMENTO]
-#define gm_sustenuto control[MIDI_CTL_SUSTENUTO]
+#define gm_sostenuto control[MIDI_CTL_SOSTENUTO]
/*
* These macros give the complete value of the controls that consist
@@ -166,7 +166,7 @@
#define SNDRV_MIDI_NOTE_OFF 0x00
#define SNDRV_MIDI_NOTE_ON 0x01
#define SNDRV_MIDI_NOTE_RELEASED 0x02
-#define SNDRV_MIDI_NOTE_SUSTENUTO 0x04
+#define SNDRV_MIDI_NOTE_SOSTENUTO 0x04
#define SNDRV_MIDI_PARAM_TYPE_REGISTERED 0
#define SNDRV_MIDI_PARAM_TYPE_NONREGISTERED 1
diff -Nru a/sound/core/seq/seq_midi_emul.c b/sound/core/seq/seq_midi_emul.c
--- a/sound/core/seq/seq_midi_emul.c 2005-03-30 16:13:38 -08:00
+++ b/sound/core/seq/seq_midi_emul.c 2005-03-30 16:13:38 -08:00
@@ -244,8 +244,8 @@
if (chan->gm_hold) {
/* Hold this note until pedal is turned off */
chan->note[note] |= SNDRV_MIDI_NOTE_RELEASED;
- } else if (chan->note[note] & SNDRV_MIDI_NOTE_SUSTENUTO) {
- /* Mark this note as release; it will be turned off when
sustenuto
+ } else if (chan->note[note] & SNDRV_MIDI_NOTE_SOSTENUTO) {
+ /* Mark this note as release; it will be turned off when
sostenuto
* is turned off */
chan->note[note] |= SNDRV_MIDI_NOTE_RELEASED;
} else {
@@ -287,18 +287,18 @@
break;
case MIDI_CTL_PORTAMENTO:
break;
- case MIDI_CTL_SUSTENUTO:
+ case MIDI_CTL_SOSTENUTO:
if (value) {
/* Mark each note that is currently held down */
for (i = 0; i < 128; i++) {
if (chan->note[i] & SNDRV_MIDI_NOTE_ON)
- chan->note[i] |=
SNDRV_MIDI_NOTE_SUSTENUTO;
+ chan->note[i] |=
SNDRV_MIDI_NOTE_SOSTENUTO;
}
} else {
/* release all notes that were held */
for (i = 0; i < 128; i++) {
- if (chan->note[i] & SNDRV_MIDI_NOTE_SUSTENUTO) {
- chan->note[i] &=
~SNDRV_MIDI_NOTE_SUSTENUTO;
+ if (chan->note[i] & SNDRV_MIDI_NOTE_SOSTENUTO) {
+ chan->note[i] &=
~SNDRV_MIDI_NOTE_SOSTENUTO;
if (chan->note[i] &
SNDRV_MIDI_NOTE_RELEASED) {
chan->note[i] =
SNDRV_MIDI_NOTE_OFF;
if (ops->note_off)
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
