ryujinx/libsoundio
1
0
Fork 0
mirror of https://github.com/Ryujinx/libsoundio.git synced 2024-12-22 21:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

CoreAudio: fix build

Browse source
This commit is contained in:
Andrew Kelley 2015-08-08 14:49:03 -07:00
parent 7238d29666
commit 34ba7e7564
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/coreaudio.cpp
View file

@ -645,10 +645,10 @@ static int refresh_devices(struct SoundIoPrivate *si) {
// If you try to open an input stream with anything but the current // If you try to open an input stream with anything but the current
// nominal sample rate, AudioUnitRender returns an error. // nominal sample rate, AudioUnitRender returns an error.
if (aim == SoundIoDeviceAimInput) { if (aim == SoundIoDeviceAimInput) {
device->sample_rate_count = 1; rd.device->sample_rate_count = 1;
device->sample_rates = &dev->prealloc_sample_rate_range; rd.device->sample_rates = &dev->prealloc_sample_rate_range;
device->sample_rates[0].min = rd.device->sample_rate_current; rd.device->sample_rates[0].min = rd.device->sample_rate_current;
device->sample_rates[0].max = rd.device->sample_rate_current; rd.device->sample_rates[0].max = rd.device->sample_rate_current;
} else { } else {
prop_address.mSelector = kAudioDevicePropertyAvailableNominalSampleRates; prop_address.mSelector = kAudioDevicePropertyAvailableNominalSampleRates;
prop_address.mScope = aim_to_scope(aim); prop_address.mScope = aim_to_scope(aim);
@ -675,14 +675,14 @@ static int refresh_devices(struct SoundIoPrivate *si) {
} }
if (avr_array_len == 1) { if (avr_array_len == 1) {
device->sample_rate_count = 1; rd.device->sample_rate_count = 1;
device->sample_rates = &dev->prealloc_sample_rate_range; rd.device->sample_rates = &dev->prealloc_sample_rate_range;
device->sample_rates[0].min = ceil(avr->mMinimum); rd.device->sample_rates[0].min = ceil(rd.avr_array[0].mMinimum);
device->sample_rates[0].max = floor(avr->mMaximum); rd.device->sample_rates[0].max = floor(rd.avr_array[0].mMaximum);
} else { } else {
device->sample_rate_count = avr_array_len; rd.device->sample_rate_count = avr_array_len;
device->sample_rates = allocate<SoundIoSampleRateRange>(avr_array_len); rd.device->sample_rates = allocate<SoundIoSampleRateRange>(avr_array_len);
if (!device->sample_rates) { if (!rd.device->sample_rates) {
deinit_refresh_devices(&rd); deinit_refresh_devices(&rd);
return SoundIoErrorNoMem; return SoundIoErrorNoMem;
} }
@ -690,8 +690,8 @@ static int refresh_devices(struct SoundIoPrivate *si) {
AudioValueRange *avr = &rd.avr_array[i]; AudioValueRange *avr = &rd.avr_array[i];
int min_val = ceil(avr->mMinimum); int min_val = ceil(avr->mMinimum);
int max_val = floor(avr->mMaximum); int max_val = floor(avr->mMaximum);
device->sample_rates[i].min = min_val; rd.device->sample_rates[i].min = min_val;
device->sample_rates[i].max = max_val; rd.device->sample_rates[i].max = max_val;
} }
} }
} }
@ -707,8 +707,7 @@ static int refresh_devices(struct SoundIoPrivate *si) {
deinit_refresh_devices(&rd); deinit_refresh_devices(&rd);
return SoundIoErrorOpeningDevice; return SoundIoErrorOpeningDevice;
} }
double use_sample_rate = clamp(rd.device->sample_rate_min, rd.device->sample_rate_current, double use_sample_rate = rd.device->sample_rate_current;
rd.device->sample_rate_max);
rd.device->buffer_duration_current = buffer_frame_size / use_sample_rate; rd.device->buffer_duration_current = buffer_frame_size / use_sample_rate;
prop_address.mSelector = kAudioDevicePropertyBufferFrameSizeRange; prop_address.mSelector = kAudioDevicePropertyBufferFrameSizeRange;