| Re: [AD] [BUG?] X11 Windowed driver delay... |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
On Wed, 2004-02-25 at 19:37, Eric Botcazou wrote:
> > > @@ -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],,
> > >
> > > Isn't the condition always true?
> >
> > Oops, yes. The >= 0 should be > 0 of course.
>
> Yes, but I don't like it very much either.
>
> OK for mainline with
>
> #if (SND_LIB_MAJOR > 0) || (SND_LIB_MAJOR == 0 && SND_LIB_MINOR == 9)
>
> or whatever similar construct the preprocessor is happy with :-)
>
Ok, done now. Attached is the temporary patch to change the
auto-detection priority of the compiled in as well as the modular ALSA
driver to behind OSS. This should have the same effect as disabling
auto-detection: Users of 4.1.13 will get the working OSS drivers, and
ALSA only if there is no alternative.
--
Elias Pschernig <elias@xxxxxxxxxx>
Index: src/unix/usnddrv.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/unix/usnddrv.c,v
retrieving revision 1.5
diff -p -u -r1.5 usnddrv.c
--- src/unix/usnddrv.c 15 Nov 2002 11:13:26 -0000 1.5
+++ src/unix/usnddrv.c 28 Feb 2004 05:49:07 -0000
@@ -30,12 +30,12 @@ BEGIN_DIGI_DRIVER_LIST
#if (defined DIGI_ESD) && (!defined ALLEGRO_WITH_MODULES)
DIGI_DRIVER_ESD
#endif
-#if (defined DIGI_ALSA) && (!defined ALLEGRO_WITH_MODULES)
- DIGI_DRIVER_ALSA
-#endif
#ifdef DIGI_OSS
DIGI_DRIVER_OSS
#endif
+#if (defined DIGI_ALSA) && (!defined ALLEGRO_WITH_MODULES)
+ DIGI_DRIVER_ALSA
+#endif
END_DIGI_DRIVER_LIST
Index: src/unix/alsa9.c
===================================================================
RCS file: /cvsroot/alleg/allegro/src/unix/alsa9.c,v
retrieving revision 1.1
diff -p -u -r1.1 alsa9.c
--- src/unix/alsa9.c 28 Feb 2004 04:24:49 -0000 1.1
+++ src/unix/alsa9.c 28 Feb 2004 05:49:07 -0000
@@ -446,7 +446,7 @@ static int alsa_mixer_volume(int volume)
*/
void _module_init(int system_driver)
{
- _unix_register_digi_driver(DIGI_ALSA, &digi_alsa, TRUE, TRUE);
+ _unix_register_digi_driver(DIGI_ALSA, &digi_alsa, TRUE, FALSE);
}
#endif