Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TinyAudio fixes for OSX etc.

Browse Source
This commit is contained in:
Erwin Coumans
2017-04-27 12:07:31 -07:00
parent 1c168c102b
commit e6759cfa4f
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ExampleBrowser/premake4.lua
View File

@@ -53,7 +53,7 @@ project "App_BulletExampleBrowser"
if os.is("MacOSX") then if os.is("MacOSX") then
links{"Cocoa.framework"} links{"Cocoa.framework"}
links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"} links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"}
defines {"__OS_MACOSX__"} defines {"__OS_MACOSX__","__MACOSX_CORE__"}
end end
end end

3
examples/TinyAudio/b3ReadWavFile.cpp
View File

@@ -16,6 +16,7 @@ const unsigned long B3_FLOAT64 = 0x20;
b3ReadWavFile::b3ReadWavFile() b3ReadWavFile::b3ReadWavFile()
{ {
fd_ = 0;
m_machineIsLittleEndian = b3MachineIsLittleEndian(); m_machineIsLittleEndian = b3MachineIsLittleEndian();
} }
b3ReadWavFile::~b3ReadWavFile() b3ReadWavFile::~b3ReadWavFile()
@@ -488,4 +489,4 @@ bool b3ReadWavFile::read(unsigned long startFrame, bool doNormalize)
// error: // error:
// oStream_ << "FileRead: Error reading file data."; // oStream_ << "FileRead: Error reading file data.";
// handleError( StkError::FILE_ERROR); // handleError( StkError::FILE_ERROR);
} }

2
examples/TinyAudio/b3ReadWavFile.h
View File

@@ -23,7 +23,7 @@ class b3ReadWavFile
unsigned long m_numFrames; unsigned long m_numFrames;
unsigned long dataType_; unsigned long dataType_;
double fileDataRate_; double fileDataRate_;
FILE *fd_ = 0; FILE *fd_;
unsigned long dataOffset_; unsigned long dataOffset_;
unsigned int channels_; unsigned int channels_;
bool m_machineIsLittleEndian; bool m_machineIsLittleEndian;

2
examples/TinyAudio/premake4.lua
View File

@@ -36,6 +36,6 @@ if os.is("MacOSX") then
links{"Cocoa.framework"} links{"Cocoa.framework"}
links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"} links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"}
defines {"__OS_MACOSX__"} defines {"__OS_MACOSX__", "__MACOSX_CORE__"}
end end