From 2a30f2b6fe1901d6cdf9e522f0ebdc48f63a6e94 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Tue, 2 May 2006 15:50:05 +0200 Subject: [PATCH] --- yaml --- r: 28486 b: refs/heads/master c: c97f3dd85490e51ba48782dd0c063cdade352c0d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/drivers/opl3/opl3_oss.c | 3 +-- trunk/sound/drivers/opl3/opl3_seq.c | 2 +- trunk/sound/synth/emux/emux_seq.c | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4b83a0f600cc..9100ace49fc8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4a747f155fe375231196ec3d26fcb6e3675d82f +refs/heads/master: c97f3dd85490e51ba48782dd0c063cdade352c0d diff --git a/trunk/sound/drivers/opl3/opl3_oss.c b/trunk/sound/drivers/opl3/opl3_oss.c index fccf019a6d85..d48f8dee2d98 100644 --- a/trunk/sound/drivers/opl3/opl3_oss.c +++ b/trunk/sound/drivers/opl3/opl3_oss.c @@ -99,8 +99,7 @@ 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_SYNTH, + SNDRV_SEQ_PORT_TYPE_MIDI_GM, voices, voices, name); if (opl3->oss_chset->port < 0) { diff --git a/trunk/sound/drivers/opl3/opl3_seq.c b/trunk/sound/drivers/opl3/opl3_seq.c index 57becf34f43e..2aece1b18660 100644 --- a/trunk/sound/drivers/opl3/opl3_seq.c +++ b/trunk/sound/drivers/opl3/opl3_seq.c @@ -203,7 +203,7 @@ static int snd_opl3_synth_create_port(struct snd_opl3 * opl3) SNDRV_SEQ_PORT_CAP_SUBS_WRITE, SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC | SNDRV_SEQ_PORT_TYPE_MIDI_GM | - SNDRV_SEQ_PORT_TYPE_SYNTH, + SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE, 16, voices, name); if (opl3->chset->port < 0) { diff --git a/trunk/sound/synth/emux/emux_seq.c b/trunk/sound/synth/emux/emux_seq.c index 8f00f07701c4..58838f7c95f0 100644 --- a/trunk/sound/synth/emux/emux_seq.c +++ b/trunk/sound/synth/emux/emux_seq.c @@ -54,8 +54,7 @@ static struct snd_midi_op emux_ops = { #define DEFAULT_MIDI_TYPE (SNDRV_SEQ_PORT_TYPE_MIDI_GENERIC |\ SNDRV_SEQ_PORT_TYPE_MIDI_GM |\ SNDRV_SEQ_PORT_TYPE_MIDI_GS |\ - SNDRV_SEQ_PORT_TYPE_MIDI_XG |\ - SNDRV_SEQ_PORT_TYPE_DIRECT_SAMPLE) + SNDRV_SEQ_PORT_TYPE_MIDI_XG) /* * Initialise the EMUX Synth by creating a client and registering