jules
8 years ago
1 changed files with 20 additions and 16 deletions
Unified View
Diff Options
+ 20
- 16
modules/juce_audio_devices/native/juce_ios_Audio.cpp
View File
| @@ -424,12 +424,14 @@ public: | |||||
| Boolean hostIsPlaying = NO; | Boolean hostIsPlaying = NO; | ||||
| OSStatus err = callbackInfo.transportStateProc2 (callbackInfo.hostUserData, | OSStatus err = callbackInfo.transportStateProc2 (callbackInfo.hostUserData, | ||||
| &hostIsPlaying, | &hostIsPlaying, | ||||
| NULL, | |||||
| NULL, | |||||
| NULL, | |||||
| NULL, | |||||
| NULL, | |||||
| NULL); | |||||
| nullptr, | |||||
| nullptr, | |||||
| nullptr, | |||||
| nullptr, | |||||
| nullptr, | |||||
| nullptr); | |||||
| ignoreUnused (err); | |||||
| jassert (err == noErr); | jassert (err == noErr); | ||||
| if (hostIsPlaying != shouldSartPlaying) | if (hostIsPlaying != shouldSartPlaying) | ||||
| @@ -446,13 +448,14 @@ public: | |||||
| Boolean hostIsRecording = NO; | Boolean hostIsRecording = NO; | ||||
| OSStatus err = callbackInfo.transportStateProc2 (callbackInfo.hostUserData, | OSStatus err = callbackInfo.transportStateProc2 (callbackInfo.hostUserData, | ||||
| NULL, | |||||
| nullptr, | |||||
| &hostIsRecording, | &hostIsRecording, | ||||
| NULL, | |||||
| NULL, | |||||
| NULL, | |||||
| NULL, | |||||
| NULL); | |||||
| nullptr, | |||||
| nullptr, | |||||
| nullptr, | |||||
| nullptr, | |||||
| nullptr); | |||||
| ignoreUnused (err); | |||||
| jassert (err == noErr); | jassert (err == noErr); | ||||
| if (hostIsRecording != shouldStartRecording) | if (hostIsRecording != shouldStartRecording) | ||||
| @@ -487,7 +490,7 @@ public: | |||||
| OSStatus err = callbackInfo.transportStateProc2 (callbackInfo.hostUserData, | OSStatus err = callbackInfo.transportStateProc2 (callbackInfo.hostUserData, | ||||
| &hostIsPlaying, | &hostIsPlaying, | ||||
| &hostIsRecording, | &hostIsRecording, | ||||
| NULL, | |||||
| nullptr, | |||||
| &hostCurrentSampleInTimeLine, | &hostCurrentSampleInTimeLine, | ||||
| &hostIsCycling, | &hostIsCycling, | ||||
| &hostCycleStartBeat, | &hostCycleStartBeat, | ||||
| @@ -520,7 +523,7 @@ public: | |||||
| UInt32 hostTimeSigDenominator = 0; | UInt32 hostTimeSigDenominator = 0; | ||||
| Float64 hostCurrentMeasureDownBeat = 0; | Float64 hostCurrentMeasureDownBeat = 0; | ||||
| err = callbackInfo.musicalTimeLocationProc (callbackInfo.hostUserData, | err = callbackInfo.musicalTimeLocationProc (callbackInfo.hostUserData, | ||||
| NULL, | |||||
| nullptr, | |||||
| &hostTimeSigNumerator, | &hostTimeSigNumerator, | ||||
| &hostTimeSigDenominator, | &hostTimeSigDenominator, | ||||
| &hostCurrentMeasureDownBeat); | &hostCurrentMeasureDownBeat); | ||||
| @@ -925,6 +928,7 @@ private: | |||||
| { | { | ||||
| OSStatus err = AudioUnitSetProperty (audioUnit, kAudioOutputUnitProperty_RemoteControlToHost, | OSStatus err = AudioUnitSetProperty (audioUnit, kAudioOutputUnitProperty_RemoteControlToHost, | ||||
| kAudioUnitScope_Global, 0, &event, sizeof (event)); | kAudioUnitScope_Global, 0, &event, sizeof (event)); | ||||
| ignoreUnused (err); | |||||
| jassert (err == noErr); | jassert (err == noErr); | ||||
| } | } | ||||
| @@ -965,12 +969,12 @@ private: | |||||
| 0, | 0, | ||||
| &desc, | &desc, | ||||
| &dataSize); | &dataSize); | ||||
| if (desc.mSampleRate != owner.getCurrentSampleRate()) | if (desc.mSampleRate != owner.getCurrentSampleRate()) | ||||
| { | { | ||||
| struct RouteChangeMessage : public CallbackMessage | struct RouteChangeMessage : public CallbackMessage | ||||
| { | { | ||||
| RouteChangeMessage (iOSAudioIODevice& dev) | |||||
| : device (dev) | |||||
| RouteChangeMessage (iOSAudioIODevice& dev) : device (dev) | |||||
| {} | {} | ||||
| void messageCallback() override | void messageCallback() override | ||||