Re: [AD] Changes in CVS and some comments about patches

[Tom Fjellstrom <tfjellstrom@xxxxxxxxxx>]

Here is a patch to add some documentation for the
ALSA RawMIDI driver, and to disable input detection.
The driver doesn't really suport input so it shouldn't
say it does...

To apply this patch just 'patch -ui alsadoc.dif -p3'
in allegro's parent directory.

-- 
Tom Fjellstrom
tfjellstrom@xxxxxxxxxx
http://strangesoft.net/

diff -ru /usr/src/allegro/docs/allegro._tx /home/moose/allegro/docs/allegro._tx
--- /usr/src/allegro/docs/allegro._tx	Mon Nov 13 16:41:20 2000
+++ /home/moose/allegro/docs/allegro._tx	Mon Nov 13 16:40:50 2000
@@ -888,16 +888,10 @@
    Unix only: size of each ALSA fragment, in samples.
 <li>
 alsa_rawmidi_card = x<br>
-   Unix only: for ALSA MIDI driver.
+   Unix only: ALSA card to use for midi output.
 <li>
 alsa_rawmidi_device = x<br>.
-   Unix only: for ALSA MIDI driver.
-<li>
-alsa_input_card = x<br>
-   Unix only: for ALSA MIDI driver.
-<li>
-alsa_rawmidi_input_device = x<br>
-   Unix only: for ALSA MIDI driver.
+   Unix only: ALSA rawmidi device to use for output.
 <li>
 patches = x<br>
    Specifies where to find the sample set for the DIGMID driver. This can 
@@ -6884,6 +6878,7 @@
       MIDI_NONE            - no MIDI sound
       MIDI_OSS             - Open Sound System
       MIDI_DIGMID          - sample-based software wavetable player
+      MIDI_ALSA            - ALSA RawMIDI driver
 </pre>
 
 
@@ -7378,3 +7373,4 @@
 
 @html
 @text
+
diff -ru /usr/src/allegro/src/unix/alsamidi.c /home/moose/allegro/src/unix/alsamidi.c
--- /usr/src/allegro/src/unix/alsamidi.c	Mon Nov 13 16:41:23 2000
+++ /home/moose/allegro/src/unix/alsamidi.c	Mon Nov 13 16:40:52 2000
@@ -72,8 +72,9 @@
 	snd_rawmidi_t *handle = NULL;
 
 	if(input) {
+		/* Input not supported.
 		card = get_config_int(uconvert_ascii("sound", tmp1),
-				uconvert_ascii("alsa_input_card", tmp2),
+				uconvert_ascii("alsa_rawmidi_input_card", tmp2),
 				snd_defaults_rawmidi_card());
 
 		device = get_config_int(uconvert_ascii("sound", tmp1),
@@ -87,8 +88,8 @@
 		}
 
 		snd_rawmidi_close(handle);
-		
-		ret = TRUE;
+		*/
+		ret = FALSE;
 
 	}
 	else {
@@ -127,9 +128,9 @@
 	snd_rawmidi_info_t info;
 
 	if(input) {
-	
+		/* Input not supported
 		card = get_config_int(uconvert_ascii("sound", tmp1),
-				uconvert_ascii("alsa_input_card", tmp2),
+				uconvert_ascii("alsa_rawmidi_input_card", tmp2),
 				snd_defaults_rawmidi_card());
 
 		device = get_config_int(uconvert_ascii("sound", tmp1),
@@ -141,8 +142,8 @@
 			ustrcpy(allegro_error, get_config_text(temp));
 			ret = -1;
 		}
-
-		ret = 0;
+		*/
+		ret = -1;
 
 	}
 	else {
@@ -207,7 +208,7 @@
 
 /* alsa_rawmidi_input:
  *		Reads MIDI data.
- */
+ * not supported...
 static INLINE int alsa_rawmidi_input(void)
 {
 	char data = 0;
@@ -217,5 +218,6 @@
 	else
 		return 0;
 }
-
+*/
 #endif /* MIDI_ALSA */
+