midnadimple/helpless
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sync woopsie

Browse source
This commit is contained in:
Charlie 2024-07-15 21:53:00 +02:00
parent c39902d6b1
commit 518a255885
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
oogabooga/audio.c
View file

@ -544,9 +544,7 @@ audio_open_source_stream_format(Audio_Source *src, string path, Audio_Format for
src->allocator = allocator; src->allocator = allocator;
src->kind = AUDIO_SOURCE_FILE_STREAM; src->kind = AUDIO_SOURCE_FILE_STREAM;
mutex_acquire_or_wait(&audio_init_mutex);
src->format = format; src->format = format;
mutex_release(&audio_init_mutex);
File file = os_file_open(path, O_READ); File file = os_file_open(path, O_READ);
if (file == OS_INVALID_FILE) return false; 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 bool
audio_open_source_stream(Audio_Source *src, string path, Allocator allocator) { 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 bool
audio_open_source_load_format(Audio_Source *src, string path, Audio_Format format, 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->allocator = allocator;
src->kind = AUDIO_SOURCE_MEMORY; src->kind = AUDIO_SOURCE_MEMORY;
mutex_acquire_or_wait(&audio_init_mutex);
src->format = format; src->format = format;
mutex_release(&audio_init_mutex);
File file = os_file_open(path, O_READ); File file = os_file_open(path, O_READ);
if (file == OS_INVALID_FILE) return false; 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 bool
audio_open_source_load(Audio_Source *src, string path, Allocator allocator) { 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 void

2
oogabooga/os_impl_windows.c
View file

@ -1137,8 +1137,6 @@ Mutex audio_init_mutex;
void void
win32_audio_init() { win32_audio_init() {
win32_has_audio_thread_started = true;
win32_audio_client = 0; win32_audio_client = 0;
win32_render_client = 0; win32_render_client = 0;
win32_audio_deactivated = 0; win32_audio_deactivated = 0;