Make snd_null.c actually work.

add --disable-sound to configure, for no sound at all :)
This commit is contained in:
Adam Olsen 2001-04-10 23:18:08 +00:00
parent 051f3ca96e
commit b89fde285d
3 changed files with 14 additions and 2 deletions

View file

@ -740,6 +740,10 @@ AC_ARG_ENABLE(alsa,
[ --enable-alsa enable checks for ALSA support],
)
AC_ARG_ENABLE(sound,
[ --disable-sound disable sound outright],
)
SNDTYPE=""
SOUND_LIBS=""
SOUND_CFLAGS=""
@ -860,6 +864,11 @@ QF_maGiC_VALUE
SOUND_LIBS="-lwinmm")
fi
if test "x$enable_sound" = "xno"; then
SNDTYPE=""
SOUND_LIBS=""
fi
if test "$SNDTYPE"; then
AC_MSG_RESULT([yes ($SNDTYPE)])
else

View file

@ -35,7 +35,7 @@ if SNDTYPE_WIN32
libQFsound_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c snd_win.c $(sound_ASM)
endif
if SNDTYPE_NULL
libQFsound_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c snd_null.c $(sound_ASM)
libQFsound_la_SOURCES= snd_mem.c snd_mix.c snd_null.c $(sound_ASM)
endif
LIBLIST = libQFsound.la @LIBRARY_SEARCH_PATH@

View file

@ -41,10 +41,11 @@ int total_channels;
volatile dma_t *shm = 0;
cvar_t *loadas8bit;
int paintedtime; // sample PAIRS
qboolean snd_initialized = false;
cvar_t *bgmvolume;
cvar_t *volume;
cvar_t *snd_interp;
void
@ -60,6 +61,8 @@ S_Init_Cvars (void)
loadas8bit =
Cvar_Get ("loadas8bit", "0", CVAR_NONE, 0, "Load samples as 8-bit");
bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, 0, "CD music volume");
snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, 0,
"control sample interpolation");
}
void