Update CXXCoreAudio and CXXAudioToolbox (#667)

Author: sbooth

Package.resolved

@@ -20,8 +20,8 @@ let package = Package(
 	],
 	dependencies: [
 		.package(url: "https://github.com/sbooth/AVFAudioExtensions", from: "0.4.2"),
-		.package(url: "https://github.com/sbooth/CXXCoreAudio", from: "0.2.0"),
-		.package(url: "https://github.com/sbooth/CXXAudioToolbox", from: "0.1.2"),
+		.package(url: "https://github.com/sbooth/CXXCoreAudio", from: "0.3.0"),
+		.package(url: "https://github.com/sbooth/CXXAudioToolbox", from: "0.2.0"),
 		.package(url: "https://github.com/sbooth/CXXRingBuffer", from: "0.3.0"),
 		.package(url: "https://github.com/sbooth/CXXSharedMutex", from: "0.1.0"),
 		.package(url: "https://github.com/sbooth/CXXUnfairLock", from: "0.1.0"),

Package.swift

@@ -977,28 +977,28 @@ bool PerformSeekIfRequired() noexcept
 
 	// If there are audio frames available to read from the ring buffer read as many as possible
 	if(const auto availableFrames = audioRingBuffer_.AvailableFrames(); availableFrames > 0) {
-		const auto framesToRead = std::min(availableFrames, frameCount);
-		const uint32_t framesRead = audioRingBuffer_.Read(outputData, framesToRead);
+		const auto framesToRead = std::min(availableFrames, static_cast<CXXCoreAudio::AudioRingBuffer::size_type>(frameCount));
+		const auto framesRead = audioRingBuffer_.Read(outputData, framesToRead);
 		if(framesRead != framesToRead)
-			os_log_fault(log_, "CXXCoreAudio::AudioRingBuffer::Read failed: Requested %u frames, got %u", framesToRead, framesRead);
+			os_log_fault(log_, "CXXCoreAudio::AudioRingBuffer::Read failed: Requested %zu frames, got %zu", framesToRead, framesRead);
 
 		// If the ring buffer didn't contain as many frames as requested fill the remainder with silence
 		if(framesRead != frameCount) {
 #if DEBUG
-			os_log_debug(log_, "Insufficient audio in ring buffer: %u frames available, %u requested", framesRead, frameCount);
+			os_log_debug(log_, "Insufficient audio in ring buffer: %zu frames available, %u requested", framesRead, frameCount);
 #endif /* DEBUG */
 
 			const auto framesOfSilence = frameCount - framesRead;
-			const auto byteCountToSkip = audioRingBuffer_.Format().FrameCountToByteSize(framesRead);
-			const auto byteCountToZero = audioRingBuffer_.Format().FrameCountToByteSize(framesOfSilence);
+			const auto byteCountToSkip = framesRead * audioRingBuffer_.Format().mBytesPerFrame;
+			const auto byteCountToZero = framesOfSilence * audioRingBuffer_.Format().mBytesPerFrame;
 			for(UInt32 i = 0; i < outputData->mNumberBuffers; ++i) {
 				std::memset(static_cast<uint8_t *>(outputData->mBuffers[i].mData) + byteCountToSkip, 0, byteCountToZero);
 				outputData->mBuffers[i].mDataByteSize += byteCountToZero;
 			}
 		}
 
 		const RenderingEventHeader header{RenderingEventCommand::framesRendered};
-		if(!renderEventRingBuffer_.WriteValues(header, timestamp, framesRead))
+		if(!renderEventRingBuffer_.WriteValues(header, timestamp, static_cast<uint32_t>(framesRead)))
 			os_log_fault(log_, "Error writing frames rendered event");
 	} else {
 		// Output silence if the ring buffer is empty