From 2ee22cf86c19030ca2b2eee57792eb5f3cc41bd5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 13 Sep 2003 01:34:05 +0000 Subject: [PATCH] update --- stepmania/src/RageSoundReader_MP3.cpp | 28 +++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/stepmania/src/RageSoundReader_MP3.cpp b/stepmania/src/RageSoundReader_MP3.cpp index 9027adda85..9e5ae680fb 100644 --- a/stepmania/src/RageSoundReader_MP3.cpp +++ b/stepmania/src/RageSoundReader_MP3.cpp @@ -1,16 +1,24 @@ -#include -#include "RageSoundReader_MP3.h" - - /* MAD is available from: http://www.mars.org/home/rob/proj/mpeg/ */ -#include -#include +#include "global.h" +#include "RageSoundReader_MP3.h" #include "RageLog.h" - #include "SDL_utils.h" -#include "SDL_sound-1.0.0/decoders/mad-0.14.2b/msvc++/libmad/mad.h" // XXX +#include +#include + +#ifdef _WIN32 +#include "mad-0.15.0b/mad.h" +#ifdef _XBOX +// not set up +// #pragma comment(lib, "mad-0.15.0b/msvc++/Xbox_Release/libmad.lib") +#else +#pragma comment(lib, "mad-0.15.0b/msvc++/Release/libmad.lib") +#endif +#else +#include +#endif /* ID3 code from libid3: */ enum tagtype { @@ -20,10 +28,6 @@ enum tagtype { TAGTYPE_ID3V2_FOOTER }; -#ifdef _WIN32 - #pragma comment(lib, "mad-0.15.0b/msvc++/Release/libmad.lib") -#endif - typedef unsigned long id3_length_t; static const int ID3_TAG_FLAG_FOOTERPRESENT = 0x10;