20 Commits

Author SHA1 Message Date
Clayton Groeneveld
f101ea0834 image-source: Re-add fix of repeating images
With the dynamic loading of images being reverted, the fix for
this separate issue was also reverted.
2019-03-14 12:23:36 -05:00
jp9000
c88bd219cb image-source: Add memory usage limit to slideshow
This prevents users from loading too much image data at once.  It will
only add as many files within the memory limit.
2019-03-13 01:12:40 -07:00
jp9000
07c22cb885 image-source: Revert slideshow dynamic loading
Reverts dynamic loading of images to slideshow.
2019-03-13 00:07:45 -07:00
Colin Edwards
495222f6b9
Merge pull request #1688 from cg2121/fix-slideshow-repeat-image
image-source: Fix repeating of images with slideshow source
2019-03-03 22:30:25 -06:00
jp9000
b1dfc9ccda image-source: Change max loaded slideshow images to 21
Just gives a bit more breathing room before images start having to load.
2019-02-25 08:21:28 -08:00
Clayton Groenveld
b8730415dc image-source: Fix repeating of images with slideshow source 2019-02-24 19:59:10 -06:00
jp9000
8694859e85 image-source: Actually defer slideshow, not image source
The previous commit in this module meant to defer the properties update
of the slideshow source, not the image source.  Wrong file was modified.
2019-02-19 12:02:43 -08:00
jp9000
71130137f3 image-source: Increase slideshow max loaded to 15 2019-02-08 19:00:38 -08:00
cg2121
4c7e13bb8a image-source: Decrease slideshow source memory usage 2018-09-16 19:31:26 -05:00
sorayuki
e00e081111 image-source: Fade to transparency if slideshow list is cleared
Fixes a bug where the last image would be permanently shown if the user
clears the file list of a slideshow source.

Closes jp9000/obs-studio#1206
2018-02-27 05:51:31 -08:00
jp9000
00f6bbe99c image-source: Fix potential crash with slideshow
If there are no slideshow items and this function is called, it would
cause a null pointer dereference.
2017-08-10 21:30:03 -07:00
cg2121
7549b3a092 image-source: Add "manual (hotkey)" mode to image slideshow
Allows traversing/stopping the slideshow via hotkeys.

Split from jp9000/obs-studio#976
2017-08-04 21:16:44 -07:00
cg2121
1666abe8e6 image-source: Add activate/deactivate behavior to slideshow
When the slideshow is deactivated (not shown to the stream), makes it so
that it can either continue playing regardless, pause, or restart the
slideshow when the source is activated (shown to the stream) again.

Split from jp9000/obs-studio#976
2017-08-04 21:15:23 -07:00
cg2121
7b8a56b933 image-source: Add 'loop' and 'hide on stop' to slideshow
Allows the ability to make it so that a slideshow can stop when all
items have been shown.

Split from jp9000/obs-studio#976
2017-08-04 21:12:07 -07:00
jp9000
5411e58121 image-source: Allow custom bounding source size/aspect
Adds an option that allows the user to specify the size (or aspect) of
the bounding source size which all the images are then scaled in to.
Acts similarly to "bounding box" of scene items, but for the slide show
and its sub-sources.
2017-05-14 20:53:55 -07:00
SuslikV
8a9cbaae18 image-source: Prevent random_file call when file list empty
Simple workaround to prevent integer division by zero in random_file
when add new source.

Closes jp9000/obs-studio#550
2016-06-27 20:11:03 -07:00
jp9000
d0eae5d0e6 image-source: Add ability to add directories to slideshow 2016-06-15 16:20:12 -07:00
jp9000
e73546b521 image-source: Don't repeat same image when randomizing
When randomizing the image slide show, do not repeat the same image more
than once in a row
2016-05-26 12:12:35 -07:00
jp9000
8da65b5c99 image-source: Add option to randomize slideshow 2016-05-26 11:35:29 -07:00
jp9000
3b17416b82 image-source: Add image slideshow source 2016-05-26 11:14:22 -07:00