From b54168e4d211c96ee7b1b6420849be98270d6836 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 3 May 2001 16:12:19 +0000 Subject: [PATCH] Added surround.conf --- src/pcm/Makefile.am | 5 +++ src/pcm/pcm_surr.c | 2 +- src/pcm/surround.conf | 97 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 src/pcm/surround.conf diff --git a/src/pcm/Makefile.am b/src/pcm/Makefile.am index e7b6dcea..b257aaf7 100644 --- a/src/pcm/Makefile.am +++ b/src/pcm/Makefile.am @@ -10,6 +10,11 @@ libpcm_la_SOURCES = atomic.c mask.c interval.c \ noinst_HEADERS = atomic.h pcm_local.h pcm_plugin.h mask.h mask_inline.h \ interval.h interval_inline.h plugin_ops.h +EXTRA_DIST = surround.conf + +alsadir = $(datadir)/alsa +alsa_DATA = surround.conf + all: libpcm.la INCLUDES=-I$(top_srcdir)/include diff --git a/src/pcm/pcm_surr.c b/src/pcm/pcm_surr.c index 01d07960..fdefbce7 100644 --- a/src/pcm/pcm_surr.c +++ b/src/pcm/pcm_surr.c @@ -690,7 +690,7 @@ static int open_trid4nx(snd_pcm_surround_t *surr, if ((err = snd_pcm_surround_three_streams(surr, type, snd_ctl_card_info_get_card(info), - 0, 0, 0, 0, -1, -1, + 0, -1, 0, -1, -1, -1, stream, mode)) < 0) return err; diff --git a/src/pcm/surround.conf b/src/pcm/surround.conf new file mode 100644 index 00000000..b6c981e9 --- /dev/null +++ b/src/pcm/surround.conf @@ -0,0 +1,97 @@ +# +# Configuration for the surround plugin +# + +surround_plugin.SI_7018 { # test only + channels.six = true; + open_multi { + device.0 = 0; + subdevice.0 = -1; + device.1 = 0; + subdevice.1 = -1; + device.2 = 0; + subdevice.2 = -1; + } +} + +surround_plugin.FM801 { + channels.six = true; + open_single { + device.0 = 0; + subdevice.0 = 0; + } +} + +surround_plugin.ENS1370 { + use_fd = 1; + open_multi { + device.0 = 1; + subdevice.0 = 0; + device.1 = 0; + subdevice.1 = 0; + } + # Reroute PCM0 (rear) to Line-In Jack. + open_control.0 { + iface = CARD; + name = 'PCM 0 Output also on Line-In Jack'; + index = 0; + lock = true; + preserve = true; + value.0 = true; + } + # Turn off the PCM volume, the second PCM (front speakers) uses + # the second PCM control. + open_control.1 { + iface = MIXER; + name = 'PCM Switch'; + index = 0; + lock = true; + preserve = true; + value.0 = false; + value.1 = false; + } +} + +surround_plugin.YMFPCI { + open_multi { + device.0 = 0; + subdevice.0 = 0; + device.1 = 2; + subdevice.1 = 0; + } +} + +surround_plugin.TRID4DWAVENX { + open_multi { + device.0 = 0; + subdevice.0 = -1; + device.1 = 0; + subdevice.1 = -1; + } + # Enable rear path + open_control.0 { + iface = MIXER; + name = 'Rear Path'; + index = subdevice1; + lock = true; + value.0 = true; + } + # Mute front volume + open_control.1 { + iface = MIXER; + name = 'PCM Front Playback Volume'; + index = subdevice1; + lock = true; + value.0 = 0; + value.1 = 0; + } + # Set reverb (rear) volume + open_control.2 { + iface = MIXER; + name = 'PCM Reverb Playback Volume'; + index = subdevice1; + lock = true; + value.0 = 127; + value.1 = 127; + } +} -- 2.47.1