Never use SDL audio in Linux.
This commit is contained in:
@@ -164,10 +164,6 @@ Sound_Null = \
|
|||||||
arch/Sound/RageSoundDriver_Null.cpp \
|
arch/Sound/RageSoundDriver_Null.cpp \
|
||||||
arch/Sound/RageSoundDriver_Null.h
|
arch/Sound/RageSoundDriver_Null.h
|
||||||
|
|
||||||
Sound_SDL = \
|
|
||||||
arch/Sound/RageSoundDriver_SDL.cpp \
|
|
||||||
arch/Sound/RageSoundDriver_SDL.h
|
|
||||||
|
|
||||||
Sound = $(Sound_Null)
|
Sound = $(Sound_Null)
|
||||||
if ALSA
|
if ALSA
|
||||||
Sound += $(Sound_ALSA9)
|
Sound += $(Sound_ALSA9)
|
||||||
@@ -175,7 +171,6 @@ endif
|
|||||||
if HAVE_OSS
|
if HAVE_OSS
|
||||||
Sound += $(Sound_OSS)
|
Sound += $(Sound_OSS)
|
||||||
endif
|
endif
|
||||||
Sound += $(Sound_SDL)
|
|
||||||
|
|
||||||
stepmania_SOURCES = $(Rage) $(DataStructures) $(FileTypes) $(StepMania) $(Transitions) \
|
stepmania_SOURCES = $(Rage) $(DataStructures) $(FileTypes) $(StepMania) $(Transitions) \
|
||||||
$(Actors) $(ActorsInMenus) $(ActorsInGameplay) $(Screens) $(GlobalSingletons) \
|
$(Actors) $(ActorsInMenus) $(ActorsInGameplay) $(Screens) $(GlobalSingletons) \
|
||||||
|
|||||||
@@ -5,15 +5,17 @@
|
|||||||
#include "Sound/RageSoundDriver_ALSA9.h"
|
#include "Sound/RageSoundDriver_ALSA9.h"
|
||||||
/* #endif HAS_ALSA9 */
|
/* #endif HAS_ALSA9 */
|
||||||
#include "Sound/RageSoundDriver_OSS.h"
|
#include "Sound/RageSoundDriver_OSS.h"
|
||||||
#endif
|
|
||||||
/*
|
/*
|
||||||
* Sometimes Alsa and OSS fail to load, so
|
* Sometimes Alsa and OSS fail to load, so
|
||||||
* SDL should be a fallback, even though it
|
* SDL should be a fallback, even though it
|
||||||
* doesn't work perfectly.
|
* doesn't work perfectly.
|
||||||
*/
|
*/
|
||||||
#include "SDL.h"
|
/* No, it shouldn't. If they fail to load, we should receive a bug report
|
||||||
#include "Sound/RageSoundDriver_SDL.h"
|
* and fix our code, not have it silently fall back on a broken driver. -glenn */
|
||||||
|
// #include "Sound/RageSoundDriver_SDL.h"
|
||||||
|
|
||||||
|
#endif
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2002 by the person(s) listed below. All rights reserved.
|
* Copyright (c) 2002 by the person(s) listed below. All rights reserved.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user