jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs: Allow audio-io callback self-removal

Browse Source 
Allows audio-io callbacks to remove themselves while in a callback.
This commit is contained in:
jp9000 2015-06-08 07:15:47 -07:00
parent 6587b18d59
commit 693962a468
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libobs/media-io/audio-io.c
View File

@ -290,8 +290,8 @@ static inline void do_audio_output(struct audio_output *audio,
pthread_mutex_lock(&audio->input_mutex);
for (size_t i = 0; i < mix->inputs.num; i++) {
struct audio_input *input = mix->inputs.array+i;
for (size_t i = mix->inputs.num; i > 0; i--) {
struct audio_input *input = mix->inputs.array+(i-1);
if (resample_audio_output(input, &data))
input->callback(input->param, mix_idx, &data);
@ -557,7 +557,7 @@ int audio_output_open(audio_t **audio, struct audio_output_info *info)
goto fail;
if (pthread_mutex_init(&out->line_mutex, &attr) != 0)
goto fail;
if (pthread_mutex_init(&out->input_mutex, NULL) != 0)
if (pthread_mutex_init(&out->input_mutex, &attr) != 0)
goto fail;
if (os_event_init(&out->stop_event, OS_EVENT_TYPE_MANUAL) != 0)
goto fail;