FeRD (Frank Dana)
db7bf5f622
Keyframe: Replace AddPoint overload w/default arg
2020-12-04 11:28:37 -05:00
FeRD (Frank Dana)
18844b9700
Point: Convert to delegating ctors, constref args
2020-12-04 11:27:30 -05:00
FeRD (Frank Dana)
de9fb417da
# This is a combination of 2 commits.
...
# This is the 1st commit message:
Coordinate: Add std::pair constructor
# This is the commit message #2 :
Fix std::pair member types
2020-12-04 11:27:18 -05:00
FeRD (Frank Dana)
d6892dd3af
Coordinate: Add std::pair constructor
2020-12-04 10:04:56 -05:00
FeRD (Frank Dana)
2a9cf280f5
Merge branch 'develop' into frac-python-types
2020-12-04 09:34:55 -05:00
Jonathan Thomas
ac73bd965d
Fixing an issue caused by timeline::GetClip returning a ClipBase instead of a Clip (broke waveform generation).
...
Also adding a swig definition for the Caption effect.
2020-12-03 10:52:27 -06:00
FeRD (Frank Dana)
9c1ca0ca73
Clip: Mark methods as overrides
2020-11-27 03:28:03 -05:00
FeRD (Frank Dana)
2f6d88e168
various Readers: Fix GetCache return type
...
Tests: fix ImageWriter cache type
2020-11-27 03:28:03 -05:00
FeRD (Frank Dana)
fe391e9240
various: Tidy up some includes
2020-11-21 15:19:08 -05:00
FeRD (Frank Dana)
762f0e716d
Fraction: New ctors accept STL container args
2020-11-21 15:17:18 -05:00
FeRD (Frank Dana)
39b4aa97eb
Make OpenShotAudio loading conditional
2020-11-08 02:29:50 -05:00
Jonathan Thomas
896b307381
Merge pull request #422 from ferdnyc/debug-to-stderr
...
ZmqLogger: Add optional dumping to stderr
2020-10-29 17:49:49 -05:00
Jonathan Thomas
09df9e60bb
Merge pull request #583 from OpenShot/caption-effect
...
New "Caption" Effect (Supports VTT and Subrip formats)
2020-10-29 02:56:15 -05:00
Jonathan Thomas
a3c20c8f44
Fixed a few codacy issues
2020-10-27 02:50:02 -05:00
Jonathan Thomas
def8d9dd7b
Updating method docs
2020-10-27 02:13:57 -05:00
Jonathan Thomas
172348417c
Improvement to video caching thread, to recover from the separation of cache vs display frame #. Also found a mutex that was needed, to prevent crashing when the video thread calls timeline::GetFrame at certain times... colliding with another thread (and independent of OpenMP).
2020-10-23 17:52:20 -05:00
Jonathan Thomas
e556d0fded
Added 2 new unit tests for Clip's with a Timeline associated with them, and FFmpegReaders with a Clip/Timeline associated with them.
2020-10-23 01:35:46 -05:00
Jonathan Thomas
54a070438a
- Added default caption value, for demonstration purposes (to help users see a valid example)
...
- Append some newlines onto the end of any caption text... needed by the regex for some reason
- Updated font name and caption text to be a new type (font and caption), and we have corresponding UI changes for those on openshot-qt
2020-10-22 01:32:33 -05:00
Jonathan Thomas
07a10e3bf6
- Added word-wrap (using adjustable left, top, and right side keyframes)
...
- Added background color and alpha
- Added font color alpha
- Added fade in / out logic
- Added background padding & rounded corners
- Added adjustable font name
2020-10-21 01:27:49 -05:00
Jonathan Thomas
eb2e787537
Merge branch 'clip-refactor-keyframes' into caption-effect
...
# Conflicts:
# src/effects/Caption.h
2020-10-20 13:18:12 -05:00
Jonathan Thomas
e5d5d82050
- Simplifying the FrameMapper Clip::AdjustFrameNumber method
...
- Removing transformed == true boolean (Qt should be smart enough to optimize for blank transforms)
- Fixing regression from TimelineBase import
2020-10-20 13:03:10 -05:00
Jonathan Thomas
18911bebb7
Apply suggestions from code review
...
Applying some awesome improvements from @ferdnyc, thx!
Co-authored-by: Frank Dana <ferdnyc@gmail.com >
2020-10-20 12:42:00 -05:00
Jonathan Thomas
7711113be1
Apply suggestions from code review
...
Adding suggestions from @ferdnyc
Co-authored-by: Frank Dana <ferdnyc@gmail.com >
2020-10-20 12:39:17 -05:00
FeRD (Frank Dana)
cf89891bf0
Finish conflict resolution
2020-10-19 17:42:12 -04:00
FeRD (Frank Dana)
f55c563ba5
Merge branch 'develop' into debug-to-stderr
2020-10-19 16:38:54 -04:00
