Skip to content

Commit dfd8063

Browse files
gaborszantogaborszanto
committed
Updated I/O classes for modern iOS and macOS
1 parent 7591e0a commit dfd8063

File tree

2 files changed

+38
-24
lines changed

2 files changed

+38
-24
lines changed

‎Superpowered/OpenSource/SuperpoweredIOSAudioIO.mm‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,21 @@ - (id)initWithDelegate:(NSObject<SuperpoweredIOSAudioIODelegate> *)d preferredBu
9999
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onRouteChange:) name:AVAudioSessionRouteChangeNotification object:[AVAudioSession sharedInstance]];
100100

101101
#if (USES_AUDIO_INPUT == 1)
102+
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000
103+
if ((recordOnly || [category isEqualToString:AVAudioSessionCategoryPlayAndRecord]) && ([AVAudioApplication sharedInstance].recordPermission != AVAudioApplicationRecordPermissionGranted)) {
104+
[AVAudioApplication requestRecordPermissionWithCompletionHandler:^(BOOL granted) {
105+
if (granted) [self onMediaServerReset:nil];
106+
else if ([(NSObject *)self->delegate respondsToSelector:@selector(recordPermissionRefused)]) [self->delegate recordPermissionRefused];
107+
}];
108+
};
109+
#else
102110
if ((recordOnly || [category isEqualToString:AVAudioSessionCategoryPlayAndRecord]) && [[AVAudioSession sharedInstance] respondsToSelector:@selector(recordPermission)] && [[AVAudioSession sharedInstance] respondsToSelector:@selector(requestRecordPermission:)] && ([[AVAudioSession sharedInstance] recordPermission] != AVAudioSessionRecordPermissionGranted)) {
103111
[[AVAudioSession sharedInstance] requestRecordPermission:^(BOOL granted) {
104112
if (granted) [self onMediaServerReset:nil];
105113
else if ([(NSObject *)self->delegate respondsToSelector:@selector(recordPermissionRefused)]) [self->delegate recordPermissionRefused];
106114
}];
107115
};
116+
#endif
108117
#endif
109118
};
110119
return self;
@@ -191,15 +200,8 @@ - (void)onAudioSessionInterrupted:(NSNotification *)notification {
191200
NSNumber *interruption = [notification.userInfo objectForKey:AVAudioSessionInterruptionTypeKey];
192201
if (interruption != nil) switch ([interruption intValue]) {
193202
case AVAudioSessionInterruptionTypeBegan: {
194-
bool wasSuspended = false;
195-
#pragma clang diagnostic push
196-
#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
197-
if (&AVAudioSessionInterruptionWasSuspendedKey != NULL) {
198-
#pragma clang diagnostic pop
199-
NSNumber *obj = [notification.userInfo objectForKey:AVAudioSessionInterruptionWasSuspendedKey];
200-
if ((obj != nil) && ([obj boolValue] == TRUE)) wasSuspended = true;
201-
}
202-
if (!wasSuspended) {
203+
NSNumber *obj = [notification.userInfo objectForKey:AVAudioSessionInterruptionReasonKey];
204+
if (!obj || ([obj boolValue] != TRUE)) { // was not suspended
203205
if (audioUnitRunning) [self performSelectorOnMainThread:@selector(startDelegateInterruption) withObject:nil waitUntilDone:NO];
204206
[self beginInterruption];
205207
}
@@ -541,7 +543,17 @@ - (void)reconfigureWithAudioSessionCategory:(NSString *)category {
541543
bool recordOnly = [category isEqualToString:AVAudioSessionCategoryRecord];
542544
inputEnabled = recordOnly || [category isEqualToString:AVAudioSessionCategoryPlayAndRecord];
543545
if (inputEnabled && !inputBuffer) [self createInputBuffer];
544-
546+
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 170000
547+
if (inputEnabled) {
548+
if ([[AVAudioApplication sharedInstance] recordPermission] == AVAudioApplicationRecordPermissionGranted) [self onMediaServerReset:nil];
549+
else {
550+
[AVAudioApplication requestRecordPermissionWithCompletionHandler:^(BOOL granted) {
551+
if (granted) [self onMediaServerReset:nil];
552+
else if ([(NSObject *)self->delegate respondsToSelector:@selector(recordPermissionRefused)]) [self->delegate recordPermissionRefused];
553+
}];
554+
};
555+
} else [self onMediaServerReset:nil];
556+
#else
545557
if (inputEnabled && [[AVAudioSession sharedInstance] respondsToSelector:@selector(recordPermission)] && [[AVAudioSession sharedInstance] respondsToSelector:@selector(requestRecordPermission:)]) {
546558
if ([[AVAudioSession sharedInstance] recordPermission] == AVAudioSessionRecordPermissionGranted) [self onMediaServerReset:nil];
547559
else {
@@ -551,6 +563,8 @@ - (void)reconfigureWithAudioSessionCategory:(NSString *)category {
551563
}];
552564
};
553565
} else [self onMediaServerReset:nil];
566+
#endif
567+
554568
#else
555569
[self onMediaServerReset:nil];
556570
#endif

‎Superpowered/OpenSource/SuperpoweredOSXAudioIO.mm‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ - (id)initWithDelegate:(id<SuperpoweredOSXAudioIODelegate>)del preferredBufferSi
126126
inputBuffers0->mNumberBuffers = inputBuffers1->mNumberBuffers = 1;
127127

128128
CFRunLoopRef runLoop = NULL;
129-
AudioObjectPropertyAddress rladdress = { kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
129+
AudioObjectPropertyAddress rladdress = { kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
130130
AudioObjectSetPropertyData(kAudioObjectSystemObject, &rladdress, 0, NULL, sizeof(CFRunLoopRef), &runLoop);
131-
AudioObjectPropertyAddress ddaddress = { enableInput && !enableOutput ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
131+
AudioObjectPropertyAddress ddaddress = { enableInput && !enableOutput ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
132132
AudioObjectAddPropertyListener(kAudioObjectSystemObject, &ddaddress, defaultDeviceChangedCallback, (__bridge void *)self);
133-
AudioObjectPropertyAddress hdaddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
133+
AudioObjectPropertyAddress hdaddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
134134
AudioObjectAddPropertyListener(kAudioObjectSystemObject, &hdaddress, devicesChangedCallback, (__bridge void *)self);
135135

136136
[self createAudioUnits];
@@ -152,11 +152,11 @@ static void destroyUnit(AudioComponentInstance *unit) {
152152
}
153153

154154
- (void)dealloc {
155-
AudioObjectPropertyAddress ddaddress = { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
155+
AudioObjectPropertyAddress ddaddress = { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
156156
AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &ddaddress, defaultDeviceChangedCallback, (__bridge void *)self);
157157
ddaddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
158158
AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &ddaddress, defaultDeviceChangedCallback, (__bridge void *)self);
159-
AudioObjectPropertyAddress hdaddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
159+
AudioObjectPropertyAddress hdaddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
160160
AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &hdaddress, devicesChangedCallback, (__bridge void *)self);
161161

162162
destroyUnit(&inputUnit);
@@ -186,7 +186,7 @@ static void streamFormatChangedCallback(void *inRefCon, AudioUnit inUnit, __attr
186186
static AudioDeviceID getDefaultAudioDevice(bool input) {
187187
AudioDeviceID deviceID = 0;
188188
UInt32 size = sizeof(AudioDeviceID);
189-
AudioObjectPropertyAddress address = { input ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
189+
AudioObjectPropertyAddress address = { input ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
190190
return (AudioObjectGetPropertyData(kAudioObjectSystemObject, &address, 0, NULL, &size, &deviceID) == noErr) ? deviceID : UINT_MAX;
191191
}
192192

@@ -216,7 +216,7 @@ static void setBufferSize(int samplerate, int preferredBufferSizeMs, AudioDevice
216216
if (samplerate < 1) return;
217217
UInt32 frames = powf(2.0f, floorf(log2f(float(samplerate) * 0.001f * float(preferredBufferSizeMs))));
218218
if (frames > 4096) frames = 4096;
219-
AudioObjectPropertyAddress address = { kAudioDevicePropertyBufferFrameSize, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
219+
AudioObjectPropertyAddress address = { kAudioDevicePropertyBufferFrameSize, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
220220
if (deviceID != UINT_MAX) AudioObjectSetPropertyData(deviceID, &address, 0, NULL, sizeof(UInt32), &frames);
221221
}
222222

@@ -265,9 +265,9 @@ - (void)createAudioUnits {
265265
[mapOutputDeviceName release];
266266
#endif
267267
mapInputDeviceName = mapOutputDeviceName = nil;
268-
AudioObjectPropertyAddress deviceNameAddress = { kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
269-
AudioObjectPropertyAddress inputChannelsAddress = { kAudioDevicePropertyStreamConfiguration, kAudioDevicePropertyScopeInput, kAudioObjectPropertyElementMaster };
270-
AudioObjectPropertyAddress outputChannelsAddress = { kAudioDevicePropertyStreamConfiguration, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
268+
AudioObjectPropertyAddress deviceNameAddress = { kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
269+
AudioObjectPropertyAddress inputChannelsAddress = { kAudioDevicePropertyStreamConfiguration, kAudioDevicePropertyScopeInput, kAudioObjectPropertyElementMain };
270+
AudioObjectPropertyAddress outputChannelsAddress = { kAudioDevicePropertyStreamConfiguration, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMain };
271271
mapNumInputChannels = mapNumOutputChannels = 0;
272272

273273
if (outputEnabled) {
@@ -402,10 +402,10 @@ - (void)setPreferredBufferSizeMs:(int)ms {
402402
}
403403

404404
+ (audioDevice *)getAudioDevices {
405-
AudioObjectPropertyAddress allDevices = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
406-
AudioObjectPropertyAddress deviceName = { kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
407-
AudioObjectPropertyAddress inputChannels = { kAudioDevicePropertyStreamConfiguration, kAudioDevicePropertyScopeInput, kAudioObjectPropertyElementMaster };
408-
AudioObjectPropertyAddress outputChannels = { kAudioDevicePropertyStreamConfiguration, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
405+
AudioObjectPropertyAddress allDevices = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
406+
AudioObjectPropertyAddress deviceName = { kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
407+
AudioObjectPropertyAddress inputChannels = { kAudioDevicePropertyStreamConfiguration, kAudioDevicePropertyScopeInput, kAudioObjectPropertyElementMain };
408+
AudioObjectPropertyAddress outputChannels = { kAudioDevicePropertyStreamConfiguration, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMain };
409409

410410
UInt32 size = 0;
411411
if (AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &allDevices, 0, NULL, &size) || !size) return NULL;

0 commit comments

Comments
 (0)