tBasic SDL_mixer sound support. - vaccinewars - be a doctor and try to vaccinat… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 2d2efea65a3c9b61947c6d45895ae5cd44437744 | |
parent 7cee821f757c3ac4456831bcfbb2c44313551b26 | |
Author: Ben Webb <[email protected]> | |
Date: Sat, 4 May 2002 17:55:48 +0000 | |
Basic SDL_mixer sound support. | |
Diffstat: | |
A m4/sdl.m4 | 174 +++++++++++++++++++++++++++++… | |
M src/sound.c | 8 ++++++-- | |
A src/sound_sdl.c | 121 +++++++++++++++++++++++++++++… | |
A src/sound_sdl.h | 36 +++++++++++++++++++++++++++++… | |
4 files changed, 337 insertions(+), 2 deletions(-) | |
--- | |
diff --git a/m4/sdl.m4 b/m4/sdl.m4 | |
t@@ -0,0 +1,174 @@ | |
+# Configure paths for SDL | |
+# Sam Lantinga 9/21/99 | |
+# stolen from Manish Singh | |
+# stolen back from Frank Belew | |
+# stolen from Manish Singh | |
+# Shamelessly stolen from Owen Taylor | |
+ | |
+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | |
+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS | |
+dnl | |
+AC_DEFUN(AM_PATH_SDL, | |
+[dnl | |
+dnl Get the cflags and libraries from the sdl-config script | |
+dnl | |
+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installe… | |
+ sdl_prefix="$withval", sdl_prefix="") | |
+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SD… | |
+ sdl_exec_prefix="$withval", sdl_exec_prefix="") | |
+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and ru… | |
+ , enable_sdltest=yes) | |
+ | |
+ if test x$sdl_exec_prefix != x ; then | |
+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" | |
+ if test x${SDL_CONFIG+set} != xset ; then | |
+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config | |
+ fi | |
+ fi | |
+ if test x$sdl_prefix != x ; then | |
+ sdl_args="$sdl_args --prefix=$sdl_prefix" | |
+ if test x${SDL_CONFIG+set} != xset ; then | |
+ SDL_CONFIG=$sdl_prefix/bin/sdl-config | |
+ fi | |
+ fi | |
+ | |
+ AC_REQUIRE([AC_CANONICAL_TARGET]) | |
+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no) | |
+ min_sdl_version=ifelse([$1], ,0.11.0,$1) | |
+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) | |
+ no_sdl="" | |
+ if test "$SDL_CONFIG" = "no" ; then | |
+ no_sdl=yes | |
+ else | |
+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` | |
+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` | |
+ | |
+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | |
+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | |
+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | |
+ if test "x$enable_sdltest" = "xyes" ; then | |
+ ac_save_CFLAGS="$CFLAGS" | |
+ ac_save_LIBS="$LIBS" | |
+ CFLAGS="$CFLAGS $SDL_CFLAGS" | |
+ LIBS="$LIBS $SDL_LIBS" | |
+dnl | |
+dnl Now check if the installed SDL is sufficiently new. (Also sanity | |
+dnl checks the results of sdl-config to some extent | |
+dnl | |
+ rm -f conf.sdltest | |
+ AC_TRY_RUN([ | |
+#include <stdio.h> | |
+#include <stdlib.h> | |
+#include <string.h> | |
+#include "SDL.h" | |
+ | |
+char* | |
+my_strdup (char *str) | |
+{ | |
+ char *new_str; | |
+ | |
+ if (str) | |
+ { | |
+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); | |
+ strcpy (new_str, str); | |
+ } | |
+ else | |
+ new_str = NULL; | |
+ | |
+ return new_str; | |
+} | |
+ | |
+int main (int argc, char *argv[]) | |
+{ | |
+ int major, minor, micro; | |
+ char *tmp_version; | |
+ | |
+ /* This hangs on some systems (?) | |
+ system ("touch conf.sdltest"); | |
+ */ | |
+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } | |
+ | |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
+ tmp_version = my_strdup("$min_sdl_version"); | |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
+ printf("%s, bad version string\n", "$min_sdl_version"); | |
+ exit(1); | |
+ } | |
+ | |
+ if (($sdl_major_version > major) || | |
+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || | |
+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl… | |
+ { | |
+ return 0; | |
+ } | |
+ else | |
+ { | |
+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum … | |
+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then … | |
+ printf("*** best to upgrade to the required version.\n"); | |
+ printf("*** If sdl-config was wrong, set the environment variable SDL_CO… | |
+ printf("*** to point to the correct copy of sdl-config, and remove the f… | |
+ printf("*** config.cache before re-running configure\n"); | |
+ return 1; | |
+ } | |
+} | |
+ | |
+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ if test "x$no_sdl" = x ; then | |
+ AC_MSG_RESULT(yes) | |
+ ifelse([$2], , :, [$2]) | |
+ else | |
+ AC_MSG_RESULT(no) | |
+ if test "$SDL_CONFIG" = "no" ; then | |
+ echo "*** The sdl-config script installed by SDL could not be found" | |
+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" | |
+ echo "*** your path, or set the SDL_CONFIG environment variable to the" | |
+ echo "*** full path to sdl-config." | |
+ else | |
+ if test -f conf.sdltest ; then | |
+ : | |
+ else | |
+ echo "*** Could not run SDL test program, checking why..." | |
+ CFLAGS="$CFLAGS $SDL_CFLAGS" | |
+ LIBS="$LIBS $SDL_LIBS" | |
+ AC_TRY_LINK([ | |
+#include <stdio.h> | |
+#include "SDL.h" | |
+ | |
+int main(int argc, char *argv[]) | |
+{ return 0; } | |
+#undef main | |
+#define main K_and_R_C_main | |
+], [ return 0; ], | |
+ [ echo "*** The test program compiled, but did not run. This usually m… | |
+ echo "*** that the run-time linker is not finding SDL or finding the… | |
+ echo "*** version of SDL. If it is not finding SDL, you'll need to s… | |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.c… | |
+ echo "*** to the installed location Also, make sure you have run ld… | |
+ echo "*** is required on your system" | |
+ echo "***" | |
+ echo "*** If you have an old version installed, it is best to remove… | |
+ echo "*** you may also be able to get things to work by modifying LD… | |
+ [ echo "*** The test program failed to compile or link. See the file c… | |
+ echo "*** exact error that occured. This usually means SDL was incor… | |
+ echo "*** or that you have moved SDL since it was installed. In the … | |
+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ SDL_CFLAGS="" | |
+ SDL_LIBS="" | |
+ ifelse([$3], , :, [$3]) | |
+ fi | |
+ AC_SUBST(SDL_CFLAGS) | |
+ AC_SUBST(SDL_LIBS) | |
+ rm -f conf.sdltest | |
+]) | |
diff --git a/src/sound.c b/src/sound.c | |
t@@ -25,15 +25,19 @@ | |
#endif | |
#include "sound_esd.h" | |
+#include "sound_sdl.h" | |
#include "sound_winmm.h" | |
static SoundDriver *driver = NULL; | |
void SoundInit(void) | |
{ | |
-#ifdef HAVE_ESD | |
- driver = SoundInit_ESD(); | |
+#ifdef HAVE_SDL_MIXER | |
+ driver = SoundInit_SDL(); | |
#endif | |
+//#ifdef HAVE_ESD | |
+// driver = SoundInit_ESD(); | |
+//#endif | |
#ifdef HAVE_WINMM | |
driver = SoundInit_WinMM(); | |
#endif | |
diff --git a/src/sound_sdl.c b/src/sound_sdl.c | |
t@@ -0,0 +1,121 @@ | |
+/************************************************************************ | |
+ * sound_sdl.c dopewars sound system (SDL driver) * | |
+ * Copyright (C) 1998-2002 Ben Webb * | |
+ * Email: [email protected] * | |
+ * WWW: http://dopewars.sourceforge.net/ * | |
+ * * | |
+ * This program is free software; you can redistribute it and/or * | |
+ * modify it under the terms of the GNU General Public License * | |
+ * as published by the Free Software Foundation; either version 2 * | |
+ * of the License, or (at your option) any later version. * | |
+ * * | |
+ * This program is distributed in the hope that it will be useful, * | |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of * | |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | |
+ * GNU General Public License for more details. * | |
+ * * | |
+ * You should have received a copy of the GNU General Public License * | |
+ * along with this program; if not, write to the Free Software * | |
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * | |
+ * MA 02111-1307, USA. * | |
+ ************************************************************************/ | |
+ | |
+#ifdef HAVE_CONFIG_H | |
+#include <config.h> | |
+#endif | |
+ | |
+#ifdef HAVE_SDL_MIXER | |
+#include <stdio.h> | |
+#include <string.h> | |
+#include <SDL.h> | |
+#include <SDL_mixer.h> | |
+#include <glib.h> | |
+#include "sound.h" | |
+ | |
+struct ChannelStruct { | |
+ Mix_Chunk *chunk; | |
+ gchar *name; | |
+} channel[MIX_CHANNELS]; | |
+ | |
+static gboolean SoundOpen_SDL(void) | |
+{ | |
+ const int audio_rate = MIX_DEFAULT_FREQUENCY; | |
+ const int audio_format = MIX_DEFAULT_FORMAT; | |
+ const int audio_channels = 2; | |
+ int i; | |
+ | |
+ if (SDL_Init(SDL_INIT_AUDIO) < 0) { | |
+ return FALSE; | |
+ } | |
+ | |
+ if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, 4096) < 0) { | |
+ SDL_Quit(); | |
+ return FALSE; | |
+ } | |
+ Mix_AllocateChannels(MIX_CHANNELS); | |
+ | |
+ for (i = 0; i < MIX_CHANNELS; i++) { | |
+ channel[i].chunk = NULL; | |
+ channel[i].name = NULL; | |
+ } | |
+ return TRUE; | |
+} | |
+ | |
+static void SoundClose_SDL(void) | |
+{ | |
+ int i; | |
+ | |
+ for (i = 0; i < MIX_CHANNELS; i++) { | |
+ g_free(channel[i].name); | |
+ if (channel[i].chunk) { | |
+ Mix_FreeChunk(channel[i].chunk); | |
+ } | |
+ } | |
+ Mix_CloseAudio(); | |
+ SDL_Quit(); | |
+} | |
+ | |
+static void SoundPlay_SDL(const gchar *snd) | |
+{ | |
+ int i, chan_num; | |
+ Mix_Chunk *chunk; | |
+ | |
+ for (i = 0; i < MIX_CHANNELS; i++) { | |
+ if (channel[i].name && strcmp(channel[i].name, snd) == 0) { | |
+ Mix_PlayChannel(-1, channel[i].chunk, 0); | |
+ return; | |
+ } | |
+ } | |
+ | |
+ chunk = Mix_LoadWAV(snd); | |
+ if (!chunk) { | |
+ return; | |
+ } | |
+ | |
+ chan_num = Mix_PlayChannel(-1, chunk, 0); | |
+ if (chan_num < 0) { | |
+ Mix_FreeChunk(chunk); | |
+ return; | |
+ } | |
+ | |
+ if (channel[chan_num].chunk) { | |
+ Mix_FreeChunk(channel[chan_num].chunk); | |
+ g_free(channel[chan_num].name); | |
+ } | |
+ | |
+ channel[chan_num].chunk = chunk; | |
+ channel[chan_num].name = g_strdup(snd); | |
+} | |
+ | |
+SoundDriver *SoundInit_SDL(void) | |
+{ | |
+ static SoundDriver driver; | |
+ | |
+ driver.name = "sdl"; | |
+ driver.open = SoundOpen_SDL; | |
+ driver.close = SoundClose_SDL; | |
+ driver.play = SoundPlay_SDL; | |
+ return &driver; | |
+} | |
+ | |
+#endif /* HAVE_SDL_MIXER */ | |
diff --git a/src/sound_sdl.h b/src/sound_sdl.h | |
t@@ -0,0 +1,36 @@ | |
+/************************************************************************ | |
+ * sound_sdl.h Header file for dopewars sound system (SDL driver) * | |
+ * Copyright (C) 1998-2002 Ben Webb * | |
+ * Email: [email protected] * | |
+ * WWW: http://dopewars.sourceforge.net/ * | |
+ * * | |
+ * This program is free software; you can redistribute it and/or * | |
+ * modify it under the terms of the GNU General Public License * | |
+ * as published by the Free Software Foundation; either version 2 * | |
+ * of the License, or (at your option) any later version. * | |
+ * * | |
+ * This program is distributed in the hope that it will be useful, * | |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of * | |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | |
+ * GNU General Public License for more details. * | |
+ * * | |
+ * You should have received a copy of the GNU General Public License * | |
+ * along with this program; if not, write to the Free Software * | |
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * | |
+ * MA 02111-1307, USA. * | |
+ ************************************************************************/ | |
+ | |
+#ifndef __DP_SOUND_SDL_H__ | |
+#define __DP_SOUND_SDL_H__ | |
+ | |
+#ifdef HAVE_CONFIG_H | |
+#include <config.h> | |
+#endif | |
+ | |
+#include "sound.h" | |
+ | |
+#ifdef HAVE_SDL_MIXER | |
+SoundDriver *SoundInit_SDL(void); | |
+#endif /* HAVE_SDL_MIXER */ | |
+ | |
+#endif /* __DP_SOUND_SDL_H__ */ |