openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into hardware-support

Browse Source
This commit is contained in:
eisneinechse
2019-03-07 10:46:54 -08:00
parent 48a2656080 8f385c112a
commit 9cde60059c
7 changed files with 166 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Clip.h
View File

@@ -127,7 +127,7 @@ namespace openshot {
std::shared_ptr<Frame> GetOrCreateFrame(int64_t number);
/// Adjust the audio and image of a time mapped frame
std::shared_ptr<Frame> get_time_mapped_frame(std::shared_ptr<Frame> frame, int64_t frame_number);
void get_time_mapped_frame(std::shared_ptr<Frame> frame, int64_t frame_number);
/// Init default settings for a clip
void init_settings();

26
include/Coordinate.h
View File

@@ -52,11 +52,6 @@ namespace openshot {
* \endcode
*/
class Coordinate {
private:
bool increasing; ///< Is the Y value increasing or decreasing?
Fraction repeated; ///< Fraction of repeated Y values (for example, 1/3 would be the first Y value of 3 repeated values)
double delta; ///< This difference in Y value (from the previous unique Y value)
public:
double X; ///< The X value of the coordinate (usually representing the frame #)
double Y; ///< The Y value of the coordinate (usually representing the value of the property being animated)
@@ -69,27 +64,6 @@ namespace openshot {
/// @param y The Y coordinate (usually representing the value of the property being animated)
Coordinate(double x, double y);
/// @brief Set the repeating Fraction (used internally on the timeline, to track changes to coordinates)
/// @param is_repeated The fraction representing how many times this coordinate Y value repeats (only used on the timeline)
void Repeat(Fraction is_repeated) { repeated=is_repeated; }
/// Get the repeating Fraction (used internally on the timeline, to track changes to coordinates)
Fraction Repeat() { return repeated; }
/// @brief Set the increasing flag (used internally on the timeline, to track changes to coordinates)
/// @param is_increasing Indicates if this coordinate Y value is increasing (when compared to the previous coordinate)
void IsIncreasing(bool is_increasing) { increasing = is_increasing; }
/// Get the increasing flag (used internally on the timeline, to track changes to coordinates)
bool IsIncreasing() { return increasing; }
/// @brief Set the delta / difference between previous coordinate value (used internally on the timeline, to track changes to coordinates)
/// @param new_delta Indicates how much this Y value differs from the previous Y value
void Delta(double new_delta) { delta=new_delta; }
/// Get the delta / difference between previous coordinate value (used internally on the timeline, to track changes to coordinates)
float Delta() { return delta; }
/// Get and Set JSON methods
string Json(); ///< Generate JSON string of this object
Json::Value JsonValue(); ///< Generate Json::JsonValue for this object