From 355bc09086e3ff04769e90565df100e510f852da Mon Sep 17 00:00:00 2001 From: molivier Date: Mon, 15 Mar 2004 08:52:06 +0000 Subject: [PATCH] Renamed ogg.[ch] to snd_ogg.[ch] git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4025 d7cf8633-e32d-0410-b094-e92efae38249 --- darkplaces.dsp | 16 ++++++++-------- makefile.inc | 2 +- snd_dma.c | 2 +- snd_mem.c | 2 +- ogg.c => snd_ogg.c | 2 +- ogg.h => snd_ogg.h | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rename ogg.c => snd_ogg.c (99%) rename ogg.h => snd_ogg.h (96%) diff --git a/darkplaces.dsp b/darkplaces.dsp index b714c0b2..271e44db 100644 --- a/darkplaces.dsp +++ b/darkplaces.dsp @@ -280,10 +280,6 @@ SOURCE=.\netconn.c # End Source File # Begin Source File -SOURCE=.\ogg.c -# End Source File -# Begin Source File - SOURCE=.\palette.c # End Source File # Begin Source File @@ -372,6 +368,10 @@ SOURCE=.\snd_mix.c # End Source File # Begin Source File +SOURCE=.\snd_ogg.c +# End Source File +# Begin Source File + SOURCE=.\snd_win.c # End Source File # Begin Source File @@ -592,10 +592,6 @@ SOURCE=.\netconn.h # End Source File # Begin Source File -SOURCE=.\ogg.h -# End Source File -# Begin Source File - SOURCE=.\palette.h # End Source File # Begin Source File @@ -672,6 +668,10 @@ SOURCE=.\server.h # End Source File # Begin Source File +SOURCE=.\snd_ogg.h +# End Source File +# Begin Source File + SOURCE=.\sound.h # End Source File # Begin Source File diff --git a/makefile.inc b/makefile.inc index 38edb305..5996e981 100644 --- a/makefile.inc +++ b/makefile.inc @@ -18,7 +18,7 @@ CPUOPTIMIZATIONS= ##### Variables that you shouldn't care about ##### # Sound objects -OBJ_COMMONSOUND=ogg.o snd_dma.o snd_mem.o snd_mix.o +OBJ_COMMONSOUND=snd_dma.o snd_mem.o snd_mix.o snd_ogg.o OBJ_NOSOUND=snd_null.o # CD objects diff --git a/snd_dma.c b/snd_dma.c index cb9e11cf..b55c553b 100644 --- a/snd_dma.c +++ b/snd_dma.c @@ -29,7 +29,7 @@ extern LPDIRECTSOUND pDS; extern LPDIRECTSOUNDBUFFER pDSBuf; #endif -#include "ogg.h" +#include "snd_ogg.h" void S_Play(void); diff --git a/snd_mem.c b/snd_mem.c index 1f7c75e8..94027d43 100644 --- a/snd_mem.c +++ b/snd_mem.c @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -#include "ogg.h" +#include "snd_ogg.h" /* diff --git a/ogg.c b/snd_ogg.c similarity index 99% rename from ogg.c rename to snd_ogg.c index c635e267..8acedc7c 100644 --- a/ogg.c +++ b/snd_ogg.c @@ -23,7 +23,7 @@ #include "quakedef.h" -#include "ogg.h" +#include "snd_ogg.h" extern void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name); diff --git a/ogg.h b/snd_ogg.h similarity index 96% rename from ogg.h rename to snd_ogg.h index 8a2c89e9..c25e32ac 100644 --- a/ogg.h +++ b/snd_ogg.h @@ -21,8 +21,8 @@ */ -#ifndef OGG_H -#define OGG_H +#ifndef SND_OGG_H +#define SND_OGG_H qboolean OGG_OpenLibrary (void); -- 2.39.2