ryujinx/libsoundio
1
0
Fork 0
mirror of https://github.com/Ryujinx/libsoundio.git synced 2025-01-03 20:35:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

CoreAudio: obtain sample rate information for devices

Browse source
This commit is contained in:
Andrew Kelley 2015-08-03 14:29:57 -07:00
parent c52e76928f
commit b0f983bd84
1 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/coreaudio.cpp
View file

@ -97,6 +97,10 @@ static int aim_to_scope(SoundIoDeviceAim aim) {
return (aim == SoundIoDeviceAimInput) ? return (aim == SoundIoDeviceAimInput) ?
kAudioObjectPropertyScopeInput : kAudioObjectPropertyScopeOutput; kAudioObjectPropertyScopeInput : kAudioObjectPropertyScopeOutput;
} }
// TODO subscribe to device property changes for every property we read and
// trigger a rescan if anything changes. test with changing the preferredchannellayout
// for the device
// TODO // TODO
/* /*
* *
@ -123,13 +127,6 @@ static int aim_to_scope(SoundIoDeviceAim aim) {
If both the device and the stream say they have latency, then the total If both the device and the stream say they have latency, then the total
latency for the stream is the device latency summed with the stream latency. latency for the stream is the device latency summed with the stream latency.
*/ */
/*
@constant kAudioDevicePropertyNominalSampleRate
A Float64 that indicates the current nominal sample rate of the AudioDevice.
@constant kAudioDevicePropertyAvailableNominalSampleRates
An array of AudioValueRange structs that indicates the valid ranges for the
nominal sample rate of the AudioDevice.
*/
/* /*
@constant kAudioDevicePropertyIcon @constant kAudioDevicePropertyIcon
A CFURLRef that indicates an image file that can be used to represent the A CFURLRef that indicates an image file that can be used to represent the
@ -239,6 +236,7 @@ static int from_coreaudio_layout(const AudioChannelLayout *ca_layout, SoundIoCha
case kAudioChannelLayoutTag_Stereo: case kAudioChannelLayoutTag_Stereo:
case kAudioChannelLayoutTag_StereoHeadphones: case kAudioChannelLayoutTag_StereoHeadphones:
case kAudioChannelLayoutTag_MatrixStereo: case kAudioChannelLayoutTag_MatrixStereo:
case kAudioChannelLayoutTag_Binaural:
layout->channel_count = 2; layout->channel_count = 2;
layout->channels[0] = SoundIoChannelIdFrontLeft; layout->channels[0] = SoundIoChannelIdFrontLeft;
layout->channels[1] = SoundIoChannelIdFrontRight; layout->channels[1] = SoundIoChannelIdFrontRight;
@ -248,11 +246,6 @@ static int from_coreaudio_layout(const AudioChannelLayout *ca_layout, SoundIoCha
layout->channels[0] = SoundIoChannelIdXyX; layout->channels[0] = SoundIoChannelIdXyX;
layout->channels[1] = SoundIoChannelIdXyY; layout->channels[1] = SoundIoChannelIdXyY;
break; break;
case kAudioChannelLayoutTag_Binaural:
layout->channel_count = 2;
layout->channels[0] = SoundIoChannelIdFrontLeft;
layout->channels[1] = SoundIoChannelIdFrontRight;
break;
case kAudioChannelLayoutTag_MidSide: case kAudioChannelLayoutTag_MidSide:
layout->channel_count = 2; layout->channel_count = 2;
layout->channels[0] = SoundIoChannelIdMsMid; layout->channels[0] = SoundIoChannelIdMsMid;
@ -351,7 +344,6 @@ static void deinit_refresh_devices(RefreshDevices *rd) {
} }
// TODO get the device UID which persists between unplug/plug // TODO get the device UID which persists between unplug/plug
// TODO go through here and make sure all allocations are freed
static int refresh_devices(struct SoundIoPrivate *si) { static int refresh_devices(struct SoundIoPrivate *si) {
SoundIo *soundio = &si->pub; SoundIo *soundio = &si->pub;
SoundIoCoreAudio *sica = &si->backend_data.coreaudio; SoundIoCoreAudio *sica = &si->backend_data.coreaudio;
@ -536,6 +528,32 @@ static int refresh_devices(struct SoundIoPrivate *si) {
// in CoreAudio, format is always 32-bit native endian float // in CoreAudio, format is always 32-bit native endian float
rd.device->formats[0] = SoundIoFormatFloat32NE; rd.device->formats[0] = SoundIoFormatFloat32NE;
prop_address.mSelector = kAudioDevicePropertyNominalSampleRate;
prop_address.mScope = aim_to_scope(aim);
prop_address.mElement = kAudioObjectPropertyElementMaster;
io_size = sizeof(double);
if ((os_err = AudioObjectGetPropertyData(deviceID, &prop_address, 0, nullptr,
&io_size, &rd.device->sample_rate_current)))
{
deinit_refresh_devices(&rd);
return SoundIoErrorOpeningDevice;
}
prop_address.mSelector = kAudioDevicePropertyAvailableNominalSampleRates;
prop_address.mScope = aim_to_scope(aim);
prop_address.mElement = kAudioObjectPropertyElementMaster;
io_size = sizeof(AudioValueRange);
AudioValueRange avr;
if ((os_err = AudioObjectGetPropertyData(deviceID, &prop_address, 0, nullptr,
&io_size, &avr)))
{
deinit_refresh_devices(&rd);
return SoundIoErrorOpeningDevice;
}
rd.device->sample_rate_min = avr.mMinimum;
rd.device->sample_rate_max = avr.mMaximum;
SoundIoList<SoundIoDevice *> *device_list; SoundIoList<SoundIoDevice *> *device_list;
if (rd.device->aim == SoundIoDeviceAimOutput) { if (rd.device->aim == SoundIoDeviceAimOutput) {
device_list = &rd.devices_info->output_devices; device_list = &rd.devices_info->output_devices;