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

image-source: Fix repeating of images with slideshow source

Browse Source
This commit is contained in:
Clayton Groenveld
2019-02-24 16:28:58 -06:00
committed by Clayton Groeneveld
parent ef270c8ba0
commit b8730415dc
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/image-source/obs-slideshow.c
View File

@@ -441,10 +441,15 @@ static void ss_update(void *data, obs_data_t *settings)
ss->transition = new_tr;
}
if (new_duration < 50)
new_duration = 50;
if (new_speed > (new_duration - 50))
new_speed = new_duration - 50;
if (strcmp(tr_name, "cut_transition") != 0) {
if (new_duration < 100)
new_duration = 100;
new_duration += new_speed;
} else {
if (new_duration < 50)
new_duration = 50;
}
ss->tr_speed = new_speed;
ss->tr_name = tr_name;
@@ -589,7 +594,7 @@ static void ss_next_slide(void *data)
{
struct slideshow *ss = data;
if (!ss->paths.num)
if (!ss->paths.num || obs_transition_get_time(ss->transition) < 1.0f)
return;
if (++ss->cur_item >= (int)ss->paths.num)
@@ -602,7 +607,7 @@ static void ss_previous_slide(void *data)
{
struct slideshow *ss = data;
if (!ss->paths.num)
if (!ss->paths.num || obs_transition_get_time(ss->transition) < 1.0f)
return;
if (--ss->cur_item < 0)