ALSA: seq: Fix missing bank setup between MIDI1/MIDI2 UMP conversion
PATCH 1/2 ALSA: seq: Fix missing bank setup between MIDI1/MIDI2 UMP conversion
When a UMP packet is converted between MIDI1 and MIDI2 protocols, the bank selection may be lost. The conversion from MIDI1 to MIDI2 needs the encoding of the bank into UMP_MSG_STATUS_PROGRAM bits, while the conversion from MIDI2 to MIDI1 needs the extraction from that instead.
This patch implements the missing bank selection mechanism in those conversions.
--- sound/core/seq/seq_ump_convert.c | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
sound/core/seq/seq_ump_convert.c +38 -0
@@ -368,6 +368,7 @@ static int cvt_ump_midi1_to_midi2(struct snd_seq_client *dest,struct snd_seq_ump_event ev_cvt;const union snd_ump_midi1_msg *midi1 = (const union snd_ump_midi1_msg *)event->ump;union snd_ump_midi2_msg *midi2 = (union snd_ump_midi2_msg *)ev_cvt.ump; +struct snd_seq_ump_midi2_bank *cc; ev_cvt = *event;memset (&ev_cvt.ump,0 ,sizeof (ev_cvt.ump));
@@ -387,11 +388,29 @@ static int cvt_ump_midi1_to_midi2(struct snd_seq_client *dest, midi2->paf.data =upscale_7_to_32bit (midi1->paf.data);break ;case UMP_MSG_STATUS_CC : + cc = &dest_port->midi2_bank[midi1->note.channel]; +switch (midi1->cc.index) { +case UMP_CC_BANK_SELECT : + cc->bank_set =1 ; + cc->cc_bank_msb = midi1->cc.data; +return 0 ;// skip +case UMP_CC_BANK_SELECT_LSB : + cc->bank_set =1 ; + cc->cc_bank_lsb = midi1->cc.data; +return 0 ;// skip + } midi2->cc.index = midi1->cc.index; midi2->cc.data =upscale_7_to_32bit (midi1->cc.data);break ;case UMP_MSG_STATUS_PROGRAM : midi2->pg.program = midi1->pg.program; + cc = &dest_port->midi2_bank[midi1->note.channel]; +if (cc->bank_set) { + midi2->pg.bank_valid =1 ; + midi2->pg.bank_msb = cc->cc_bank_msb; + midi2->pg.bank_lsb = cc->cc_bank_lsb; + cc->bank_set =0 ; + }break ;case UMP_MSG_STATUS_CHANNEL_PRESSURE : midi2->caf.data =upscale_7_to_32bit (midi1->caf.data);
@@ -419,6 +438,7 @@ static int cvt_ump_midi2_to_midi1(struct snd_seq_client *dest,struct snd_seq_ump_event ev_cvt;union snd_ump_midi1_msg *midi1 = (union snd_ump_midi1_msg *)ev_cvt.ump;const union snd_ump_midi2_msg *midi2 = (const union snd_ump_midi2_msg *)event->ump; +int err;u16 v; ev_cvt = *event;
@@ -443,6 +463,24 @@ static int cvt_ump_midi2_to_midi1(struct snd_seq_client *dest, midi1->cc.data =downscale_32_to_7bit (midi2->cc.data);break ;case UMP_MSG_STATUS_PROGRAM : +if (midi2->pg.bank_valid) { + midi1->cc.status =UMP_MSG_STATUS_CC ; + midi1->cc.index =UMP_CC_BANK_SELECT ; + midi1->cc.data = midi2->pg.bank_msb; + err =__snd_seq_deliver_single_event (dest, dest_port, + (struct snd_seq_event *)&ev_cvt, + atomic, hop); +if (err <0 ) +return err; + midi1->cc.index =UMP_CC_BANK_SELECT_LSB ; + midi1->cc.data = midi2->pg.bank_lsb; + err =__snd_seq_deliver_single_event (dest, dest_port, + (struct snd_seq_event *)&ev_cvt, + atomic, hop); +if (err <0 ) +return err; + midi1->note.status = midi2->note.status; + } midi1->pg.program = midi2->pg.program;break ;case UMP_MSG_STATUS_CHANNEL_PRESSURE :
Signature · 1 line
2.43.0
PATCH 2/2 ALSA: seq: Don't clear bank selection at event -> UMP MIDI2 conversion
The current code to convert from a legacy sequencer event to UMP MIDI2 clears the bank selection at each time the program change is submitted. This is confusing and may lead to incorrect bank values tranmitted to the destination in the end.
Drop the line to clear the bank info and keep the provided values.
--- sound/core/seq/seq_ump_convert.c | 1 - 1 file changed, 1 deletion(-)
sound/core/seq/seq_ump_convert.c +0 -1
@@ -892,7 +892,6 @@ static int pgm_ev_to_ump_midi2(const struct snd_seq_event *event, data->pg.bank_msb = cc->cc_bank_msb; data->pg.bank_lsb = cc->cc_bank_lsb; cc->bank_set =0 ; - cc->cc_bank_msb = cc->cc_bank_lsb =0 ; }return 1 ; }
Signature · 1 line
2.43.0