commit a3bdc179949956d759d1f866f86a25da44d378a3
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Sep 8 00:27:06 2008 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon Sep 8 00:27:06 2008 +0000
Move s_sound.[ch] to doom/
Subversion-branch: /branches/raven-branch
Subversion-revision: 1213
---
src/Makefile.am | 1 -
src/doom/Makefile.am | 1 +
src/{ => doom}/s_sound.c | 4 ----
src/{ => doom}/s_sound.h | 0
src/i_sdlmusic.c | 2 +-
src/i_sound.c | 4 ++++
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f5f8f3e..f3ebfbbe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,6 @@ m_misc.c m_misc.h \
md5.c md5.h \
memio.c memio.h \
m_random.c m_random.h \
-s_sound.c s_sound.h \
tables.c tables.h \
v_video.c v_video.h \
v_patch.h \
diff --git a/src/doom/Makefile.am b/src/doom/Makefile.am
index a24aa7f2..44162e48 100644
--- a/src/doom/Makefile.am
+++ b/src/doom/Makefile.am
@@ -54,6 +54,7 @@ r_segs.c r_segs.h \
r_sky.c r_sky.h \
r_state.h \
r_things.c r_things.h \
+s_sound.c s_sound.h \
sounds.c sounds.h \
st_lib.c st_lib.h \
st_stuff.c st_stuff.h \
diff --git a/src/s_sound.c b/src/doom/s_sound.c
similarity index 99%
rename from src/s_sound.c
rename to src/doom/s_sound.c
index 1dc575a3..964ed27f 100644
--- a/src/s_sound.c
+++ b/src/doom/s_sound.c
@@ -96,10 +96,6 @@ int sfxVolume = 8;
int musicVolume = 8;
-// Sound sample rate to use for digital output (Hz)
-
-int snd_samplerate = 44100;
-
// Internal volume level, ranging from 0-127
static int snd_SfxVolume;
diff --git a/src/s_sound.h b/src/doom/s_sound.h
similarity index 100%
rename from src/s_sound.h
rename to src/doom/s_sound.h
diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c
index 3acccde6..e2086598 100644
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -35,8 +35,8 @@
#include "mus2mid.h"
#include "deh_str.h"
+#include "i_sound.h"
#include "m_misc.h"
-#include "s_sound.h"
#include "w_wad.h"
#include "z_zone.h"
diff --git a/src/i_sound.c b/src/i_sound.c
index 3f057c62..c44219fb 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -42,6 +42,10 @@
#define DEFAULT_MUSIC_DEVICE SNDDEVICE_NONE
#endif
+// Sound sample rate to use for digital output (Hz)
+
+int snd_samplerate = 44100;
+
// Low-level sound and music modules we are using
static sound_module_t *sound_module;