Commit 310fa3ec authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: seq: ump: Fix swapped song position pointer data 

At converting between the legacy event and UMP, the parameters for
MIDI Song Position Pointer are incorrectly stored.  It should have
been LSB -> MSB order while it stored in MSB -> LSB order.
This patch corrects the ordering.

Fixes: e9e02819 ("ALSA: seq: Automatic conversion of UMP events")
Link: https://lore.kernel.org/r/20240531075110.3250-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e1e287e6

sound/core/seq/seq_ump_convert.c

+3 −3
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static void ump_system_to_one_param_ev(const union snd_ump_midi1_msg *val, 
static void ump_system_to_songpos_ev(const union snd_ump_midi1_msg *val,

				     struct snd_seq_event *ev)

{

	ev->data.control.value = (val->system.parm1 << 7) | val->system.parm2;

	ev->data.control.value = (val->system.parm2 << 7) | val->system.parm1;

}



/* Encoders for 0xf0 - 0xff */
@@ -754,8 +754,8 @@ static int system_2p_ev_to_ump_midi1(const struct snd_seq_event *event, 
{

	data->system.type = UMP_MSG_TYPE_SYSTEM; // override

	data->system.status = status;

	data->system.parm1 = (event->data.control.value >> 7) & 0x7f;

	data->system.parm2 = event->data.control.value & 0x7f;

	data->system.parm1 = event->data.control.value & 0x7f;

	data->system.parm2 = (event->data.control.value >> 7) & 0x7f;

	return 1;

}