From 946fb4aefd923542fc10ddf0edef070df032fc35 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Thu, 20 Jan 2011 12:27:02 -0700 Subject: [PATCH] Get rid of the USE_CODEC_VORBIS ifdef; we always want vorbis. --- Quake/cd_shared.c | 6 +++--- Quake/snd_codec.c | 2 -- Quake/snd_codec.h | 2 -- Quake/snd_codec_ogg.c | 5 ----- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Quake/cd_shared.c b/Quake/cd_shared.c index 37fd890f..0590346f 100644 --- a/Quake/cd_shared.c +++ b/Quake/cd_shared.c @@ -76,9 +76,9 @@ void CDAudio_PlayNamed(const char *name, qboolean looping) { track = remap[track]; } - q_snprintf(playTrackName, sizeof(playTrackName), "%02d", track); + q_snprintf(playTrackName, sizeof(playTrackName), "%03d", track); - q_snprintf(filename, sizeof(filename), "music/cdtracks/track%02u", track); + q_snprintf(filename, sizeof(filename), "sound/cdtracks/track%03u", track); if (S_Base_StartBackgroundTrack(filename, looping, CDAudio_FinishedCallback, NULL)) return; // No music file, so try using the hardware CD player @@ -98,7 +98,7 @@ void CDAudio_PlayNamed(const char *name, qboolean looping) { q_snprintf(playTrackName, sizeof(playTrackName), "%s", name); - q_snprintf(filename, sizeof(filename), "music/cdtracks/%s", playTrackName); + q_snprintf(filename, sizeof(filename), "sound/cdtracks/%s", playTrackName); if (S_Base_StartBackgroundTrack(filename, looping, CDAudio_FinishedCallback, NULL)) return; Con_Printf("WARNING: Couldn't find music track \"%s\"\n", playTrackName); diff --git a/Quake/snd_codec.c b/Quake/snd_codec.c index 9de55fd0..78011778 100644 --- a/Quake/snd_codec.c +++ b/Quake/snd_codec.c @@ -110,9 +110,7 @@ void S_CodecInit() { codecs = NULL; S_CodecRegister(&wav_codec); -#ifdef USE_CODEC_VORBIS S_CodecRegister(&ogg_codec); -#endif } /* diff --git a/Quake/snd_codec.h b/Quake/snd_codec.h index d28eeea6..85d8df0c 100644 --- a/Quake/snd_codec.h +++ b/Quake/snd_codec.h @@ -86,12 +86,10 @@ void S_WAV_CodecCloseStream(snd_stream_t *stream); int S_WAV_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer); // Ogg Vorbis codec -#ifdef USE_CODEC_VORBIS extern snd_codec_t ogg_codec; void *S_OGG_CodecLoad(const char *filename, snd_info_t *info); snd_stream_t *S_OGG_CodecOpenStream(const char *filename); void S_OGG_CodecCloseStream(snd_stream_t *stream); int S_OGG_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer); -#endif // USE_CODEC_VORBIS #endif // !_SND_CODEC_H_ diff --git a/Quake/snd_codec_ogg.c b/Quake/snd_codec_ogg.c index 339df583..1e3babb7 100644 --- a/Quake/snd_codec_ogg.c +++ b/Quake/snd_codec_ogg.c @@ -23,9 +23,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -// OGG support is enabled by this define -#ifdef USE_CODEC_VORBIS - // includes for the Q3 sound system #include "quakedef.h" #include "snd_codec.h" @@ -474,5 +471,3 @@ void *S_OGG_CodecLoad(const char *filename, snd_info_t *info) return buffer; } - -#endif // USE_CODEC_VORBIS