aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2006-05-02 09:50:05 -0400
committerJaroslav Kysela <perex@suse.cz>2006-06-22 15:33:17 -0400
commitc97f3dd85490e51ba48782dd0c063cdade352c0d (patch)
treeee2dee73cf5daaabc8acebc2c78f056465d284e4
parentf4a747f155fe375231196ec3d26fcb6e3675d82f (diff)
[ALSA] fix port type bits
Fix the port information about non-MIDI messages that had wrong values for some OPL3 and EmuX ports. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
-rw-r--r--sound/drivers/opl3/opl3_oss.c3
-rw-r--r--sound/drivers/opl3/opl3_seq.c2
-rw-r--r--sound/synth/emux/emux_seq.c3
3 files changed, 3 insertions, 5 deletions
diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c
index fccf019a6d85..d48f8dee2d98 100644
--- a/sound/drivers/opl3/opl3_oss.c
+++ b/sound/drivers/opl3/opl3_oss.c
@@ -99,8 +99,7 @@ static int snd_opl3_oss_create_port(struct snd_opl3 * opl3)
99 opl3->oss_chset->port = snd_seq_event_port_attach(opl3->seq_client, &callbacks, 99 opl3->oss_chset->port = snd_seq_event_port_attach(opl3->seq_client, &callbacks,
100 SNDRV_SEQ_PORT_CAP_WRITE, 100 SNDRV_SEQ_PORT_CAP_WRITE,
101 SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | 101 SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
102 SNDRV_SEQ_PORT_TYPE_MIDI_GM | 102 SNDRV_SEQ_PORT_TYPE_MIDI_GM,
103 SNDRV_SEQ_PORT_TYPE_SYNTH,
104 voices, voices, 103 voices, voices,
105 name); 104 name);
106 if (opl3->oss_chset->port < 0) { 105 if (opl3->oss_chset->port < 0) {
diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
index 57becf34f43e..2aece1b18660 100644
--- a/sound/drivers/opl3/opl3_seq.c
+++ b/sound/drivers/opl3/opl3_seq.c
@@ -203,7 +203,7 @@ static int snd_opl3_synth_create_port(struct snd_opl3 * opl3)
203 SNDRV_SEQ_PORT_CAP_SUBS_WRITE, 203 SNDRV_SEQ_PORT_CAP_SUBS_WRITE,
204 SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | 204 SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |
205 SNDRV_SEQ_PORT_TYPE_MIDI_GM | 205 SNDRV_SEQ_PORT_TYPE_MIDI_GM |
206 SNDRV_SEQ_PORT_TYPE_SYNTH, 206 SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE,
207 16, voices, 207 16, voices,
208 name); 208 name);
209 if (opl3->chset->port < 0) { 209 if (opl3->chset->port < 0) {
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index 8f00f07701c4..58838f7c95f0 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -54,8 +54,7 @@ static struct snd_midi_op emux_ops = {
54#define DEFAULT_MIDI_TYPE (SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |\ 54#define DEFAULT_MIDI_TYPE (SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |\
55 SNDRV_SEQ_PORT_TYPE_MIDI_GM |\ 55 SNDRV_SEQ_PORT_TYPE_MIDI_GM |\
56 SNDRV_SEQ_PORT_TYPE_MIDI_GS |\ 56 SNDRV_SEQ_PORT_TYPE_MIDI_GS |\
57 SNDRV_SEQ_PORT_TYPE_MIDI_XG |\ 57 SNDRV_SEQ_PORT_TYPE_MIDI_XG)
58 SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE)
59 58
60/* 59/*
61 * Initialise the EMUX Synth by creating a client and registering 60 * Initialise the EMUX Synth by creating a client and registering