From d77f56bacea82f35ca8d30e35dbd74fa2c86369a Mon Sep 17 00:00:00 2001 From: hogliux Date: Wed, 6 Jun 2018 12:11:52 +0100 Subject: [PATCH] Android Oboe: Updated oboe code to match latest Oboe repo version --- modules/juce_audio_devices/native/juce_android_Oboe.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/juce_audio_devices/native/juce_android_Oboe.cpp b/modules/juce_audio_devices/native/juce_android_Oboe.cpp index 09f3530eb8..301bf2483c 100644 --- a/modules/juce_audio_devices/native/juce_android_Oboe.cpp +++ b/modules/juce_audio_devices/native/juce_android_Oboe.cpp @@ -676,7 +676,6 @@ private: ignoreUnused (deviceId, numChannels, sampleRate, bufferSize); ignoreUnused (streamFormat, bitDepth); - jassert (deviceId = nativeStream->getDeviceId()); jassert (numChannels = nativeStream->getChannelCount()); jassert (sampleRate == nativeStream->getSampleRate()); jassert (format == nativeStream->getFormat()); @@ -797,13 +796,13 @@ private: auto result = inputStream->getNativeStream()->read (inputStreamNativeBuffer.getData(), numFrames, 0); - if (result >= 0) + if (result) { OboeAudioIODeviceBufferHelpers::referAudioBufferDirectlyToOboeIfPossible (inputStreamNativeBuffer.get(), inputStreamSampleBuffer, - result); + result.value()); - OboeAudioIODeviceBufferHelpers::convertFromOboe (inputStreamNativeBuffer.get(), inputStreamSampleBuffer, result); + OboeAudioIODeviceBufferHelpers::convertFromOboe (inputStreamNativeBuffer.get(), inputStreamSampleBuffer, result.value()); } else {