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

UI: Swap audio slots 

Had the audio restart slot connected to things that didn't require a
restart
master
jp9000 2014-03-07 22:34:49 -07:00
parent a9f5959b3c
commit b2202c4843
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -847,8 +847,6 @@ void audio_line_output(audio_line_t line, const struct audio_data *data)
pthread_mutex_lock(&line->mutex); pthread_mutex_lock(&line->mutex);
if (!line->buffers[0].size) { 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->base_timestamp = data->timestamp -
line->audio->info.buffer_ms * 1000000; line->audio->info.buffer_ms * 1000000;
audio_line_place_data(line, data); audio_line_place_data(line, data);

4
obs/window-basic-settings.cpp
View File

@ -90,8 +90,8 @@ void OBSBasicSettings::HookWidget(QWidget *widget, const char *signal,
#define SCROLL_CHANGED SIGNAL(valueChanged(int)) #define SCROLL_CHANGED SIGNAL(valueChanged(int))
#define GENERAL_CHANGED SLOT(GeneralChanged()) #define GENERAL_CHANGED SLOT(GeneralChanged())
#define AUDIO_CHANGED SLOT(AudioChangedRestart()) #define AUDIO_RESTART SLOT(AudioChangedRestart())
#define AUDIO_RESTART SLOT(AudioChanged()) #define AUDIO_CHANGED SLOT(AudioChanged())
#define VIDEO_RESTART SLOT(VideoChangedRestart()) #define VIDEO_RESTART SLOT(VideoChangedRestart())
#define VIDEO_RES SLOT(VideoChangedResolution()) #define VIDEO_RES SLOT(VideoChangedResolution())
#define VIDEO_CHANGED SLOT(VideoChanged()) #define VIDEO_CHANGED SLOT(VideoChanged())