From b2202c484340f257dd778d7c963673cddc06795c Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 7 Mar 2014 22:34:49 -0700 Subject: [PATCH] UI: Swap audio slots Had the audio restart slot connected to things that didn't require a restart --- libobs/media-io/audio-io.c | 2 -- obs/window-basic-settings.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libobs/media-io/audio-io.c b/libobs/media-io/audio-io.c index e1b5b73d0..67be023b6 100644 --- a/libobs/media-io/audio-io.c +++ b/libobs/media-io/audio-io.c @@ -847,8 +847,6 @@ void audio_line_output(audio_line_t line, const struct audio_data *data) pthread_mutex_lock(&line->mutex); if (!line->buffers[0].size) { - /* XXX: not entirely sure if this is the wisest course of - * action in all circumstances */ line->base_timestamp = data->timestamp - line->audio->info.buffer_ms * 1000000; audio_line_place_data(line, data); diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp index d863b6c5f..9ddd62afd 100644 --- a/obs/window-basic-settings.cpp +++ b/obs/window-basic-settings.cpp @@ -90,8 +90,8 @@ void OBSBasicSettings::HookWidget(QWidget *widget, const char *signal, #define SCROLL_CHANGED SIGNAL(valueChanged(int)) #define GENERAL_CHANGED SLOT(GeneralChanged()) -#define AUDIO_CHANGED SLOT(AudioChangedRestart()) -#define AUDIO_RESTART SLOT(AudioChanged()) +#define AUDIO_RESTART SLOT(AudioChangedRestart()) +#define AUDIO_CHANGED SLOT(AudioChanged()) #define VIDEO_RESTART SLOT(VideoChangedRestart()) #define VIDEO_RES SLOT(VideoChangedResolution()) #define VIDEO_CHANGED SLOT(VideoChanged())