Re: [AD] ALSA config variables mess

[Eric Botcazou <ebotcazou@xxxxxxxxxx>]

> Well, I think the digi and rawmidi should stay separate, just in case you
> have one card that does midi, and another that does pcm.

Agreed.

> I thought I cleaned up that mess ;) yeah the alsa_digi* vars can probably
> be turned into alsa_*.

Probably an oversight. The setup program outputs the alsa_* version, so I 
simply got rid of the alsadigi_* variant with the attached patch.

Applied on mainline and branch.

-- 
Eric Botcazou

Index: allegro.cfg
===================================================================
RCS file: /cvsroot/alleg/allegro/allegro.cfg,v
retrieving revision 1.44
diff -u -r1.44 allegro.cfg
--- allegro.cfg	17 Sep 2003 13:12:24 -0000	1.44
+++ allegro.cfg	1 Oct 2003 07:21:00 -0000
@@ -446,14 +446,25 @@
 
 
 
-# Unix only: card number and PCM device for the ALSA driver
+# Unix only: card number and PCM device for the ALSA sound driver
 alsa_card = 
 alsa_pcmdevice = 
 
 
 
-# Unix only: size of ALSA driver fragments (buffers)
+# Unix only: number of ALSA driver fragments (buffers)
 alsa_numfrags = 
+
+
+
+# Unix only: size of each ALSA fragment, in samples
+alsa_fragsize = 
+
+
+
+# Unix only: card number and device for the ALSA midi driver
+alsa_rawmidi_card = 
+alsa_rawmidi_device = 
 
 
 
Index: docs/src/allegro._tx
===================================================================
RCS file: /cvsroot/alleg/allegro/docs/src/allegro._tx,v
retrieving revision 1.180
diff -u -r1.180 allegro._tx
--- docs/src/allegro._tx	17 Sep 2003 13:12:25 -0000	1.180
+++ docs/src/allegro._tx	1 Oct 2003 07:22:01 -0000
@@ -1810,7 +1810,7 @@
 <li>
 alsa_card = x<br>
 alsa_pcmdevice = x<br>
-   Unix only: paramaters for the ALSA sound driver system.
+   Unix only: card number and PCM device for the ALSA sound driver.
 <li>
 alsa_numfrags = x<br>
    Unix only: number of ALSA driver fragments (buffers).
@@ -1819,10 +1819,8 @@
    Unix only: size of each ALSA fragment, in samples.
 <li>
 alsa_rawmidi_card = x<br>
-   Unix only: ALSA card to use for midi output.
-<li>
 alsa_rawmidi_device = x<br>
-   Unix only: ALSA rawmidi device to use for output.
+   Unix only: card number and device for the ALSA midi driver.
 <li>
 be_midi_quality = x<br>
    BeOS only: system MIDI synthesizer instruments quality. 0 uses low
Index: src/unix/alsa.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/unix/alsa.c,v
retrieving revision 1.17
diff -u -r1.17 alsa.c
--- src/unix/alsa.c	5 Apr 2002 02:18:52 -0000	1.17
+++ src/unix/alsa.c	1 Oct 2003 07:22:03 -0000
@@ -204,11 +204,11 @@
 
    /* Load config.  */
    card = get_config_int(uconvert_ascii("sound", tmp1),
-			 uconvert_ascii("alsadigi_card", tmp2),
+			 uconvert_ascii("alsa_card", tmp2),
 			 snd_defaults_card());
 
    device = get_config_int(uconvert_ascii("sound", tmp1),
-			   uconvert_ascii("alsadigi_pcmdevice", tmp2),
+			   uconvert_ascii("alsa_pcmdevice", tmp2),
 			   snd_defaults_pcm_device());
 
    fragsize = get_config_int(uconvert_ascii("sound", tmp1),