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

Fixing some regressions on image merging

Browse Source
This commit is contained in:
Jonathan Thomas
2020-10-05 23:08:31 -05:00
committed by FeRD (Frank Dana)
parent 8387b124ad
commit b3ad76ddf7
4 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ClipBase.h
+9 -1
View File
@@ -69,7 +69,15 @@ namespace openshot {
CacheMemory cache;
/// Constructor for the base clip
ClipBase() { };
ClipBase() {
// Initialize values
position = 0.0;
layer = 0;
start = 0.0;
end = 0.0;
previous_properties = "";
timeline = NULL;
};
// Compare a clip using the Position() property
bool operator< ( ClipBase& a) { return (Position() < a.Position()); }
include/TimelineBase.h
+3
View File
@@ -41,6 +41,9 @@ namespace openshot {
public:
int preview_width; ///< Optional preview width of timeline image. If your preview window is smaller than the timeline, it's recommended to set this.
int preview_height; ///< Optional preview width of timeline image. If your preview window is smaller than the timeline, it's recommended to set this.
/// Constructor for the base timeline
TimelineBase();
};
}