From cc2944e4f0cd97b218fb10c11068db15e926a5a2 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sat, 30 Dec 2017 19:15:34 -0800 Subject: [PATCH] Update project files, and update foobar2000 component. --- ext_libs/ext_libs.vcxproj | 17 ++------- fb2k/foo_input_vgmstream.vcxproj | 59 ++++++-------------------------- fb2k/foo_prefs.cpp | 9 ++--- fb2k/foo_prefs.h | 4 +-- fb2k/foo_streamfile.cpp | 5 +-- fb2k/foo_vgmstream.cpp | 28 ++++++++++++--- fb2k/foo_vgmstream.h | 7 +++- src/libvgmstream.vcxproj | 41 ++++------------------ src/libvgmstream.vcxproj.filters | 3 ++ 9 files changed, 56 insertions(+), 117 deletions(-) diff --git a/ext_libs/ext_libs.vcxproj b/ext_libs/ext_libs.vcxproj index 555012bd..840997f2 100644 --- a/ext_libs/ext_libs.vcxproj +++ b/ext_libs/ext_libs.vcxproj @@ -5,10 +5,6 @@ Debug Win32 - - Release2015 - Win32 - Release Win32 @@ -29,15 +25,11 @@ Utility - v100 - - - Utility - v100 + v141_xp Utility - v100 + v141_xp @@ -45,9 +37,6 @@ - - - @@ -57,9 +46,7 @@ $(SolutionDir)$(Configuration)\ $(Configuration)\ $(SolutionDir) - $(SolutionDir) $(Configuration)\ - $(Configuration)\ diff --git a/fb2k/foo_input_vgmstream.vcxproj b/fb2k/foo_input_vgmstream.vcxproj index 36cc6780..e9a75a97 100644 --- a/fb2k/foo_input_vgmstream.vcxproj +++ b/fb2k/foo_input_vgmstream.vcxproj @@ -5,10 +5,6 @@ Debug Win32 - - Release2015 - Win32 - Release Win32 @@ -30,25 +26,19 @@ - 8.1 + 7.0 DynamicLibrary Unicode true - v100 - - - DynamicLibrary - Unicode - true - v100 + v141_xp DynamicLibrary Unicode - v100 + v141_xp v100 @@ -59,9 +49,6 @@ - - - @@ -72,11 +59,8 @@ AllRules.ruleset - AllRules.ruleset - - AllRules.ruleset @@ -88,11 +72,13 @@ WIN32;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_MP4V2;VGM_USE_FDKAAC;VGM_USE_MAIATRAC3PLUS;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Level3 EditAndContinue + NoExtensions + /d2notypeopt %(AdditionalOptions) ../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/at3plusdecoder.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;%(AdditionalDependencies) @@ -109,41 +95,16 @@ - ../ext_includes;..\..\foobar\foobar2000\SDK;..\..\foobar\foobar2000\helpers;..\..\foobar\foobar2000\ATLHelpers;..\..\foobar\foobar2000\shared;../../qaac/mp4v2/include;../../fdk-aac/libSYS/include;../../fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) + ../ext_includes;..\..\foobar\foobar2000\SDK;..\..\foobar\foobar2000\shared;..\..\foobar\foobar2000;../../qaac/mp4v2/include;../../fdk-aac/libSYS/include;../../fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) _WIN32_WINNT=0x501;WIN32;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_MP4V2;VGM_USE_FDKAAC;VGM_USE_MAIATRAC3PLUS;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - ProgramDatabase - Fast - - - ../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/at3plusdecoder.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;%(AdditionalDependencies) - %(AdditionalLibraryDirectories) - %(IgnoreSpecificDefaultLibraries) - %(DelayLoadDLLs) - true - true - true - - - "$(ProjectDir)..\version.bat" "$(ProjectDir)..\version.h" VERSION - - - Generating version.h - - - - - ../ext_includes;..\..\foobar\foobar2000\SDK;..\..\foobar\foobar2000\helpers;..\..\foobar\foobar2000\ATLHelpers;..\..\foobar\foobar2000\shared;../../qaac/mp4v2/include;../../fdk-aac/libSYS/include;../../fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) - _WIN32_WINNT=0x501;WIN32;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_MP4V2;VGM_USE_FDKAAC;VGM_USE_MAIATRAC3PLUS;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL Level3 ProgramDatabase Fast + NoExtensions + /d2notypeopt ../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg7221_decode.lib;../ext_libs/libg719_decode.lib;../ext_libs/at3plusdecoder.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;%(AdditionalDependencies) diff --git a/fb2k/foo_prefs.cpp b/fb2k/foo_prefs.cpp index 5cb81cd3..d0cc0c31 100755 --- a/fb2k/foo_prefs.cpp +++ b/fb2k/foo_prefs.cpp @@ -1,14 +1,10 @@ #ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #endif -#include -#include -#include #include #include #include -#include #include #include "foo_prefs.h" extern "C" { @@ -46,14 +42,13 @@ void input_vgmstream::load_settings() const char * vgmstream_prefs::get_name() { - return "vgmstream"; + return input_vgmstream::g_get_name(); } GUID vgmstream_prefs::get_guid() { - static const GUID guid = { 0x2b5d0302, 0x165b, 0x409c, { 0x94, 0x74, 0x2c, 0x8c, 0x2c, 0xd7, 0x6a, 0x25 } };; - return guid; + return input_vgmstream::g_get_preferences_guid(); } diff --git a/fb2k/foo_prefs.h b/fb2k/foo_prefs.h index c44c5a0e..c5cc6589 100755 --- a/fb2k/foo_prefs.h +++ b/fb2k/foo_prefs.h @@ -4,9 +4,9 @@ #define _FOO_PREFS_H #include -#include #include -#include +#include +#include #include "resource.h" #define DEFAULT_FADE_SECONDS "10.00" diff --git a/fb2k/foo_streamfile.cpp b/fb2k/foo_streamfile.cpp index 04b9535a..6440d6c2 100644 --- a/fb2k/foo_streamfile.cpp +++ b/fb2k/foo_streamfile.cpp @@ -2,14 +2,11 @@ #define _CRT_SECURE_NO_DEPRECATE #endif -#include -#include -#include #include #include #include -#include +#include #include extern "C" { diff --git a/fb2k/foo_vgmstream.cpp b/fb2k/foo_vgmstream.cpp index 78ab802c..c2a08f1a 100644 --- a/fb2k/foo_vgmstream.cpp +++ b/fb2k/foo_vgmstream.cpp @@ -5,14 +5,11 @@ #ifdef _MSC_VER #define _CRT_SECURE_NO_DEPRECATE #endif -#include -#include -#include #include #include #include -#include +#include #include extern "C" { @@ -361,7 +358,7 @@ void input_vgmstream::get_subsong_info(t_uint32 p_subsong, pfc::string_base & ti *length_in_ms = -1000; if (infostream) { *length_in_ms = get_vgmstream_play_samples(loop_count,fade_seconds,fade_delay_seconds,infostream)*1000LL/infostream->sample_rate; - infostream->loop_target = 0; + infostream->loop_target = 0; *sample_rate = infostream->sample_rate; *channels = infostream->channels; *total_samples = infostream->num_samples; @@ -419,6 +416,27 @@ bool input_vgmstream::get_description_tag(pfc::string_base & temp, pfc::string_b return false; } +GUID input_vgmstream::g_get_guid() +{ + static const GUID guid = { 0x9e7263c7, 0x4cdd, 0x482c,{ 0x9a, 0xec, 0x5e, 0x71, 0x28, 0xcb, 0xc3, 0x4 } }; + return guid; +} + +const char * input_vgmstream::g_get_name() +{ + return "vgmstream"; +} + +GUID input_vgmstream::g_get_preferences_guid() +{ + static const GUID guid = { 0x2b5d0302, 0x165b, 0x409c,{ 0x94, 0x74, 0x2c, 0x8c, 0x2c, 0xd7, 0x6a, 0x25 } };; + return guid; +} + +bool input_vgmstream::g_is_low_merit() +{ + return true; +} /* foobar plugin defs */ static input_factory_t g_input_vgmstream_factory; diff --git a/fb2k/foo_vgmstream.h b/fb2k/foo_vgmstream.h index cf0904ea..d9fc10a0 100644 --- a/fb2k/foo_vgmstream.h +++ b/fb2k/foo_vgmstream.h @@ -3,7 +3,7 @@ #define OUTBUF_SIZE 1024 /* Samples */ -class input_vgmstream { +class input_vgmstream : public input_stubs { public: input_vgmstream(); ~input_vgmstream(); @@ -29,6 +29,11 @@ class input_vgmstream { static bool g_is_our_content_type(const char * p_content_type); static bool g_is_our_path(const char * p_path,const char * p_extension); + static GUID g_get_guid(); + static const char * g_get_name(); + static GUID g_get_preferences_guid(); + static bool g_is_low_merit(); + private: //service_ptr_t m_file; pfc::string8 filename; diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index eb18f501..e5c82af9 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -5,10 +5,6 @@ Debug Win32 - - Release2015 - Win32 - Release Win32 @@ -32,16 +28,11 @@ StaticLibrary true - v100 - - - StaticLibrary - true - v100 + v141_xp StaticLibrary - v100 + v141_xp @@ -49,9 +40,6 @@ - - - @@ -62,11 +50,8 @@ AllRules.ruleset - AllRules.ruleset - - @@ -75,35 +60,24 @@ WIN32;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_G719;VGM_USE_MP4V2;VGM_USE_FDKAAC;VGM_USE_MAIATRAC3PLUS;USE_ALLOCA;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug - Precise + MultiThreadedDebugDLL Level3 EditAndContinue + NoExtensions ../ext_includes;../../qaac/mp4v2/include;../../fdk-aac/libSYS/include;../../fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) _WIN32_WINNT=0x501;WIN32;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_G719;VGM_USE_MP4V2;VGM_USE_FDKAAC;VGM_USE_MAIATRAC3PLUS;USE_ALLOCA;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - ProgramDatabase - Fast - - - - - ../ext_includes;../../qaac/mp4v2/include;../../fdk-aac/libSYS/include;../../fdk-aac/libAACdec/include;%(AdditionalIncludeDirectories) - _WIN32_WINNT=0x501;WIN32;VGM_USE_FFMPEG;VGM_USE_G7221;VGM_USE_G719;VGM_USE_MP4V2;VGM_USE_FDKAAC;VGM_USE_MAIATRAC3PLUS;USE_ALLOCA;NDEBUG;_LIB;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL Level3 ProgramDatabase + NoExtensions Fast @@ -158,6 +132,7 @@ + @@ -259,9 +234,7 @@ $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.xdc diff --git a/src/libvgmstream.vcxproj.filters b/src/libvgmstream.vcxproj.filters index 16c1576f..4f515e85 100644 --- a/src/libvgmstream.vcxproj.filters +++ b/src/libvgmstream.vcxproj.filters @@ -1246,5 +1246,8 @@ meta\Source Files + + meta\Source Files + \ No newline at end of file