ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: 

- Fix AudioUnit crash when building against the OS X 10.11 SDK.
This commit is contained in:
rogerman 2015-09-18 19:33:56 +00:00
parent 2336008f73
commit 574e6a2640
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/cocoa/DeSmuME (Latest).xcodeproj/project.pbxproj
View File

@ -2395,7 +2395,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = "DeSmuME Team";
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DeSmuME (Latest)" */;

16
desmume/src/cocoa/coreaudiosound.cpp
View File

@ -21,6 +21,7 @@
#include "cocoa_globals.h"
#include "utilities.h"
#define FORCE_AUDIOCOMPONENT_10_5
CoreAudioInput::CoreAudioInput()
{
@ -59,7 +60,7 @@ CoreAudioInput::CoreAudioInput()
_auOutputNode = 0;
memset(&_timeStamp, 0, sizeof(AudioTimeStamp));
#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
#if !defined(FORCE_AUDIOCOMPONENT_10_5) && defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
AudioComponentDescription halInputDeviceDesc;
AudioComponentDescription formatConverterDesc;
AudioComponentDescription outputDesc;
@ -90,9 +91,8 @@ CoreAudioInput::CoreAudioInput()
error = NewAUGraph(&_auGraph);
error = AUGraphOpen(_auGraph);
error = AUGraphAddNode(_auGraph, &formatConverterDesc, &_auFormatConverterNode);
error = AUGraphAddNode(_auGraph, &outputDesc, &_auOutputNode);
error = AUGraphAddNode(_auGraph, (AudioComponentDescription *)&formatConverterDesc, &_auFormatConverterNode);
error = AUGraphAddNode(_auGraph, (AudioComponentDescription *)&outputDesc, &_auOutputNode);
error = AUGraphConnectNodeInput(_auGraph, _auFormatConverterNode, 0, _auOutputNode, 0);
error = AUGraphNodeInfo(_auGraph, _auFormatConverterNode, NULL, &_auFormatConverterUnit);
@ -860,7 +860,7 @@ CoreAudioOutput::CoreAudioOutput(size_t bufferSamples, size_t sampleSize)
_volume = 1.0f;
// Create a new audio unit
#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
#if !defined(FORCE_AUDIOCOMPONENT_10_5) && defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
if (IsOSXVersionSupported(10, 6, 0))
{
AudioComponentDescription audioDesc;
@ -1054,7 +1054,7 @@ OSStatus CoreAudioOutputRenderCallback(void *inRefCon,
bool CreateAudioUnitInstance(AudioUnit *au, ComponentDescription *auDescription)
{
bool result = false;
if (au == NULL || auDescription == NULL || IsOSXVersionSupported(10, 6, 0))
if (au == NULL || auDescription == NULL)
{
return result;
}
@ -1075,7 +1075,7 @@ bool CreateAudioUnitInstance(AudioUnit *au, ComponentDescription *auDescription)
return result;
}
#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
#if !defined(FORCE_AUDIOCOMPONENT_10_5) && defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
bool CreateAudioUnitInstance(AudioUnit *au, AudioComponentDescription *auDescription)
{
bool result = false;
@ -1110,7 +1110,7 @@ void DestroyAudioUnitInstance(AudioUnit *au)
AudioOutputUnitStop(*au);
AudioUnitUninitialize(*au);
#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
#if !defined(FORCE_AUDIOCOMPONENT_10_5) && defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
if (IsOSXVersionSupported(10, 6, 0))
{
AudioComponentInstanceDispose(*au);