Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-24 06:50:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

kode54's r918-1 fixes for foobar2000, add ps2_wmus.c to audacious makefile

Browse Source 
git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@921 51a99a44-fe44-0410-b1ba-c3e57ba2b86b
This commit is contained in:
halleyscometsw 2011-02-13 03:58:50 +00:00
parent 2f579ffe7e
commit ef1aa13b3d
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fb2k/foo_input_vgmstream.vcproj
View File

@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../ext_includes"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;"
PreprocessorDefinitions="WIN32;VGM_USE_G7221;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -120,7 +120,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../ext_includes"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS"
PreprocessorDefinitions="WIN32;VGM_USE_G7221;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"

11
fb2k/in_vgmstream.cpp
View File

@ -57,6 +57,15 @@ void input_vgmstream::open(service_ptr_t<file> p_filehint,const char * p_path,t_
currentreason = p_reason;
if(p_path) strcpy(filename, p_path);
/* KLUDGE */
if ( !pfc::stricmp_ascii( pfc::string_extension( p_path ), "MUS" ) )
{
unsigned char buffer[ 4 ];
if ( p_filehint.is_empty() ) input_open_file_helper( p_filehint, p_path, p_reason, p_abort );
p_filehint->read_object_t( buffer, p_abort );
if ( !memcmp( buffer, "MUS\x1A", 4 ) ) throw exception_io_unsupported_format();
}
switch(p_reason) {
case input_open_decode:
vgmstream = init_vgmstream_foo(p_path, p_abort);
@ -187,7 +196,7 @@ void input_vgmstream::decode_seek(double p_seconds,abort_callback & p_abort) {
int max_buffer_samples = sizeof(sample_buffer)/sizeof(sample_buffer[0])/vgmstream->channels;
// adjust for correct position within loop
if(vgmstream->loop_flag) {
if(vgmstream->loop_flag && seek_pos_samples >= vgmstream->loop_end_sample) {
seek_pos_samples -= vgmstream->loop_start_sample;
seek_pos_samples %= (vgmstream->loop_end_sample - vgmstream->loop_start_sample);
seek_pos_samples += vgmstream->loop_start_sample;

2
fb2k/version.h
View File

@ -1 +1 @@
#define VERSION "r911"
#define VERSION "r921"

4
src/libvgmstream.vcproj
View File

@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../ext_includes"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
PreprocessorDefinitions="WIN32;VGM_USE_G7221;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -103,7 +103,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../ext_includes"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
PreprocessorDefinitions="WIN32;VGM_USE_G7221;NDEBUG;_LIB;"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"

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

@ -221,5 +221,6 @@ libmeta_la_SOURCES += ps2_strlr.c
libmeta_la_SOURCES += lsf.c
libmeta_la_SOURCES += ps3_vawx.c
libmeta_la_SOURCES += pc_snds.c
libmeta_la_SOURCES += ps2_wmus.c
EXTRA_DIST = meta.h