*** alsaconf.orig	Sun Nov 26 07:26:42 2000
--- alsaconf	Sun Nov 26 07:29:20 2000
***************
*** 132,142 ****
   @port irq dma1 dma1_size\
   @??? ??? 0,1,3 4-64\
   @'' '' 1 ''"
! export CARD_0x1a="snd-card-trid4dwave Trident_4DWave_DX\
   @dac_frame_size_dx adc_frame_size_dx dac_frame_size_nx adc_frame_size_nx pcm_channels wavetable_size\
   @4-64 4-64 4-64 4-64 ??? 4-?\
   @'' '' '' '' '' ''"
! export CARD_0x1b="snd-card-trid4dwave Trident_4DWave_NX\
   @dac_frame_size_dx adc_frame_size_dx dac_frame_size_nx adc_frame_size_nx pcm_channels wavetable_size\
   @4-64 4-64 4-64 4-64 ??? 4-?\
   @'' '' '' '' '' ''"
--- 132,142 ----
   @port irq dma1 dma1_size\
   @??? ??? 0,1,3 4-64\
   @'' '' 1 ''"
! export CARD_0x1a="snd-card-trident Trident_4DWave_DX\
   @dac_frame_size_dx adc_frame_size_dx dac_frame_size_nx adc_frame_size_nx pcm_channels wavetable_size\
   @4-64 4-64 4-64 4-64 ??? 4-?\
   @'' '' '' '' '' ''"
! export CARD_0x1b="snd-card-trident Trident_4DWave_NX\
   @dac_frame_size_dx adc_frame_size_dx dac_frame_size_nx adc_frame_size_nx pcm_channels wavetable_size\
   @4-64 4-64 4-64 4-64 ??? 4-?\
   @'' '' '' '' '' ''"
***************
*** 184,190 ****
   @\
   @\
   @"
! export CARD_0x27="snd-card-opti93x OPTi_93x_chipset\
   @port mpu_port opl_port irq mpu_irq dma1 dma1_size dma2 dma2_size\
   @0x530,0xe80,0xf40,0x604 0x300,0x310,0x320,0x330 0x388 5,7,9,10,11 5,7,9,10 0,1,3 4-64 0,1,3 4-64kB\
   @0x530 0x330 0x388 5 7 0 '' 1 ''"
--- 184,190 ----
   @\
   @\
   @"
! export CARD_0x27="snd-card-opti9xx OPTi_9xx_chipset\
   @port mpu_port opl_port irq mpu_irq dma1 dma1_size dma2 dma2_size\
   @0x530,0xe80,0xf40,0x604 0x300,0x310,0x320,0x330 0x388 5,7,9,10,11 5,7,9,10 0,1,3 4-64 0,1,3 4-64kB\
   @0x530 0x330 0x388 5 7 0 '' 1 ''"
***************
*** 244,256 ****
   @\
   @\
   @"
! export CARD_0x36="snd-card-x VIA82C686A\
   @mpu_port joystick pbk_frame_size cap_frame_size\
   @0x300,0x310,0x320,0x330 0,1 1-128 1-128\
   @0x300 1 '' ''"
  export CARDS="0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf\
   0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c\
!  0x1d 0x22 0x23 0x24 0x25 0x2a 0x2d 0x30 0x31 0x33 0x36"
  
  # Check for root privileges
  if [ `id -u` -ne 0 ]; then
--- 244,260 ----
   @\
   @\
   @"
! export CARD_0x36="snd-card-via686a VIA82C686A\
   @mpu_port joystick pbk_frame_size cap_frame_size\
   @0x300,0x310,0x320,0x330 0,1 1-128 1-128\
   @0x300 1 '' ''"
+ export CARD_0x37="snd-card-ymfpci YAMAHA_YMF7XX\
+  @\
+  @\
+  @"
  export CARDS="0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf\
   0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c\
!  0x1d 0x22 0x23 0x24 0x25 0x2a 0x2d 0x30 0x31 0x33 0x36 0x37"
  
  # Check for root privileges
  if [ `id -u` -ne 0 ]; then
***************
*** 325,331 ****
  if [ -f /etc/conf.modules ]; then
  	export cfgfile="/etc/conf.modules"
  elif [ -f /etc/debian_version ]; then # Use special $cfgfile on newer Debian systems without /etc/conf.modules
! 	export cfgfile="/etc/modutils/alsa"
  else
  	export cfgfile="/etc/modules.conf"
  fi
--- 329,335 ----
  if [ -f /etc/conf.modules ]; then
  	export cfgfile="/etc/conf.modules"
  elif [ -f /etc/debian_version ]; then # Use special $cfgfile on newer Debian systems without /etc/conf.modules
! 	export cfgfile="/etc/alsa/modutils/0.5"
  else
  	export cfgfile="/etc/modules.conf"
  fi
***************
*** 925,931 ****
  
  You can exit with ALT + Q, or by hitting ESC.
  
! Do you need to set your miexer settings with alsamixer?
  " 21 70
    then
          clear
--- 929,935 ----
  
  You can exit with ALT + Q, or by hitting ESC.
  
! Do you need to set your mixer settings with alsamixer?
  " 21 70
    then
          clear
***************
*** 933,939 ****
    fi
  
    # Play sample dialog
!   if $DIALOG --yesno "
   PCM and Master channels should now be open for playing.
        Shall I try to play a sound sample now?
  
--- 937,943 ----
    fi
  
    # Play sample dialog
!   if test -e /usr/share/sndconfig/sample.au && $DIALOG --yesno "
   PCM and Master channels should now be open for playing.
        Shall I try to play a sound sample now?