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

Merge pull request #859 from reboot/fix_image_reloading_in_preview

Browse Source 
image-source: Move file modification check before animation processing
This commit is contained in:
Jim
2017-03-25 08:37:27 -07:00
committed by GitHub
parent 6af48130e0 35d6787fe5
commit f1c8ae3532
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/image-source/image-source.c
View File

@@ -162,6 +162,17 @@ static void image_source_tick(void *data, float seconds)
struct image_source *context = data;
uint64_t frame_time = obs_get_video_frame_time();
context->update_time_elapsed += seconds;
if (context->update_time_elapsed >= 1.0f) {
time_t t = get_modified_timestamp(context->file);
context->update_time_elapsed = 0.0f;
if (context->file_timestamp != t) {
image_source_load(context);
}
}
if (obs_source_active(context->source)) {
if (!context->active) {
if (context->image.is_animated_gif)
@@ -199,17 +210,6 @@ static void image_source_tick(void *data, float seconds)
}
context->last_time = frame_time;
context->update_time_elapsed += seconds;
if (context->update_time_elapsed >= 1.0f) {
time_t t = get_modified_timestamp(context->file);
context->update_time_elapsed = 0.0f;
if (context->file_timestamp != t) {
image_source_load(context);
}
}
}