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:
FeRD (Frank Dana)
2021-09-11 18:22:28 -04:00
parent dae8ca5e4e
commit 7ac54f05cc
19 changed files with 147 additions and 164 deletions

View File

@@ -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();