mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

image-source: Don't repeat same image when randomizing

Browse Source 
When randomizing the image slide show, do not repeat the same image more
than once in a row
This commit is contained in:
jp9000 2016-05-26 12:12:35 -07:00
parent 8da65b5c99
commit e73546b521
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,10 +308,17 @@ static void ss_video_tick(void *data, float seconds)
if (ss->elapsed > ss->slide_time) { if (ss->elapsed > ss->slide_time) {
ss->elapsed -= ss->slide_time; ss->elapsed -= ss->slide_time;
if (ss->randomize) if (ss->randomize) {
ss->cur_item = random_file(ss); size_t next = ss->cur_item;
else if (++ss->cur_item >= ss->files.num) if (ss->files.num > 1) {
while (next == ss->cur_item)
next = random_file(ss);
}
ss->cur_item = next;
} else if (++ss->cur_item >= ss->files.num) {
ss->cur_item = 0; ss->cur_item = 0;
}
if (ss->files.num) if (ss->files.num)
obs_transition_start(ss->transition, obs_transition_start(ss->transition,