add new files to src/Makefile, fix some warnings

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@208 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
halleyscometsw 2008-06-08 02:03:05 +00:00
parent 18f1eec50d
commit 42c6d9e1e2
5 changed files with 12 additions and 11 deletions

View File

@ -6,7 +6,8 @@ CODING_OBJS=coding/adx_decoder.o \
coding/ngc_dtk_decoder.o \
coding/pcm_decoder.o \
coding/psx_decoder.o \
coding/xa_decoder.o
coding/xa_decoder.o \
coding/eaxa_decoder.o
LAYOUT_OBJS=layout/ast_blocked.o \
layout/blocked.o \
@ -14,7 +15,9 @@ LAYOUT_OBJS=layout/ast_blocked.o \
layout/interleave.o \
layout/nolayout.o \
layout/xa_blocked.o \
layout/xbox_blocked.o
layout/xbox_blocked.o \
layout/caf_blocked.o \
layout/ea_block.o
META_OBJS=meta/adx_header.o \
meta/afc_header.o \
@ -46,7 +49,10 @@ META_OBJS=meta/adx_header.o \
meta/ps2_ild.o \
meta/ps2_pnb.o \
meta/xbox_wavm.o \
meta/xbox_xwav.o
meta/xbox_xwav.o \
meta/ea_header.o \
meta/ngc_caf.o \
meta/ps2_vpk.o
OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)

View File

@ -8,8 +8,6 @@ long EA_XA_TABLE[28] = {0,0,240,0,460,-208,0x0188,-220,
-208,-1,-220,-1,
0x0000,0x0000,0x0000,0x3F70};
static int samples;
void decode_eaxa(VGMSTREAMCHANNEL * stream, sample * outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do,int channel) {
uint8_t frame_info;
int32_t sample_count;

View File

@ -1,4 +1,5 @@
#include "meta.h"
#include "../layout/layout.h"
#include "../util.h"
// Platform constants
@ -28,8 +29,6 @@ typedef struct {
uint8_t compression_version;
} EA_STRUCT;
extern ea_block_update(off_t block_offset, VGMSTREAM * vgmstream);
uint32_t readPatch(STREAMFILE* streamFile, off_t* offset) {
uint32_t result=0;

View File

@ -1,8 +1,7 @@
#include "meta.h"
#include "../layout/layout.h"
#include "../util.h"
extern caf_block_update(off_t block_offset, VGMSTREAM * vgmstream);
VGMSTREAM * init_vgmstream_caf(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL;
char filename[260];
@ -73,4 +72,4 @@ VGMSTREAM * init_vgmstream_caf(STREAMFILE *streamFile) {
fail:
if (vgmstream) close_vgmstream(vgmstream);
return NULL;
}
}

View File

@ -426,7 +426,6 @@ VGMSTREAM * init_vgmstream_ngc_str(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL;
char filename[260];
struct dsp_header header;
const off_t start_offset = 0x60;
int i;