You've already forked libopenshot
mirror of
https://github.com/OpenShot/libopenshot.git
synced 2026-03-02 08:53:52 -08:00
Fold libopenshot_protobuf into libopenshot
- Move .proto files to src/ dir (not src/protobuf_messages) - Generate protobuf files in src/CMakeLists.txt and include in 'openshot' library target - Don't install generated *.pb.h headers, which are now private
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
|
||||
#include "Clip.h"
|
||||
|
||||
#include "protobuf_messages/trackerdata.pb.h"
|
||||
#include "trackerdata.pb.h"
|
||||
#include <google/protobuf/util/time_util.h>
|
||||
|
||||
using google::protobuf::util::TimeUtil;
|
||||
@@ -377,7 +377,7 @@ void TrackedObjectBBox::SetJsonValue(const Json::Value root)
|
||||
// Set the protobuf data path by the given JSON object
|
||||
if (!root["protobuf_data_path"].isNull())
|
||||
protobufDataPath = root["protobuf_data_path"].asString();
|
||||
|
||||
|
||||
// Set the id of the child clip
|
||||
if (!root["child_clip_id"].isNull() && root["child_clip_id"].asString() != "" && root["child_clip_id"].asString() != Id()){
|
||||
Clip* parentClip = (Clip *) ParentClip();
|
||||
|
||||
Reference in New Issue
Block a user