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

obs-ffmpeg: Always close network sources when inactive

master
jp9000 2017-05-16 01:58:18 -07:00
parent 65c344d75d
commit 514387f7cd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/obs-ffmpeg/obs-ffmpeg-source.c
View File

@ -70,8 +70,10 @@ static bool is_local_file_modified(obs_properties_t *props,
"input_format");
obs_property_t *local_file = obs_properties_get(props, "local_file");
obs_property_t *looping = obs_properties_get(props, "looping");
obs_property_t *close = obs_properties_get(props, "close_when_inactive");
obs_property_set_visible(input, !enabled);
obs_property_set_visible(input_format, !enabled);
obs_property_set_visible(close, enabled);
obs_property_set_visible(local_file, enabled);
obs_property_set_visible(looping, enabled);
@ -274,6 +276,8 @@ static void ffmpeg_source_update(void *data, obs_data_t *settings)
input = (char *)obs_data_get_string(settings, "local_file");
input_format = NULL;
s->is_looping = obs_data_get_bool(settings, "looping");
s->close_when_inactive = obs_data_get_bool(settings,
"close_when_inactive");
obs_source_set_async_unbuffered(s->source, true);
} else {
@ -281,6 +285,7 @@ static void ffmpeg_source_update(void *data, obs_data_t *settings)
input_format = (char *)obs_data_get_string(settings,
"input_format");
s->is_looping = false;
s->close_when_inactive = true;
obs_source_set_async_unbuffered(s->source, false);
}
@ -292,8 +297,6 @@ static void ffmpeg_source_update(void *data, obs_data_t *settings)
"clear_on_media_end");
s->restart_on_activate = obs_data_get_bool(settings,
"restart_on_activate");
s->close_when_inactive = obs_data_get_bool(settings,
"close_when_inactive");
s->range = (enum video_range_type)obs_data_get_int(settings,
"color_range");
s->is_local_file = is_local_file;