From ab20c9e696cfbcf636064032adf1712a6be491e8 Mon Sep 17 00:00:00 2001 From: David Reid Date: Wed, 28 Jul 2021 20:59:29 +1000 Subject: [PATCH] Fix a bug introduced with a recent commit. --- miniaudio.h | 1 + research/miniaudio_engine.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/miniaudio.h b/miniaudio.h index 14cf99c5..3e9336d1 100644 --- a/miniaudio.h +++ b/miniaudio.h @@ -58945,6 +58945,7 @@ static ma_result ma_resource_manager_data_buffer_node_acquire(ma_resource_manage if (result == MA_ALREADY_EXISTS) { nodeAlreadyExists = MA_TRUE; + result = MA_SUCCESS; } else { if (result != MA_SUCCESS) { return result; diff --git a/research/miniaudio_engine.c b/research/miniaudio_engine.c index d1236621..487853f9 100644 --- a/research/miniaudio_engine.c +++ b/research/miniaudio_engine.c @@ -52,7 +52,8 @@ int main(int argc, char** argv) //resourceManagerConfig.decodedChannels = 2; resourceManagerConfig.decodedSampleRate = 48000; //resourceManagerConfig.flags |= MA_RESOURCE_MANAGER_FLAG_NO_THREADING; - resourceManagerConfig.jobThreadCount = 1; + resourceManagerConfig.jobThreadCount = 16; + resourceManagerConfig.jobQueueCapacity = 8; result = ma_resource_manager_init(&resourceManagerConfig, &resourceManager); if (result != MA_SUCCESS) { printf("Failed to initialize resource manager.\n"); @@ -79,7 +80,7 @@ int main(int argc, char** argv) loadNotification.cb.onSignal = on_sound_loaded; loadNotification.pSound = &sound; - result = ma_sound_init_from_file(&engine, argv[1], MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_DECODE | MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_ASYNC | MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_STREAM, &group, NULL, &sound); + result = ma_sound_init_from_file(&engine, argv[1], MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_DECODE | MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_ASYNC /*| MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_STREAM*/, &group, NULL, &sound); if (result != MA_SUCCESS) { printf("Failed to load sound: %s\n", argv[1]); ma_engine_uninit(&engine);