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

Protect against linking the tracked object with the parent clip

Browse Source
This commit is contained in:
Brenno
2021-03-18 13:05:21 -03:00
parent 7272ff0928
commit 3729188f18
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/TrackedObjectBBox.cpp
View File

@@ -378,9 +378,15 @@ void TrackedObjectBBox::SetJsonValue(const Json::Value root)
if (!root["protobuf_data_path"].isNull())
protobufDataPath = root["protobuf_data_path"].asString();
// Set the id of the child clio
if (!root["child_clip_id"].isNull())
ChildClipId(root["child_clip_id"].asString());
// Set the id of the child clip
// Does not allow to link to the parent clip
if (!root["child_clip_id"].isNull()){
Clip* parentClip = (Clip *) ParentClip();
if(parentClip && (root["child_clip_id"].asString() != parentClip->Id())){
ChildClipId(root["child_clip_id"].asString());
}
}
// Set the Keyframes by the given JSON object
if (!root["delta_x"].isNull())

13
src/TrackedObjectBase.cpp
View File

@@ -33,16 +33,16 @@
#include <functional>
#include <utility>
namespace openshot{
namespace openshot
{
// Blank constructor
TrackedObjectBase::TrackedObjectBase() : visible(1.0), draw_box(1)
TrackedObjectBase::TrackedObjectBase() : visible(1.0), draw_box(1)
{
// Initializes the id as "None"
id = "None";
childClipId = "None";
}
}
// Default constructor
TrackedObjectBase::TrackedObjectBase(std::string _id) : visible(1.0)
@@ -51,7 +51,8 @@ namespace openshot{
childClipId = "None";
}
Json::Value TrackedObjectBase::add_property_choice_json(std::string name, int value, int selected_value) const {
Json::Value TrackedObjectBase::add_property_choice_json(std::string name, int value, int selected_value) const
{
// Create choice
Json::Value new_choice = Json::Value(Json::objectValue);
new_choice["name"] = name;
@@ -61,4 +62,4 @@ namespace openshot{
// return JsonValue
return new_choice;
}
}
} // namespace openshot

2
src/TrackedObjectBase.h
View File

@@ -55,7 +55,7 @@ namespace openshot {
* predicted along the frames of a clip.
*/
class TrackedObjectBase {
private:
protected:
std::string id;
std::string childClipId;