fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-19 02:22:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of the USE_CODEC_VORBIS ifdef; we always

Browse source 
want vorbis.
This commit is contained in:
Eric Wasylishen 2011-01-20 12:27:02 -07:00
parent be88ebbf15
commit 946fb4aefd
4 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Quake/cd_shared.c
View file

@ -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);

2
Quake/snd_codec.c
View file

@ -110,9 +110,7 @@ void S_CodecInit()
{
codecs = NULL;
S_CodecRegister(&wav_codec);
#ifdef USE_CODEC_VORBIS
S_CodecRegister(&ogg_codec);
#endif
}
/*

2
Quake/snd_codec.h
View file

@ -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_

5
Quake/snd_codec_ogg.c
View file

@ -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