Re: [AD] [BUG?] X11 Windowed driver delay...

[Elias Pschernig <elias@xxxxxxxxxx>]

On Thu, 2004-02-19 at 07:47, Eric Botcazou wrote:
> > Can I also split alsa.c into alsa5.c and alsa9.c (or alsa5.c and alsa.c,
> > since alsa 0.9 seems to be compatible with alsa 1.0)? There doesn't seem
> > to be any common code, and it gets rid of all the #defines, so it makes
> > it easier to work with it.
> 
> Ouch!  I spent a not insignificant amount of time to make them play nice with 
> each other.  But that's OK, go ahead and do the split.
> 
> I think it would be safer to resurrect the alsa.c file prior to the merge and 
> rename it into alsa5.c (after checking that no correction was made to it 
> after the merge, which I think is highly unlikely).
> 

Ok, I did that. Attached is also alsa5.diff and alsa9.diff which show
the changes to CVS before alsa 0.9 was added, and to current CVS,
respectively. (The latter diff is messed up by some formatting changes.)

The only functional changes are: "Alsa 0.5/0.9" is added to the
description string now, and Alsa 1.0 is detected by the configure
process.

-- 
Elias Pschernig <elias@xxxxxxxxxx>

Attachment: alsa5.c.gz
Description: GNU Zip compressed data

Attachment: alsa5.diff.gz
Description: GNU Zip compressed data

Attachment: alsa9.c.gz
Description: GNU Zip compressed data

Attachment: alsa9.diff.gz
Description: GNU Zip compressed data

Index: makefile.lst
===================================================================
RCS file: /cvsroot/alleg/allegro/makefile.lst,v
retrieving revision 1.94
diff -u -p -r1.94 makefile.lst
--- makefile.lst	21 Oct 2003 18:54:40 -0000	1.94
+++ makefile.lst	19 Feb 2004 13:54:43 -0000
@@ -268,7 +268,8 @@ ALLEGRO_SRC_LINUX_FILES = \
 	src/misc/modexgfx.s
 
 ALLEGRO_SRC_UNIX_FILES = \
-	src/unix/alsa.c \
+	src/unix/alsa5.c \
+	src/unix/alsa9.c \
 	src/unix/alsamidi.c \
 	src/unix/arts.c \
 	src/unix/sgial.c \
@@ -317,7 +318,7 @@ ALLEGRO_SRC_QNX_FILES = \
 	src/qnx/qphwin.c \
 	src/qnx/qswitch.s \
 	src/qnx/qsystem.c \
-	src/unix/alsa.c \
+	src/unix/alsa5.c \
 	src/unix/alsamidi.c \
 	src/unix/udjgpp.c \
 	src/unix/ufile.c \
@@ -369,7 +370,8 @@ ALLEGRO_MODULE_DGA2_FILES = \
 	src/x/xdga2s.s
 	
 ALLEGRO_MODULE_ALSADIGI_FILES = \
-	src/unix/alsa.c
+	src/unix/alsa5.c \
+	src/unix/alsa9.c
 
 ALLEGRO_MODULE_ALSAMIDI_FILES = \
 	src/unix/alsamidi.c
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/alleg/allegro/aclocal.m4,v
retrieving revision 1.55
diff -u -p -r1.55 aclocal.m4
--- aclocal.m4	19 Jan 2004 17:30:54 -0000	1.55
+++ aclocal.m4	19 Feb 2004 13:54:43 -0000
@@ -363,7 +363,7 @@ if test -n "$allegro_enable_alsadigi"; t
   AC_CACHE_CHECK(for supported ALSA version for digital sound,
   allegro_cv_support_alsadigi,
   AC_TRY_COMPILE([#include <sys/asoundlib.h>
-                  #if SND_LIB_MAJOR == 0 && SND_LIB_MINOR == 9
+                  #if SND_LIB_MAJOR >= 0 || SND_LIB_MINOR >= 9
                   #else
                   #error
                   #endif],,