diff --git a/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj b/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj index 96e9a56..2f29138 100644 --- a/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj +++ b/examples/libnyquist-examples.vcxproj/libnyquist-examples.vcxproj @@ -81,7 +81,7 @@ true false true - true + false diff --git a/examples/src/Main.cpp b/examples/src/Main.cpp index 567a578..f7c9a4f 100644 --- a/examples/src/Main.cpp +++ b/examples/src/Main.cpp @@ -33,7 +33,7 @@ int main() //auto result = loader.Load(fileData, "test_data/1ch/44100/8/test.wav"); //auto result = loader.Load(fileData, "test_data/1ch/44100/16/test.wav"); //auto result = loader.Load(fileData, "test_data/1ch/44100/24/test.wav"); - auto result = loader.Load(fileData, "test_data/1ch/44100/32/test.wav"); + //auto result = loader.Load(fileData, "test_data/1ch/44100/32/test.wav"); //auto result = loader.Load(fileData, "test_data/1ch/44100/64/test.wav"); //auto result = loader.Load(fileData, "test_data/2ch/44100/8/test.wav"); @@ -51,7 +51,7 @@ int main() //auto result = loader.Load(fileData, "test_data/ad_hoc/BlockWoosh_Stereo.ogg"); //auto result = loader.Load(fileData, "test_data/ad_hoc/KittyPurr8_Stereo_Dithered.flac"); - //auto result = loader.Load(fileData, "test_data/ad_hoc/KittyPurr16_Stereo.flac"); + auto result = loader.Load(fileData, "test_data/ad_hoc/KittyPurr16_Stereo.flac"); //auto result = loader.Load(fileData, "test_data/ad_hoc/KittyPurr16_Mono.flac"); //auto result = loader.Load(fileData, "test_data/ad_hoc/KittyPurr24_Stereo.flac"); diff --git a/include/libnyquist/FlacDecoder.h b/include/libnyquist/FlacDecoder.h index 2ea2fba..392478f 100644 --- a/include/libnyquist/FlacDecoder.h +++ b/include/libnyquist/FlacDecoder.h @@ -26,6 +26,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef FLAC_DECODER_H #define FLAC_DECODER_H +// http://lists.xiph.org/pipermail/flac-dev/2012-March/003276.html +#define FLAC__NO_DLL + #include "AudioDecoder.h" #include diff --git a/libnyquist.vcxproj/libnyquist.vcxproj b/libnyquist.vcxproj/libnyquist.vcxproj index 0571693..1d2bd59 100644 --- a/libnyquist.vcxproj/libnyquist.vcxproj +++ b/libnyquist.vcxproj/libnyquist.vcxproj @@ -19,7 +19,7 @@ - + diff --git a/libnyquist.vcxproj/libnyquist.vcxproj.filters b/libnyquist.vcxproj/libnyquist.vcxproj.filters index f8e001d..c1df4ee 100644 --- a/libnyquist.vcxproj/libnyquist.vcxproj.filters +++ b/libnyquist.vcxproj/libnyquist.vcxproj.filters @@ -46,9 +46,6 @@ src\deps - - src\deps - src @@ -82,6 +79,9 @@ src + + src\deps + diff --git a/src/FlacDecoder.cpp b/src/FlacDecoder.cpp index f2b6ea6..f626154 100644 --- a/src/FlacDecoder.cpp +++ b/src/FlacDecoder.cpp @@ -25,6 +25,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "FlacDecoder.h" #include "flac/all.h" +#include "flac/stream_decoder.h" + #include "AudioDecoder.h" using namespace nqr; diff --git a/src/FlacDependencies.c b/src/FlacDependencies.c index 16d9b01..772075a 100644 --- a/src/FlacDependencies.c +++ b/src/FlacDependencies.c @@ -27,7 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define VERSION "1.3.1" #define FLAC__NO_DLL 1 - +#define FLAC__USE_VISIBILITY_ATTR 1 + #if (_MSC_VER) #pragma warning (push) #pragma warning (disable: 181 111 4267 4996 4244 4701 4702 4133 4100 4127 4206 4312 4505 4365 4005 4013 4334)