More Coreaudio SDK fixes, after 30b087ab3

diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index 74b2591df92c7da071d8f13ae356093390b9303d..0cea4dd09984804c161f88fbe39716f2c3856685 100644 (file)
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -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.

diff --git a/libs/ardour/caimportable.cc b/libs/ardour/caimportable.cc
index 13721f8334172d3c0e1d2bd4e7552579e8f36bb2..008e78954c8566fe79989b096b34ff38afd47b5f 100644 (file)
--- a/libs/ardour/caimportable.cc
+++ b/libs/ardour/caimportable.cc
@@ -107,7 +107,7 @@ CAImportableSource::channels () const
 samplecnt_t
 CAImportableSource::length () const
 {
-       return af.GetNumberSamples();
+       return af.GetNumberFrames();
 }
 
 samplecnt_t

diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc
index 954437173821cb6ef84b74a36d3992bdab3e27bb..48040952db05520198a126250f18826ea4daf26d 100644 (file)
--- a/libs/ardour/coreaudiosource.cc
+++ b/libs/ardour/coreaudiosource.cc
@@ -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;
        }
 

diff --git a/libs/backends/coreaudio/coreaudio_pcmio.h b/libs/backends/coreaudio/coreaudio_pcmio.h
index 5f9778e8456127b0a1da30da2a8770f3b4ca86ae..e6d82571f48d9ab2176fc5b460c0b8a6828826c7 100644 (file)
--- a/libs/backends/coreaudio/coreaudio_pcmio.h
+++ b/libs/backends/coreaudio/coreaudio_pcmio.h
@@ -126,7 +126,7 @@ public:
                        AudioUnitRenderActionFlags* ioActionFlags,
                        const AudioTimeStamp* inTimeStamp,
                        UInt32 inBusNumber,
-                       UInt32 inNumberFrames,
+                       UInt32 inNumberSamples,
                        AudioBufferList* ioData);
 
        void xrun_callback ();