allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

More Coreaudio SDK fixes, after 30b087ab3

Browse Source
This commit is contained in:
Robin Gareus
2017-09-19 05:20:05 +02:00
parent 29e553ab86
commit 666aa5a557
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/ardour/audio_unit.cc
View File

@@ -738,7 +738,7 @@ AUPlugin::discover_parameters ()
kAudioUnitParameterUnit_Boolean = 2
kAudioUnitParameterUnit_Percent = 3
kAudioUnitParameterUnit_Seconds = 4
kAudioUnitParameterUnit_SampleSamples = 5
kAudioUnitParameterUnit_SampleFrames = 5
kAudioUnitParameterUnit_Phase = 6
kAudioUnitParameterUnit_Rate = 7
kAudioUnitParameterUnit_Hertz = 8
@@ -787,7 +787,7 @@ AUPlugin::discover_parameters ()
d.integer_step = (info.unit == kAudioUnitParameterUnit_Indexed);
d.toggled = (info.unit == kAudioUnitParameterUnit_Boolean) ||
(d.integer_step && ((d.upper - d.lower) == 1.0));
d.sr_dependent = (info.unit == kAudioUnitParameterUnit_SampleSamples);
d.sr_dependent = (info.unit == kAudioUnitParameterUnit_SampleFrames);
d.automatable = /* !d.toggled && -- ardour can automate toggles, can AU ? */
!(info.flags & kAudioUnitParameterFlag_NonRealTime) &&
(info.flags & kAudioUnitParameterFlag_IsWritable);
@@ -1074,8 +1074,8 @@ AUPlugin::set_block_size (pframes_t nframes)
deactivate ();
}
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("set MaximumSamplesPerSlice in global scope to %1\n", numSamples));
if ((err = unit->SetProperty (kAudioUnitProperty_MaximumSamplesPerSlice, kAudioUnitScope_Global,
DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("set MaximumFramesPerSlice in global scope to %1\n", numSamples));
if ((err = unit->SetProperty (kAudioUnitProperty_MaximumFramesPerSlice, kAudioUnitScope_Global,
0, &numSamples, sizeof (numSamples))) != noErr) {
error << string_compose (_("AU: cannot set max samples (err = %1)"), err) << endmsg;
return -1;
@@ -1121,7 +1121,7 @@ AUPlugin::configure_io (ChanCount in, ChanCount out)
#endif
streamFormat.mBitsPerChannel = 32;
streamFormat.mSamplesPerPacket = 1;
streamFormat.mFramesPerPacket = 1;
/* apple says that for non-interleaved data, these
* values always refer to a single channel.

2
libs/ardour/caimportable.cc
View File

@@ -107,7 +107,7 @@ CAImportableSource::channels () const
samplecnt_t
CAImportableSource::length () const
{
return af.GetNumberSamples();
return af.GetNumberFrames();
}
samplecnt_t

4
libs/ardour/coreaudiosource.cc
View File

@@ -85,7 +85,7 @@ CoreAudioSource::init_cafile ()
throw failed_constructor();
}
_length = af.GetNumberSamples();
_length = af.GetNumberFrames();
CAStreamBasicDescription client_format (file_format);
@@ -282,7 +282,7 @@ CoreAudioSource::get_soundfile_info (string path, SoundFileInfo& _info, string&)
_info.channels = absd.mChannelsPerFrame;
size = sizeof(_info.length);
if (ExtAudioFileGetProperty(af, kExtAudioFileProperty_FileLengthSamples, &size, &_info.length) != noErr) {
if (ExtAudioFileGetProperty(af, kExtAudioFileProperty_FileLengthFrames, &size, &_info.length) != noErr) {
goto out;
}

2
libs/backends/coreaudio/coreaudio_pcmio.h
View File

@@ -126,7 +126,7 @@ public:
AudioUnitRenderActionFlags* ioActionFlags,
const AudioTimeStamp* inTimeStamp,
UInt32 inBusNumber,
UInt32 inNumberFrames,
UInt32 inNumberSamples,
AudioBufferList* ioData);
void xrun_callback ();