Commit 450047a7 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] add more sequencer port type information bits 



Add four new information flags SNDRV_SEQ_PORT_TYPE_HARDWARE, _SOFTWARE,
_SYNTHESIZER, _PORT for sequencer ports.  This makes it easier for apps
like Rosegarden to make policy decisions based on the port type.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
parent c97f3dd8

include/sound/asequencer.h

+4 −0
Original line number Diff line number Diff line
@@ -605,6 +605,10 @@ struct snd_seq_remove_events { 
#define SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE (1<<11)	/* Sampling device (support sample download) */

#define SNDRV_SEQ_PORT_TYPE_SAMPLE	(1<<12)	/* Sampling device (sample can be downloaded at any time) */

/*...*/

#define SNDRV_SEQ_PORT_TYPE_HARDWARE	(1<<16)	/* driver for a hardware device */

#define SNDRV_SEQ_PORT_TYPE_SOFTWARE	(1<<17)	/* implemented in software */

#define SNDRV_SEQ_PORT_TYPE_SYNTHESIZER	(1<<18)	/* generates sound */

#define SNDRV_SEQ_PORT_TYPE_PORT	(1<<19)	/* connects to other device(s) */

#define SNDRV_SEQ_PORT_TYPE_APPLICATION	(1<<20)	/* application (sequencer/editor) */



/* misc. conditioning flags */

sound/core/seq/seq_dummy.c

+3 −1
Original line number Diff line number Diff line
@@ -171,7 +171,9 @@ create_port(int idx, int type) 
	pinfo.capability |= SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE;

	if (duplex)

		pinfo.capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;

	pinfo.type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC;

	pinfo.type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC

		| SNDRV_SEQ_PORT_TYPE_SOFTWARE

		| SNDRV_SEQ_PORT_TYPE_PORT;

	memset(&pcb, 0, sizeof(pcb));

	pcb.owner = THIS_MODULE;

	pcb.unuse = dummy_unuse;

sound/core/seq/seq_midi.c

+3 −1
Original line number Diff line number Diff line
@@ -376,7 +376,9 @@ snd_seq_midisynth_register_port(struct snd_seq_device *dev) 
		if ((port->capability & (SNDRV_SEQ_PORT_CAP_WRITE|SNDRV_SEQ_PORT_CAP_READ)) == (SNDRV_SEQ_PORT_CAP_WRITE|SNDRV_SEQ_PORT_CAP_READ) &&

		    info->flags & SNDRV_RAWMIDI_INFO_DUPLEX)

			port->capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;

		port->type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC;

		port->type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC

			| SNDRV_SEQ_PORT_TYPE_HARDWARE

			| SNDRV_SEQ_PORT_TYPE_PORT;

		port->midi_channels = 16;

		memset(&pcallbacks, 0, sizeof(pcallbacks));

		pcallbacks.owner = THIS_MODULE;

sound/core/seq/seq_virmidi.c

+3 −1
Original line number Diff line number Diff line
@@ -390,7 +390,9 @@ static int snd_virmidi_dev_attach_seq(struct snd_virmidi_dev *rdev) 
	pinfo->capability |= SNDRV_SEQ_PORT_CAP_WRITE | SNDRV_SEQ_PORT_CAP_SYNC_WRITE | SNDRV_SEQ_PORT_CAP_SUBS_WRITE;

	pinfo->capability |= SNDRV_SEQ_PORT_CAP_READ | SNDRV_SEQ_PORT_CAP_SYNC_READ | SNDRV_SEQ_PORT_CAP_SUBS_READ;

	pinfo->capability |= SNDRV_SEQ_PORT_CAP_DUPLEX;

	pinfo->type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC;

	pinfo->type = SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC

		| SNDRV_SEQ_PORT_TYPE_SOFTWARE

		| SNDRV_SEQ_PORT_TYPE_PORT;

	pinfo->midi_channels = 16;

	memset(&pcallbacks, 0, sizeof(pcallbacks));

	pcallbacks.owner = THIS_MODULE;

sound/drivers/opl3/opl3_oss.c

+3 −1
Original line number Diff line number Diff line
@@ -99,7 +99,9 @@ static int snd_opl3_oss_create_port(struct snd_opl3 * opl3) 
	opl3->oss_chset->port = snd_seq_event_port_attach(opl3->seq_client, &callbacks,

							  SNDRV_SEQ_PORT_CAP_WRITE,

							  SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |

							  SNDRV_SEQ_PORT_TYPE_MIDI_GM,

							  SNDRV_SEQ_PORT_TYPE_MIDI_GM |

							  SNDRV_SEQ_PORT_TYPE_HARDWARE |

							  SNDRV_SEQ_PORT_TYPE_SYNTHESIZER,

							  voices, voices,

							  name);

	if (opl3->oss_chset->port < 0) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE