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:
@@ -27,7 +27,7 @@
|
||||
#include <QLinearGradient>
|
||||
#include <QWidget>
|
||||
|
||||
#include "node/node.h"
|
||||
#include "oakutil/oaknode.h"
|
||||
#include "nodeviewcommon.h"
|
||||
#include "nodeviewitemconnector.h"
|
||||
#include "engineeventbridge.h"
|
||||
@@ -38,6 +38,14 @@ namespace olive
|
||||
class NodeViewItem;
|
||||
class NodeViewEdge;
|
||||
|
||||
/**
|
||||
* @brief Local UI-only position aggregate (replaces engine Node::Position).
|
||||
*/
|
||||
struct NodeViewItemPosition {
|
||||
QPointF position;
|
||||
bool expanded = false;
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief A visual widget representation of a Node object to be used in a NodeView
|
||||
*
|
||||
@@ -48,36 +56,37 @@ class NodeViewEdge;
|
||||
class NodeViewItem : public QObject, public QGraphicsRectItem {
|
||||
Q_OBJECT
|
||||
public:
|
||||
NodeViewItem(Node *node, const QString &input, int element, Node *context,
|
||||
QGraphicsItem *parent = nullptr);
|
||||
NodeViewItem(Node *node, Node *context, QGraphicsItem *parent = nullptr)
|
||||
NodeViewItem(oak::Node node, const QString &input, int element,
|
||||
oak::Node context, QGraphicsItem *parent = nullptr);
|
||||
NodeViewItem(oak::Node node, oak::Node context,
|
||||
QGraphicsItem *parent = nullptr)
|
||||
: NodeViewItem(node, QString(), -1, context, parent)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~NodeViewItem() override;
|
||||
|
||||
Node::Position get_node_position_data() const;
|
||||
NodeViewItemPosition get_node_position_data() const;
|
||||
QPointF get_node_position() const;
|
||||
void set_node_position(const QPointF &pos);
|
||||
void set_node_position(const Node::Position &pos);
|
||||
void set_node_position(const NodeViewItemPosition &pos);
|
||||
|
||||
QVector<NodeViewEdge *> get_all_edges_recursively() const;
|
||||
|
||||
/**
|
||||
* @brief Get currently attached node
|
||||
*/
|
||||
Node *get_node() const
|
||||
oak::Node get_node() const
|
||||
{
|
||||
return node_;
|
||||
}
|
||||
|
||||
NodeInput get_input() const
|
||||
oak::Input get_input() const
|
||||
{
|
||||
return NodeInput(node_, input_, element_);
|
||||
return oak::Input(node_, input_, element_);
|
||||
}
|
||||
|
||||
Node *get_context() const
|
||||
oak::Node get_context() const
|
||||
{
|
||||
return context_;
|
||||
}
|
||||
@@ -145,7 +154,7 @@ public:
|
||||
|
||||
void set_highlighted(bool e);
|
||||
|
||||
NodeViewItem *get_item_for_input(NodeInput input);
|
||||
NodeViewItem *get_item_for_input(oak::Input input);
|
||||
|
||||
bool is_output_item() const
|
||||
{
|
||||
@@ -197,11 +206,11 @@ private:
|
||||
/**
|
||||
* @brief Reference to attached Node
|
||||
*/
|
||||
Node *node_;
|
||||
oak::Node node_;
|
||||
QString input_;
|
||||
int element_;
|
||||
|
||||
Node *context_;
|
||||
oak::Node context_;
|
||||
|
||||
/**
|
||||
* @brief Cached list of node inputs
|
||||
|
||||
Reference in New Issue
Block a user