Commit Graph

45 Commits

Author SHA1 Message Date
Frank Dana
8bde07682c Merge branch 'develop' into std-prefixes 2019-10-22 21:00:27 -04:00
Jonathan Thomas
ae81e56de6 Merge pull request #306 from ferdnyc/bindings-magick
Bindings: Apply #defines for optional libs
2019-10-22 18:28:37 -05:00
FeRD (Frank Dana)
1af92afc59 SWIG: Use compactdefaultargs in bindings 2019-09-28 21:43:59 -04:00
FeRD (Frank Dana)
c4126aef2c Bindings: Apply #defines for optional libs
The resetting of `CMAKE_SWIG_FLAGS` to the empty string in the bindings'
CMakeLists.txt files was clearing away the definitions for things like
`USE_IMAGEMAGICK` and `USE_BLACKMAGIC`, causing the bindings to be built
_without_ those classes even if they're available in the library.
2019-08-11 12:49:42 -04:00
FeRD (Frank Dana)
dd74fa3af8 ruby openshot.i: namespace fixes
- Remove `std::shared_ptr<Frame>` wrapper
- Don't place templates in std:: namespace
2019-08-05 02:19:52 -04:00
FeRD (Frank Dana)
e94436b71d Raise SWIG version requirement to 3.0 2019-07-30 04:06:36 -04:00
FeRD (Frank Dana)
0ac3720023 SWIG: Warnings cleanup
* Remove a SWIG pragma from Frame.h (gcc warns on it)
* Place the equivalent %warnfilter in the openshot.i files
* Set openshot.i PROPERTY GENERATED_COMPILE_OPTIONS with flags to
  disable warning spew in generated SWIG code, if -Wall is used

(Also, remove 'using namespace std' from Frame.h, and add std::
prefixes to necessary variables.)
2019-07-12 13:28:47 -04:00
Jonathan Thomas
376170d7dd Merging work from @ferdnyc, to move version info to CMake, and other misc Cmake improvements. This was the easiest way to resolve the merge conflict for me (to apply it locally and commit it). 2019-07-01 12:24:50 -05:00
FeRD (Frank Dana)
f170fdd009 Update copyright range to current year 2019-06-11 06:48:32 -04:00
Jonathan Thomas
2c825335c1 Merge branch 'develop' into rename-rshift 2019-05-02 13:24:14 -05:00
Jonathan Thomas
140fbaddff Added new AudioDeviceInfo struct, and populate a vector of them on QtPlayer initialization. This allows a user to overwrite the preferred audio device by using the setting PLAYBACK_AUDIO_DEVICE_NAME. 2019-04-23 16:45:02 -05:00
Frank Dana
926ddab8d2 Merge branch 'develop' into rename-rshift 2019-04-06 20:28:14 -04:00
FeRD (Frank Dana)
2748e9a2a2 Use if(POLICY)
I somehow missed that `if(POLICY CMPxxxx)` exists to wrap `cmp_policy()`
calls so only CMake versions that understand that policy attempt to set
it. Which is way smarter than the version-based logic I was using.
2019-04-06 19:24:32 -04:00
FeRD (Frank Dana)
ab46eea1c4 Remove accidentally-committed tilde files
I snuck `src/bindings/*/CMakeLists.txt~` files into one of my
recent commits somehow. This commit removes them, and adds an
explicit `*~` to `.gitignore` to help prevent a repeat occurrence.
2019-04-06 06:17:44 -04:00
FeRD (Frank Dana)
f3c35da5c8 Don't break older cmake with new policy 2019-04-05 00:49:27 -04:00
FeRD (Frank Dana)
3d8c2412f0 Bindings build in CMake 3.1-3.14+ 2019-04-05 00:07:59 -04:00
FeRD (Frank Dana)
bb8efeb72b Ruby: Rename RSHIFT to RB_RSHIFT, temporarily
When Ruby attempts to load the FFmpeg header files, it'll complain that
RSHIFT is redefined if the Ruby definition is still in place. So, we
define RB_RSHIFT to contain the Ruby definition, undef RSHIFT, load the
FFmpeg headers, move its RSHIFT into FF_RSHIFT if necessary, and then
restore Ruby's RSHIFT from RB_RSHIFT.
2019-01-26 12:23:41 -05:00
Jonathan Thomas
13bd272ead Adding new settings class to be used for changing realtime settings used by libopenshot, such as scaling mode for preview vs final render, or hardware decode, etc... 2019-01-09 16:50:40 -06:00
Jonathan Thomas
244fac4df8 Adding new crop effect, which can also be animated for some very cool effects. 2018-03-05 02:12:37 -06:00
Jonathan Thomas
7f9fc30203 Adding new Color Shift effect, which can shift any color (RGBA) with infinite wrapping (and full supports animation). 2018-03-03 18:02:14 -06:00
Jonathan Thomas
3034bbe273 Adding new Pixelate video effect, which pixelates a portion (or all) of a frame's image, and is fully animatable. 2018-02-09 16:43:43 -06:00
Jonathan Thomas
8c1da9798b Adding new video effect: Bars, which allow for animating colored bars around your video, such as a letterbox effect. 2018-02-09 02:37:05 -06:00
Jonathan Thomas
c159fde729 Adding new wave video effect, which can be animated in a ton of ways to create lots of cool wave distortion effects. 2018-02-08 03:51:32 -06:00
Jonathan Thomas
c81d42629d Adding Hue video effect, to adjust the hue of a frame's image, which can also be animated with a keyframe 2018-02-06 02:26:35 -06:00
Jonathan Thomas
4a9f2a0a00 Adding new effect: Shift, an infinite pixel shifting effect which can be animated and wrap images in any direction. 2018-02-06 00:51:59 -06:00