From 518a2558850e1e425d64e0adba2c41517123618f Mon Sep 17 00:00:00 2001 From: Charlie <66182434+asbott@users.noreply.github.com> Date: Mon, 15 Jul 2024 21:53:00 +0200 Subject: [PATCH] Fix sync woopsie --- oogabooga/audio.c | 14 ++++++++------ oogabooga/os_impl_windows.c | 2 -- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/oogabooga/audio.c b/oogabooga/audio.c index ddc1555..44b1404 100644 --- a/oogabooga/audio.c +++ b/oogabooga/audio.c @@ -544,9 +544,7 @@ audio_open_source_stream_format(Audio_Source *src, string path, Audio_Format for src->allocator = allocator; src->kind = AUDIO_SOURCE_FILE_STREAM; - mutex_acquire_or_wait(&audio_init_mutex); src->format = format; - mutex_release(&audio_init_mutex); File file = os_file_open(path, O_READ); if (file == OS_INVALID_FILE) return false; @@ -586,7 +584,10 @@ audio_open_source_stream_format(Audio_Source *src, string path, Audio_Format for } bool audio_open_source_stream(Audio_Source *src, string path, Allocator allocator) { - return audio_open_source_stream_format(src, path, audio_output_format, allocator); + mutex_acquire_or_wait(&audio_init_mutex); + Audio_Format format = audio_output_format; + mutex_release(&audio_init_mutex); + return audio_open_source_stream_format(src, path, format, allocator); } bool audio_open_source_load_format(Audio_Source *src, string path, Audio_Format format, @@ -597,9 +598,7 @@ audio_open_source_load_format(Audio_Source *src, string path, Audio_Format forma src->allocator = allocator; src->kind = AUDIO_SOURCE_MEMORY; - mutex_acquire_or_wait(&audio_init_mutex); src->format = format; - mutex_release(&audio_init_mutex); File file = os_file_open(path, O_READ); if (file == OS_INVALID_FILE) return false; @@ -659,7 +658,10 @@ audio_open_source_load_format(Audio_Source *src, string path, Audio_Format forma } bool audio_open_source_load(Audio_Source *src, string path, Allocator allocator) { - return audio_open_source_load_format(src, path, audio_output_format, allocator); + mutex_acquire_or_wait(&audio_init_mutex); + Audio_Format format = audio_output_format; + mutex_release(&audio_init_mutex); + return audio_open_source_load_format(src, path, format, allocator); } void diff --git a/oogabooga/os_impl_windows.c b/oogabooga/os_impl_windows.c index 920da82..8714b4e 100644 --- a/oogabooga/os_impl_windows.c +++ b/oogabooga/os_impl_windows.c @@ -1137,8 +1137,6 @@ Mutex audio_init_mutex; void win32_audio_init() { - win32_has_audio_thread_started = true; - win32_audio_client = 0; win32_render_client = 0; win32_audio_deactivated = 0;