R8: finish app/ pure C ABI migration (P3-P9) and make OTIO required
- app/ no longer includes engine C++ headers nor holds engine C++ types: engine access goes through the oakengine C ABI plus C++ wrappers (oakutil/oaknode.h, oakutil/oakvideo.h) and app-local mirror types (tooltypes, trackreferencehandle, timelinecommonapp, keyframetypes, subtitleapp, serializedlayoutinfoapp, nodevaluehandle, sliderdisplaytypeapp) - engine: new C ABI functions for block/track/clip/transition navigation and predicates, links, caches, waveform/playback, disk folder, sequence_track_list, node_free, footage_is_valid, block_get_track, get_brush; loadotio/saveotio ported to the current engine API - OTIO is now a required dependency: CI and CD build it on every platform, FindOpenTimelineIO fixed for OTIO 0.16/0.19 (the old deps include requirement silently disabled OTIO everywhere), runtime libraries are bundled into packages and copied next to macOS binaries (oak_copy_otio_runtime) - fix ProjectViewModel drag&drop mime read/write size mismatch (segfault) - unify color label naming (k_olive -> "Oak") in the app-side mirror - docs: OTIO required, FFmpeg minimum corrected to 6.0 (en/zh) - gtest suite: 1925 passed, 0 failed
This commit is contained in:
@@ -26,8 +26,23 @@
|
||||
namespace olive
|
||||
{
|
||||
|
||||
static bool keyframe_matches_ref(OakEngineKeyframe *key,
|
||||
const oak::KeyframeTrackRef &ref)
|
||||
{
|
||||
const oak::Keyframe k(key);
|
||||
if (k.node().handle() != ref.input().node_handle())
|
||||
return false;
|
||||
if (k.input_id() != ref.input().input_id())
|
||||
return false;
|
||||
if (k.element() != ref.input().element())
|
||||
return false;
|
||||
if (k.track() != ref.track())
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
KeyframeViewInputConnection::KeyframeViewInputConnection(
|
||||
const NodeKeyframeTrackReference &input, KeyframeView *parent)
|
||||
const oak::KeyframeTrackRef &input, KeyframeView *parent)
|
||||
: QObject(parent)
|
||||
, keyframe_view_(parent)
|
||||
, input_(input)
|
||||
@@ -36,7 +51,7 @@ KeyframeViewInputConnection::KeyframeViewInputConnection(
|
||||
, brush_(Qt::white)
|
||||
, bridge_(new EngineEventBridge(this))
|
||||
{
|
||||
Node *n = input.input().node();
|
||||
OakEngineNode *n = input.input().node_handle();
|
||||
|
||||
bridge_->subscribe(reinterpret_cast<void *>(n),
|
||||
OAKENGINE_EVENT_NODE_KEYFRAME_ADDED);
|
||||
@@ -104,34 +119,35 @@ void KeyframeViewInputConnection::set_brush(const QBrush &brush)
|
||||
}
|
||||
}
|
||||
|
||||
QVector<oak::Keyframe> KeyframeViewInputConnection::get_keyframes() const
|
||||
{
|
||||
return input_.keyframes();
|
||||
}
|
||||
|
||||
void KeyframeViewInputConnection::add_keyframe(OakEngineKeyframe *key)
|
||||
{
|
||||
NodeKeyframe *nk = reinterpret_cast<NodeKeyframe *>(key);
|
||||
if (nk->key_track_ref() == input_) {
|
||||
if (keyframe_matches_ref(key, input_)) {
|
||||
emit require_update();
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewInputConnection::remove_keyframe(OakEngineKeyframe *key)
|
||||
{
|
||||
NodeKeyframe *nk = reinterpret_cast<NodeKeyframe *>(key);
|
||||
if (nk->key_track_ref() == input_) {
|
||||
if (keyframe_matches_ref(key, input_)) {
|
||||
emit require_update();
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewInputConnection::keyframe_changed(OakEngineKeyframe *key)
|
||||
{
|
||||
NodeKeyframe *nk = reinterpret_cast<NodeKeyframe *>(key);
|
||||
if (nk->key_track_ref() == input_) {
|
||||
if (keyframe_matches_ref(key, input_)) {
|
||||
emit require_update();
|
||||
}
|
||||
}
|
||||
|
||||
void KeyframeViewInputConnection::keyframe_type_changed(OakEngineKeyframe *key)
|
||||
{
|
||||
NodeKeyframe *nk = reinterpret_cast<NodeKeyframe *>(key);
|
||||
if (nk->key_track_ref() == input_) {
|
||||
if (keyframe_matches_ref(key, input_)) {
|
||||
emit type_changed();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user