Commit Graph

167 Commits

Author SHA1 Message Date
FeRD (Frank Dana)
22bf6edfba Enhance Json data handling
- Parsing from string to Json::Value is now done by utility function
  openshot::stringToJson() in Json.cpp, all SetJson() methods call it.
- Expand use of const member functions and args where appropriate.
- Use std::to_string() to format int/float values as strings.
- Correct mentions of nonexistent Json::JsonValue type in docstrings
2019-12-27 08:51:51 -05:00
Jonathan Thomas
0347ad2073 Merge pull request #374 from musteresel/new-keyframe-implementation
New Keyframe implementation
2019-12-06 17:10:11 -06:00
Frank Dana
c04dc94cc8 Wrap assignment in conditional with () (#379) 2019-12-02 10:45:06 -05:00
Daniel Jour
504ea0c1ff Make Keyframe::Values and Keyframe::Points vectors private
The Values vector should only be accessed from the outside through the
GetValue() function.  The Points vector should only be accessed using
the AddPoint(), RemovePoint(), .. functions.

This helps maintain internal invariants (e.g. keeping Points sorted)
and allows for future removal / lazy evaluation of Values.

The size() of the vectors had been accessed from various parts of the
code; the GetLength() (for Values) and GetCount() (for Points) member
functions provide access to this information and are already part of
the public API.
2019-11-19 23:43:28 +01:00
Frank Dana
8bde07682c Merge branch 'develop' into std-prefixes 2019-10-22 21:00:27 -04:00
FeRD (Frank Dana)
366ff2c5e6 src: Don't pass "" file_path args to exceptions 2019-08-27 15:47:39 -04:00
FeRD (Frank Dana)
352fd6629a Remaining std:: prefixes 2019-08-04 23:51:02 -04:00
FeRD (Frank Dana)
e49039d568 std:: prefixes for Timeline.h/.cpp 2019-08-04 22:23:06 -04:00
Jonathan Thomas
12fce8040f Merge pull request #266 from ferdnyc/zmq-default-params
Default values for ZMQ logging calls
2019-07-29 16:30:22 -05:00
Jonathan Thomas
5f331e24df Merge pull request #265 from ferdnyc/catch-by-reference
Exceptions: catch-by-reference and other cleanup
2019-07-29 16:27:40 -05:00
FeRD (Frank Dana)
35eb6adc55 Clean up allocated memory in JSON code 2019-07-11 05:00:47 -04:00
FeRD (Frank Dana)
f29a6bcb27 Trim unnecessary args off logging calls 2019-07-03 14:14:02 -04:00
FeRD (Frank Dana)
25b522589d Always catch-by-reference in C++11 2019-07-03 12:58:02 -04:00
Jonathan Thomas
1b19ae7fe4 Merge pull request #249 from chad3814/crop
make use of crop_x, crop_y, crop_with, crop_height keyframes
2019-07-01 14:24:59 -05:00
Jonathan Thomas
967f23b8a4 Merge pull request #245 from ferdnyc/license-block
Upgrade Doxygen documentation formatting/content
2019-06-21 00:24:54 -05:00
FeRD (Frank Dana)
744a4f3ec1 Remove Json:Reader
`Json::Reader` has been deprecated for some time, so we replace it with
`Json::CharReader` generated by a `Json::CharReaderBuilder`, or (in the
one instance where we have a stream as input) `Json::parseFromStream();`
2019-06-19 21:20:04 -04:00
Chad Walker
0fd335ab7b use source_image->width() and source_image->height() instead of scaled_source_width and scaled_source_height 2019-06-11 20:28:23 -05:00
Chad Walker
f82c01db2d make use of crop_x, crop_y, crop_with, crop_height keyframes 2019-06-11 17:29:35 -05:00
FeRD (Frank Dana)
f170fdd009 Update copyright range to current year 2019-06-11 06:48:32 -04:00
FeRD (Frank Dana)
0327c2ab5c Remove license block from documentation comment 2019-06-09 08:31:04 -04:00
Jonathan Thomas
4a3985e209 Updating comment 2019-05-14 00:20:32 -05:00
Jonathan Thomas
9ffd6a6f75 Fixing crash when destructing Timeline/Clips/FrameMapper 2019-05-13 23:55:03 -05:00
Jonathan Thomas
968e472c73 Tweak how Timeline manages the cache object (sometimes itself, and sometimes by the user if they call SetCache) 2019-05-13 17:11:40 -05:00
Jonathan Thomas
bd21d1a751 Fixing crash on Timeline::Close due to deleted FrameMappers 2019-05-13 16:18:15 -05:00
Chris Kirmse
d5a29500a5 change freeing of frame_mappers allocated in Timeline
- each class is now responsible to free whatever it allocates
- all tests passed on my machine with ffmpeg 3.2
- Clip is now more careful about freeing a reader if it allocated it as well
2019-05-09 10:51:40 -07:00