|
@@ -53,7 +53,7 @@
|
|
|
static const AudioObjectPropertyAddress devlist_address = {
|
|
|
kAudioHardwarePropertyDevices,
|
|
|
kAudioObjectPropertyScopeGlobal,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
|
|
|
typedef void (*addDevFn)(const char *name, SDL_AudioSpec *spec, const int iscapture, AudioDeviceID devId, void *data);
|
|
@@ -131,17 +131,17 @@ build_device_list(int iscapture, addDevFn addfn, void *addfndata)
|
|
|
const AudioObjectPropertyAddress addr = {
|
|
|
kAudioDevicePropertyStreamConfiguration,
|
|
|
iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
const AudioObjectPropertyAddress nameaddr = {
|
|
|
kAudioObjectPropertyName,
|
|
|
iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
const AudioObjectPropertyAddress freqaddr = {
|
|
|
kAudioDevicePropertyNominalSampleRate,
|
|
|
iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
|
|
|
result = AudioObjectGetPropertyDataSize(dev, &addr, 0, NULL, &size);
|
|
@@ -642,7 +642,7 @@ static const AudioObjectPropertyAddress alive_address =
|
|
|
{
|
|
|
kAudioDevicePropertyDeviceIsAlive,
|
|
|
kAudioObjectPropertyScopeGlobal,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
|
|
|
static OSStatus
|
|
@@ -764,7 +764,7 @@ prepare_device(_THIS)
|
|
|
AudioObjectPropertyAddress addr = {
|
|
|
0,
|
|
|
kAudioObjectPropertyScopeGlobal,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
|
|
|
if (handle == NULL) {
|
|
@@ -811,7 +811,7 @@ assign_device_to_audioqueue(_THIS)
|
|
|
const AudioObjectPropertyAddress prop = {
|
|
|
kAudioDevicePropertyDeviceUID,
|
|
|
this->iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
|
|
|
OSStatus result;
|
|
@@ -960,7 +960,7 @@ audioqueue_thread(void *arg)
|
|
|
const AudioObjectPropertyAddress default_device_address = {
|
|
|
this->iscapture ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice,
|
|
|
kAudioObjectPropertyScopeGlobal,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
|
|
|
if (this->handle == NULL) { /* opened the default device? Register to know if the user picks a new default. */
|
|
@@ -1185,24 +1185,24 @@ COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
|
|
|
: kAudioHardwarePropertyDefaultOutputDevice,
|
|
|
iscapture ? kAudioDevicePropertyScopeInput
|
|
|
: kAudioDevicePropertyScopeOutput,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
AudioObjectPropertyAddress nameaddr = {
|
|
|
kAudioObjectPropertyName,
|
|
|
iscapture ? kAudioDevicePropertyScopeInput
|
|
|
: kAudioDevicePropertyScopeOutput,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
AudioObjectPropertyAddress freqaddr = {
|
|
|
kAudioDevicePropertyNominalSampleRate,
|
|
|
iscapture ? kAudioDevicePropertyScopeInput
|
|
|
: kAudioDevicePropertyScopeOutput,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
AudioObjectPropertyAddress bufaddr = {
|
|
|
kAudioDevicePropertyStreamConfiguration,
|
|
|
iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
|
|
|
- kAudioObjectPropertyElementMaster
|
|
|
+ kAudioObjectPropertyElementMain
|
|
|
};
|
|
|
|
|
|
/* Get the Device ID */
|