fixes for 64 bit OS X build (c/o david robillard); tested on Lion & Tiger
git-svn-id: svn://localhost/ardour2/branches/3.0@11585 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
@@ -728,7 +728,7 @@ EngineControl::enumerate_coreaudio_devices ()
|
||||
// (code snippet gently "borrowed" from St?hane Letz jackdmp;)
|
||||
OSStatus err;
|
||||
Boolean isWritable;
|
||||
size_t outSize = sizeof(isWritable);
|
||||
UInt32 outSize = sizeof(isWritable);
|
||||
|
||||
backend_devs.clear ();
|
||||
|
||||
@@ -744,7 +744,7 @@ EngineControl::enumerate_coreaudio_devices ()
|
||||
if (err == noErr) {
|
||||
// Look for the CoreAudio device name...
|
||||
char coreDeviceName[256];
|
||||
size_t nameSize;
|
||||
UInt32 nameSize;
|
||||
|
||||
for (int i = 0; i < numCoreDevices; i++) {
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ CAComponent::~CAComponent ()
|
||||
OSStatus CAComponent::GetResourceVersion (UInt32 &outVersion) const
|
||||
{
|
||||
bool versionFound = false;
|
||||
short componentResFileID = kResFileNotOpened;
|
||||
ResFileRefNum componentResFileID = kResFileNotOpened;
|
||||
OSStatus result;
|
||||
short thngResourceCount;
|
||||
|
||||
@@ -247,7 +247,7 @@ void _ShowCF (FILE* file, CFStringRef str)
|
||||
|
||||
void CAComponent::Print(FILE* file) const
|
||||
{
|
||||
fprintf (file, "CAComponent: 0x%X", int(Comp()));
|
||||
fprintf (file, "CAComponent: %p", (void*)Comp());
|
||||
if (mManuName) {
|
||||
fprintf (file, ", Manu:"); _ShowCF (file, mManuName);
|
||||
if (mAUName) fprintf (file, ", Name:"); _ShowCF (file, mAUName);
|
||||
|
||||
@@ -224,7 +224,7 @@ CoreAudioSource::get_soundfile_info (string path, SoundFileInfo& _info, string&)
|
||||
{
|
||||
FSRef ref;
|
||||
ExtAudioFileRef af = 0;
|
||||
size_t size;
|
||||
UInt32 size;
|
||||
CFStringRef name;
|
||||
int ret = -1;
|
||||
|
||||
|
||||
@@ -175,7 +175,7 @@ setup_hardware_optimization (bool try_optimization)
|
||||
}
|
||||
|
||||
#elif defined (__APPLE__) && defined (BUILD_VECLIB_OPTIMIZATIONS)
|
||||
long sysVersion = 0;
|
||||
SInt32 sysVersion = 0;
|
||||
|
||||
if (noErr != Gestalt(gestaltSystemVersion, &sysVersion))
|
||||
sysVersion = 0;
|
||||
|
||||
Reference in New Issue
Block a user