From adc0b5abb2cd39109f3fb022b62df8bd1d8f5889 Mon Sep 17 00:00:00 2001 From: William Reading Date: Thu, 19 Jun 2003 05:49:21 +0000 Subject: [PATCH] Add the SDL audio driver for fallback --- stepmania/src/Makefile.am | 5 +++++ stepmania/src/arch/arch_linux.h | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index fb964b9395..f5eface760 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -164,6 +164,10 @@ Sound_Null = \ arch/Sound/RageSoundDriver_Null.cpp \ arch/Sound/RageSoundDriver_Null.h +Sound_SDL = \ + arch/Sound/RageSoundDriver_SDL.cpp \ + arch/Sound/RageSoundDriver_SDL.h + Sound = $(Sound_Null) if ALSA Sound += $(Sound_ALSA9) @@ -171,6 +175,7 @@ endif if HAVE_OSS Sound += $(Sound_OSS) endif +Sound += $(Sound_SDL) stepmania_SOURCES = $(Rage) $(DataStructures) $(FileTypes) $(StepMania) $(Transitions) \ $(Actors) $(ActorsInMenus) $(ActorsInGameplay) $(Screens) $(GlobalSingletons) \ diff --git a/stepmania/src/arch/arch_linux.h b/stepmania/src/arch/arch_linux.h index 1edabf92dc..460acc4cdf 100644 --- a/stepmania/src/arch/arch_linux.h +++ b/stepmania/src/arch/arch_linux.h @@ -5,8 +5,14 @@ #include "Sound/RageSoundDriver_ALSA9.h" /* #endif HAS_ALSA9 */ #include "Sound/RageSoundDriver_OSS.h" - #endif +/* + * Sometimes Alsa and OSS fail to load, so + * SDL should be a fallback, even though it + * doesn't work perfectly. + */ +#include "SDL.h" +#include "Sound/RageSoundDriver_SDL.h" /* * Copyright (c) 2002 by the person(s) listed below. All rights reserved.