diff options
Diffstat (limited to 'src/Support.cpp')
| -rw-r--r-- | src/Support.cpp | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/src/Support.cpp b/src/Support.cpp index 083de12..b88d3b1 100644 --- a/src/Support.cpp +++ b/src/Support.cpp @@ -6,7 +6,8 @@ #include <fcntl.h> #include <unistd.h> -#include "SDL/SDL.h" +#include <SDL/SDL.h> +#include <vorbis/vorbisfile.h> #include "Support.h" #include "Files.h" @@ -243,33 +244,6 @@ void Files::EndLoad() sFile = -1; } -#ifdef NOOGG -/* - Our own special magic version that fixes the filename. - */ -void alutLoadWAVFile_CFH(char *filename, ALenum *format, void **wave, - unsigned int *size, ALsizei *freq) -{ - char filename1[MAX_PATH]; - ALsizei format1, size1, bits1, freq1; - - fix_filename(filename, filename1); - - alutLoadWAV(filename1, wave, &format1, &size1, &bits1, &freq1); - - *format = format1; - *size = size1; - *freq = freq1; -} - -void alutUnloadWAV_CFH(ALenum format, void *wave, unsigned int size, - ALsizei freq) -{ - free(wave); -} -#else -#include <vorbis/vorbisfile.h> - /* Read the requested OGG file into memory, and extract the information required by OpenAL @@ -383,4 +357,3 @@ void FreeOGG(ALenum format, void *wave, unsigned int size, { free(wave); } -#endif |