mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
ALSA: dice: use stream formats to add MIDI substreams
In former commits, proxy structure gets members for cache of stream formats. The cache can be used to count the number of MIDI substreams to add. This commit uses the cache for this purpose. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
afa617f219
commit
b8f78234aa
1 changed files with 7 additions and 16 deletions
|
@ -101,27 +101,18 @@ int snd_dice_create_midi(struct snd_dice *dice)
|
|||
.close = midi_close,
|
||||
.trigger = midi_playback_trigger,
|
||||
};
|
||||
__be32 reg;
|
||||
struct snd_rawmidi *rmidi;
|
||||
struct snd_rawmidi_str *str;
|
||||
unsigned int midi_in_ports, midi_out_ports;
|
||||
int i;
|
||||
int err;
|
||||
|
||||
/*
|
||||
* Use the number of MIDI conformant data channel at current sampling
|
||||
* transfer frequency.
|
||||
*/
|
||||
err = snd_dice_transaction_read_tx(dice, TX_NUMBER_MIDI,
|
||||
®, sizeof(reg));
|
||||
if (err < 0)
|
||||
return err;
|
||||
midi_in_ports = be32_to_cpu(reg);
|
||||
|
||||
err = snd_dice_transaction_read_rx(dice, RX_NUMBER_MIDI,
|
||||
®, sizeof(reg));
|
||||
if (err < 0)
|
||||
return err;
|
||||
midi_out_ports = be32_to_cpu(reg);
|
||||
midi_in_ports = 0;
|
||||
midi_out_ports = 0;
|
||||
for (i = 0; i < MAX_STREAMS; ++i) {
|
||||
midi_in_ports = max(midi_in_ports, dice->tx_midi_ports[i]);
|
||||
midi_out_ports = max(midi_out_ports, dice->rx_midi_ports[i]);
|
||||
}
|
||||
|
||||
if (midi_in_ports + midi_out_ports == 0)
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue