kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Undid damage to vgmstream.h on merging new changes

CQTexperiment
Chris Moeller 2014-04-23 22:13:33 -07:00
parent 3e9f3f531e
commit 3e51816813
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Frameworks/vgmstream/vgmstream/src/vgmstream.h
View File

@ -16,14 +16,23 @@ enum { PATH_LIMIT = 32768 };
#define VGM_USE_MPEG
/* disabled by default, defined for builds that support it */
//#define VGM_USE_G7221
//#define VGM_USE_MP4V2
//#define VGM_USE_FDKAAC
#include "streamfile.h"
#ifdef BUILD_VGMSTREAM
#include "coding/g72x_state.h"
#else
#include "g72x_state.h"
#endif
#ifdef VGM_USE_VORBIS
#ifdef __APPLE__
#define __MACOSX__
#endif
#include <vorbis/vorbisfile.h>
#endif
#ifdef VGM_USE_MPEG
#include <mpg123.h>
#include <mpg123/mpg123.h>
#endif
#ifdef VGM_USE_G7221
#include "g7221.h"
@ -42,8 +51,13 @@ enum { PATH_LIMIT = 32768 };
#include <maiatrac3plus.h>
#endif
#ifdef BUILD_VGMSTREAM
#include "coding/acm_decoder.h"
#include "coding/nwa_decoder.h"
#else
#include "acm_decoder.h"
#include "nwa_decoder.h"
#endif
/* The encoding type specifies the format the sound data itself takes */
typedef enum {