fix flac export symbol issue

adpcm
Dimitri Diakopoulos 11 years ago
parent b7298ebcb5
commit b386bbf4d5

@ -81,7 +81,7 @@
<ReferenceOutputAssembly>true</ReferenceOutputAssembly> <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies> <LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs> <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

@ -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/8/test.wav");
//auto result = loader.Load(fileData, "test_data/1ch/44100/16/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/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/1ch/44100/64/test.wav");
//auto result = loader.Load(fileData, "test_data/2ch/44100/8/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/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/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/KittyPurr16_Mono.flac");
//auto result = loader.Load(fileData, "test_data/ad_hoc/KittyPurr24_Stereo.flac"); //auto result = loader.Load(fileData, "test_data/ad_hoc/KittyPurr24_Stereo.flac");

@ -26,6 +26,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef FLAC_DECODER_H #ifndef FLAC_DECODER_H
#define 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 "AudioDecoder.h"
#include <map> #include <map>

@ -19,7 +19,7 @@
<ClCompile Include="$(ProjectDir)..\src\AudioDevice.cpp" /> <ClCompile Include="$(ProjectDir)..\src\AudioDevice.cpp" />
<ClCompile Include="$(ProjectDir)..\src\WavPackDecoder.cpp" /> <ClCompile Include="$(ProjectDir)..\src\WavPackDecoder.cpp" />
<ClCompile Include="$(ProjectDir)..\src\CafDecoder.cpp" /> <ClCompile Include="$(ProjectDir)..\src\CafDecoder.cpp" />
<ClCompile Include="$(ProjectDir)..\src\FlacDependencies.c" /> <ClCompile Include="..\src\FlacDependencies.c" />
<ClCompile Include="$(ProjectDir)..\src\OpusDependencies.c" /> <ClCompile Include="$(ProjectDir)..\src\OpusDependencies.c" />
<ClCompile Include="$(ProjectDir)..\src\VorbisDecoder.cpp" /> <ClCompile Include="$(ProjectDir)..\src\VorbisDecoder.cpp" />
<ClCompile Include="$(ProjectDir)..\src\VorbisDependencies.c" /> <ClCompile Include="$(ProjectDir)..\src\VorbisDependencies.c" />

@ -46,9 +46,6 @@
<ClCompile Include="$(ProjectDir)..\src\OpusDependencies.c"> <ClCompile Include="$(ProjectDir)..\src\OpusDependencies.c">
<Filter>src\deps</Filter> <Filter>src\deps</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(ProjectDir)..\src\FlacDependencies.c">
<Filter>src\deps</Filter>
</ClCompile>
<ClCompile Include="$(ProjectDir)..\src\AudioDecoder.cpp"> <ClCompile Include="$(ProjectDir)..\src\AudioDecoder.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
@ -82,6 +79,9 @@
<ClCompile Include="$(ProjectDir)..\src\RiffUtils.cpp"> <ClCompile Include="$(ProjectDir)..\src\RiffUtils.cpp">
<Filter>src</Filter> <Filter>src</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\FlacDependencies.c">
<Filter>src\deps</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(ProjectDir)..\include\libnyquist\OpusDecoder.h"> <ClInclude Include="$(ProjectDir)..\include\libnyquist\OpusDecoder.h">

@ -25,6 +25,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "FlacDecoder.h" #include "FlacDecoder.h"
#include "flac/all.h" #include "flac/all.h"
#include "flac/stream_decoder.h"
#include "AudioDecoder.h" #include "AudioDecoder.h"
using namespace nqr; using namespace nqr;

@ -27,7 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define VERSION "1.3.1" #define VERSION "1.3.1"
#define FLAC__NO_DLL 1 #define FLAC__NO_DLL 1
#define FLAC__USE_VISIBILITY_ATTR 1
#if (_MSC_VER) #if (_MSC_VER)
#pragma warning (push) #pragma warning (push)
#pragma warning (disable: 181 111 4267 4996 4244 4701 4702 4133 4100 4127 4206 4312 4505 4365 4005 4013 4334) #pragma warning (disable: 181 111 4267 4996 4244 4701 4702 4133 4100 4127 4206 4312 4505 4365 4005 4013 4334)

Loading…
Cancel
Save