jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,386 Commits 1 Branch 0 Tags
Commit Graph

142 Commits

Author SHA1 Message Date
jp9000
f53df7da64 clang-format: Apply formatting 
Code submissions have continually suffered from formatting
inconsistencies that constantly have to be addressed.  Using
clang-format simplifies this by making code formatting more consistent,
and allows automation of the code formatting so that maintainers can
focus more on the code itself instead of code formatting.
 2019-06-23 23:49:10 -07:00
Gol-D-Ace
973bc481ce Update translations from Crowdin 2019-06-11 01:42:42 +02:00
Jim
d0f52a6479
Merge pull request #1781 from cg2121/color-source-default-size 
image-source: Set default size of color source to canvas size
 2019-04-10 17:38:51 -07:00
Gol-D-Ace
e78ac5ebef Update translations from Crowdin 2019-04-04 16:19:51 +02:00
jp9000
d18c62b2b5 libobs, image-source: Fix ABI break in image_file_t structure 
In commit a776a6cf071, the image_file_t structure (which is a public
structure) had a member variable added to it, which broke ABI.
 2019-03-28 22:30:20 -07:00
Clayton Groeneveld
46c5780a77 image-source: Set default size of color source to canvas size 2019-03-27 22:00:33 -05:00
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
Gol-D-Ace
98f78fe3a7 Update translations from Crowdin 2019-02-25 15:11:33 +01:00
Clayton Groenveld
b8730415dc image-source: Fix repeating of images with slideshow source 2019-02-24 19:59:10 -06:00
Gol-D-Ace
ec42739ad5 Update translations from Crowdin 2019-02-24 23:26:47 +01:00
Gol-D-Ace
c3711bdd5e Update translations from Crowdin 2019-02-20 22:26:07 +01: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
47ba3e8c22 image-source: Defer update of slideshow source 
Defers the update of the slideshow source until the user has pressed OK
or exited the properties dialog.  This ensures images aren't reloaded
every time the user adjusts a setting.
 2019-02-10 23:06:20 -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
Jim
af320a0838
Merge pull request #1480 from kkartaltepe/module-descriptions 
Plugins: Add descriptions to modules
 2018-09-16 15:34:28 -07:00
Kurt Kartaltepe
d86c8121ed Plugins: Add descriptions to modules 2018-09-11 18:28:58 -07:00
pkviet
c1e01b2b22 image-source: Add psd and *.* to file filter 
Add psd (photoshop) to file filter and more generally enable display
of all files (*.*).
 2018-08-19 00:09:34 +02:00
Gol-D-Ace
a79aaa28ab Update translations from Crowdin 2018-08-18 04:16:35 +02:00
Gol-D-Ace
88282c168c Update translations from Crowdin 2018-03-15 09:00:28 +01: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
Gol-D-Ace
ae22886f67 Update translations from Crowdin 2018-01-22 04:55:52 +01:00
jp9000
7bd06e7f26 Update translations from Crowdin 2017-10-17 05:39:22 -07: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
Gol-D-Ace
8d8c2e5a22 Update translations from Crowdin 2017-08-10 16:07:40 +02: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
Gol-D-Ace
3d2cacd782 Update translations from Crowdin 2017-05-20 10:18:41 +02: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
Christoph Hohmann
35d6787fe5 image-source: Move file modification check before animation processing 
The code to process GIF animations contains a return statement that
skiped the file modification check, if the source is not in an active
scene. Like that images in the preview scene of studio mode would never
update, when they get modified on disk.

Also reloading the image, if an animation file has been modified before
processing the old animation that will be replaced later anyway, seems
like a better way to do it.
 2017-03-12 23:46:04 +01:00
Gol-D-Ace
dbf95bdc15 Update translations from Crowdin 2017-03-05 23:40:11 +01:00
Gol-D-Ace
de1bbf4342 Update translations from Crowdin 2017-03-04 07:04:03 +01:00
Gol-D-Ace
a13c0a3c29 Update translations from Crowdin 2017-02-27 20:54:02 +01:00
jp9000
6dd1707752 image-source: Add missing locale 
The commit was modified and the locale was unintentionally left out.
 2017-02-25 07:14:35 -08:00
cg2121
f16a6ad66d image-source: Add solid color source 
Closes jp9000/obs-studio#809
 2017-02-25 07:05:32 -08:00
Gol-D-Ace
6223ed6520 Update translations from Crowdin 2017-01-07 00:23:16 +01:00
Gol-D-Ace
69f0bc244a Update translations from Crowdin 2016-12-23 20:46:47 +01:00
jp9000
922e1d23f9 image-source: Do not change blend state 
The blend state does not need to (and should not) be changed.  This
fixes an issue where if filters are applied to an image source, the
image source will paint incorrectly.
 2016-12-21 15:26:33 -08:00
Gol-D-Ace
90e805ad9b Update translations from CrowdIn 2016-11-16 00:32:47 +01:00
jp9000
ed85b22534 Update translations from CrowdIn 2016-11-03 13:32:52 -07:00
Gol-D-Ace
aadc7263c0 Update translations from Crowdin 2016-09-28 01:17:24 +02:00
Ryan Foster
c8a81bba72 image-source: Reload file when timestamp has changed 
This commit fixes the issue outlined in the following thread:
https://obsproject.com/forum/threads/50045/

When the image source file was replaced by an outside process, it would
only reload when the file's new timestamp was newer than the file's
previous timestamp.  This fixes that behavior.  Now an image source
will reload any time the file's new timestamp is different than its
previous timestamp.
 2016-09-14 05:43:48 -04:00
Gol-D-Ace
cb036b2713 Update translations from Crowdin 2016-08-08 16:21:48 +02:00
Gol-D-Ace
81adb13f59 Update translations from Crowdin 2016-07-06 01:18:27 +02: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