Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-17 19:19:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix a few build issues and clean up warnings

Browse Source 
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@790 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
halleyscometsw 2010-05-03 15:52:29 +00:00
parent ca70e4de1e
commit f3135b8bc7
13 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fb2k/in_vgmstream.cpp
View File

@ -257,6 +257,7 @@ bool input_vgmstream::g_is_our_path(const char * p_path,const char * p_extension
if(!stricmp_utf8(p_extension,"aax")) return 1;
if(!stricmp_utf8(p_extension,"acm")) return 1;
if(!stricmp_utf8(p_extension,"adpcm")) return 1;
if(!stricmp_utf8(p_extension,"adm")) return 1;
if(!stricmp_utf8(p_extension,"adp")) return 1;
if(!stricmp_utf8(p_extension,"ads")) return 1;
if(!stricmp_utf8(p_extension,"adx")) return 1;
@ -529,6 +530,7 @@ DECLARE_MULTIPLE_FILE_TYPE("AAX Audio File (*.AAX)", aax);
DECLARE_MULTIPLE_FILE_TYPE("ACM Audio File (*.ACM)", acm);
DECLARE_MULTIPLE_FILE_TYPE("ADPCM Audio File (*.ADPCM)", adpcm);
DECLARE_MULTIPLE_FILE_TYPE("ADM Audio File (*.ADM)", adm);
DECLARE_MULTIPLE_FILE_TYPE("ADP Audio File (*.ADP)", adp);
DECLARE_MULTIPLE_FILE_TYPE("PS2 ADS Audio File (*.ADS)", ads);
DECLARE_MULTIPLE_FILE_TYPE("ADX Audio File (*.ADX)", adx);

5
src/Makefile
View File

@ -240,9 +240,10 @@ META_OBJS=meta/adx_header.o \
meta/ps2_voi.o \
meta/dsp_sth_str.o \
meta/ps2_b1s.o \
meta/ps2_wad.o
meta/ps2_wad.o \
meta/ps2_voi.o \
meta/ps2_lpcm.o
meta/ps2_lpcm.o \
meta/ps2_adm.o
OBJECTS=vgmstream.o streamfile.o util.o $(CODING_OBJS) $(LAYOUT_OBJS) $(META_OBJS)

1
src/meta/Makefile.unix.am
View File

@ -196,5 +196,6 @@ libmeta_la_SOURCES += dsp_sth_str.c
libmeta_la_SOURCES += ps2_b1s.c
libmeta_la_SOURCES += ps2_wad.c
libmeta_la_SOURCES += ps2_lpcm.c
libmeta_la_SOURCES += ps2_adm.c
EXTRA_DIST = meta.h

2
src/meta/idsp.c
View File

@ -264,4 +264,4 @@ VGMSTREAM * init_vgmstream_idsp4(STREAMFILE *streamFile) {
fail:
if (vgmstream) close_vgmstream(vgmstream);
return NULL;
}
}

3
src/meta/musc.c
View File

@ -5,7 +5,6 @@
VGMSTREAM * init_vgmstream_musc(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL;
char filename[260];
int musc_version;
int loop_flag;
int channel_count;
off_t start_offset;
@ -71,4 +70,4 @@ VGMSTREAM * init_vgmstream_musc(STREAMFILE *streamFile) {
fail:
if (vgmstream) close_vgmstream(vgmstream);
return NULL;
}
}

2
src/meta/musx.c
View File

@ -459,4 +459,4 @@ fail:
if (vgmstream) close_vgmstream(vgmstream);
return NULL;
}
/* <--------------------------------------- MUSX (Version 201) */
/* <--------------------------------------- MUSX (Version 201) */

2
src/meta/ngc_bo2.c
View File

@ -97,4 +97,4 @@ VGMSTREAM * init_vgmstream_ngc_bo2(STREAMFILE *streamFile) {
fail:
if (vgmstream) close_vgmstream(vgmstream);
return NULL;
}
}

3
src/meta/ngc_dsp_konami.c
View File

@ -8,9 +8,8 @@ VGMSTREAM * init_vgmstream_ngc_dsp_konami(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL;
char filename[260];
int loop_flag = 0;
int channel_count;
int channel_count;
int i, j;
off_t start_offset;
off_t ch1_start;
off_t ch2_start;
off_t coef_table[2] = {0x90, 0xD0};

2
src/meta/ngc_dsp_mpds.c
View File

@ -7,7 +7,7 @@ VGMSTREAM * init_vgmstream_ngc_dsp_mpds(STREAMFILE *streamFile) {
char filename[260];
int loop_flag = 0;
int channel_count;
int ch1_start, ch2_start;
int ch1_start=-1, ch2_start=-1;
/* check extension, case insensitive */
streamFile->get_name(streamFile,filename,sizeof(filename));

2
src/meta/ngc_dsp_std.c
View File

@ -2226,4 +2226,4 @@ fail:
/* clean up anything we may have opened */
if (vgmstream) close_vgmstream(vgmstream);
return NULL;
}
}

2
src/meta/ngc_pdt.c
View File

@ -8,7 +8,7 @@ VGMSTREAM * init_vgmstream_ngc_pdt(STREAMFILE *streamFile) {
int loop_flag;
int channel_count;
off_t start_offset;
int second_channel_start;
int second_channel_start = -1;
/* check extension, case insensitive */
streamFile->get_name(streamFile,filename,sizeof(filename));

1
src/meta/ps2_adm.c
View File

@ -1,4 +1,5 @@
#include "meta.h"
#include "../layout/layout.h"
#include "../util.h"
/* WAD (from The golden Compass) */

1
unix/data.c
View File

@ -19,6 +19,7 @@ gchar *vgmstream_exts [] = {
"aax",
"acm",
"adm",
"adp",
"adpcm",
"ads",