app: migrate all engine access to the C ABI facade (nm U _ZN5olive = 0)

Every app module now reaches liboakengine exclusively through
oakengine_* C calls, EngineEventBridge subscriptions and app-side
handle headers (cliphandle/keyframehandle/nodevaluehandle/oakvaluehelper).
Direct C++ command construction, engine signal connect()s, and engine
type usage in MOC-visible signatures are gone: 557 -> 0 undefined
olive:: symbols in oak-editor.
This commit is contained in:
2026-07-26 22:43:21 +08:00
parent f95590e924
commit 0aa5879f35
256 changed files with 12357 additions and 4044 deletions
+7 -2
View File
@@ -40,20 +40,25 @@ public:
virtual void deselect_all() override;
public slots:
void set_node(Node *node)
void set_node(OakEngineNode *node)
{
// Convert single pointer to either an empty vector or a vector of one
QVector<Node *> nodes;
if (node) {
nodes.append(node);
nodes.append(reinterpret_cast<Node *>(node));
}
set_nodes(nodes);
}
public:
// Not a slot: signature uses the engine C++ type Node*, which must not be
// exposed to MOC (it would pull Node::staticMetaObject across the ABI
// boundary). All connections use new-style member-function syntax.
void set_nodes(const QVector<Node *> &nodes);
public slots:
virtual void increase_track_height() override;
virtual void decrease_track_height() override;
+3 -3
View File
@@ -45,12 +45,12 @@ void FootageViewerPanel::override_work_area(const TimeRange &r)
get_footage_viewer_widget()->override_work_area(r);
}
QVector<ViewerOutput *> FootageViewerPanel::get_selected_footage() const
QVector<OakEngineNode *> FootageViewerPanel::get_selected_footage() const
{
QVector<ViewerOutput *> list;
QVector<OakEngineNode *> list;
if (get_connected_viewer()) {
list.append(get_connected_viewer());
list.append(reinterpret_cast<OakEngineNode *>(get_connected_viewer()));
}
return list;
+1 -1
View File
@@ -47,7 +47,7 @@ public:
return static_cast<FootageViewerWidget *>(get_time_based_widget());
}
virtual QVector<ViewerOutput *> get_selected_footage() const override;
virtual QVector<OakEngineNode *> get_selected_footage() const override;
protected:
virtual void retranslate() override;
+10 -7
View File
@@ -25,6 +25,8 @@
#include "panel/panel.h"
#include "widget/nodeview/nodewidget.h"
struct OakEngineNode;
namespace olive
{
@@ -117,21 +119,22 @@ public:
}
public slots:
void select(const QVector<Node::ContextPair> &p)
void select(
const QVector<QPair<OakEngineNode *, OakEngineNode *>> &p)
{
node_widget_->view()->select(p, true);
}
signals:
void nodes_selected(const QVector<Node *> &nodes);
void nodes_selected(const QVector<OakEngineNode *> &nodes);
void nodes_deselected(const QVector<Node *> &nodes);
void nodes_deselected(const QVector<OakEngineNode *> &nodes);
void node_selection_changed(const QVector<Node *> &nodes);
void
node_selection_changed_with_contexts(const QVector<Node::ContextPair> &nodes);
void node_selection_changed(const QVector<OakEngineNode *> &nodes);
void node_selection_changed_with_contexts(
const QVector<QPair<OakEngineNode *, OakEngineNode *>> &nodes);
void node_group_opened(NodeGroup *group);
void node_group_opened(OakEngineNode *group);
void node_group_closed();
+1 -1
View File
@@ -21,7 +21,7 @@
#include "panelmanager.h"
#include "config/config.h"
#include "common/configwrapper.h"
namespace olive
{
+9 -3
View File
@@ -50,7 +50,8 @@ public:
}
public slots:
void set_selected_nodes(const QVector<Node::ContextPair> &nodes)
void set_selected_nodes(
const QVector<QPair<OakEngineNode *, OakEngineNode *>> &nodes)
{
get_param_view()->set_selected_nodes(nodes, false);
}
@@ -61,12 +62,17 @@ public slots:
virtual void deselect_all() override;
public:
// Not a slot: signature uses the engine C++ type Node*, which must not be
// exposed to MOC (it would pull Node::staticMetaObject across the ABI
// boundary). All connections use new-style member-function syntax.
void set_contexts(const QVector<Node *> &contexts);
signals:
void focused_node_changed(Node *n);
void focused_node_changed(OakEngineNode *n);
void selected_nodes_changed(const QVector<Node::ContextPair> &nodes);
void selected_nodes_changed(
const QVector<QPair<OakEngineNode *, OakEngineNode *>> &nodes);
void request_viewer_to_start_editing_text();
+3 -1
View File
@@ -26,12 +26,14 @@
#include "node/project/footage/footage.h"
struct OakEngineNode;
namespace olive
{
class FootageManagementPanel {
public:
virtual QVector<ViewerOutput *> get_selected_footage() const = 0;
virtual QVector<OakEngineNode *> get_selected_footage() const = 0;
};
}
+34 -14
View File
@@ -25,6 +25,8 @@
#include <QVBoxLayout>
#include "core.h"
#include "oakengine/events.h"
#include "oakengine/project.h"
#include "node/project/sequence/sequence.h"
#include "panel/footageviewer/footageviewer.h"
#include "panel/timeline/timeline.h"
@@ -36,6 +38,14 @@
namespace olive
{
ProjectPanel::~ProjectPanel()
{
if (project_name_sub_ > 0) {
oakengine_event_unsubscribe(project_name_sub_);
project_name_sub_ = 0;
}
}
ProjectPanel::ProjectPanel(const QString &unique_name)
: PanelWidget(unique_name)
{
@@ -87,19 +97,24 @@ Project *ProjectPanel::project() const
void ProjectPanel::set_project(Project *p)
{
if (project()) {
disconnect(project(), &Project::name_changed, this,
&ProjectPanel::update_subtitle);
disconnect(project(), &Project::name_changed, this,
&ProjectPanel::project_name_changed);
if (project_name_sub_ > 0) {
oakengine_event_unsubscribe(project_name_sub_);
project_name_sub_ = 0;
}
}
explorer_->set_project(p);
if (project()) {
connect(project(), &Project::name_changed, this,
&ProjectPanel::update_subtitle);
connect(project(), &Project::name_changed, this,
&ProjectPanel::project_name_changed);
auto *ph = reinterpret_cast<OakEngineProject *>(project());
project_name_sub_ = oakengine_event_subscribe(
ph, OAKENGINE_EVENT_PROJECT_NAME_CHANGED,
[](const oakengine_event *, void *userdata) {
auto *s = static_cast<ProjectPanel *>(userdata);
s->update_subtitle();
s->project_name_changed();
},
this);
}
update_subtitle();
@@ -154,7 +169,7 @@ void ProjectPanel::rename_selected()
explorer_->rename_selected_item();
}
void ProjectPanel::edit(Node *item)
void ProjectPanel::edit(OakEngineNode *item)
{
explorer_->edit(item);
}
@@ -170,8 +185,9 @@ void ProjectPanel::retranslate()
update_subtitle();
}
void ProjectPanel::item_double_click_slot(Node *item)
void ProjectPanel::item_double_click_slot(OakEngineNode *item_handle)
{
Node *item = reinterpret_cast<Node *>(item_handle);
if (item == nullptr) {
// If the user double clicks on empty space, show the import dialog
Core::instance()->dialog_import_show();
@@ -201,7 +217,11 @@ void ProjectPanel::show_new_menu()
void ProjectPanel::update_subtitle()
{
if (project()) {
QString project_title = QStringLiteral("%1").arg(project()->name());
char name_buf[256];
oakengine_project_name(
reinterpret_cast<OakEngineProject *>(project()),
name_buf, sizeof(name_buf));
QString project_title = QString::fromUtf8(name_buf);
if (explorer_->get_root() != project()->root()) {
QString folder_path;
@@ -229,14 +249,14 @@ void ProjectPanel::save_connected_project()
Core::instance()->save_project();
}
QVector<ViewerOutput *> ProjectPanel::get_selected_footage() const
QVector<OakEngineNode *> ProjectPanel::get_selected_footage() const
{
QVector<Node *> items = selected_items();
QVector<ViewerOutput *> footage;
QVector<OakEngineNode *> footage;
foreach (Node *i, items) {
if (dynamic_cast<ViewerOutput *>(i)) {
footage.append(static_cast<ViewerOutput *>(i));
footage.append(reinterpret_cast<OakEngineNode *>(i));
}
}
+10 -4
View File
@@ -27,6 +27,8 @@
#include "panel/panel.h"
#include "widget/projectexplorer/projectexplorer.h"
struct OakEngineNode;
namespace olive
{
@@ -37,6 +39,7 @@ class ProjectPanel : public PanelWidget, public FootageManagementPanel {
Q_OBJECT
public:
ProjectPanel(const QString &unique_name);
~ProjectPanel() override;
Project *project() const;
void set_project(Project *p);
@@ -49,7 +52,7 @@ public:
Folder *get_selected_folder() const;
virtual QVector<ViewerOutput *> get_selected_footage() const override;
virtual QVector<OakEngineNode *> get_selected_footage() const override;
ProjectViewModel *model() const;
@@ -66,20 +69,23 @@ public:
virtual void rename_selected() override;
public slots:
void edit(Node *item);
void edit(OakEngineNode *item);
signals:
void project_name_changed();
void selection_changed(const QVector<Node *> &selected);
void selection_changed(const QVector<OakEngineNode *> &selected);
private:
virtual void retranslate() override;
ProjectExplorer *explorer_;
// Event subscription IDs (replaces connect to Project signals)
int64_t project_name_sub_ = 0;
private slots:
void item_double_click_slot(Node *item);
void item_double_click_slot(OakEngineNode *item);
void show_new_menu();
+1 -1
View File
@@ -134,7 +134,7 @@ void ScopePanel::set_reference_buffer(TexturePtr frame)
waveform_view_->set_buffer(frame);
}
void ScopePanel::set_color_manager(ColorManager *manager)
void ScopePanel::set_color_manager(OakEngineColorManager *manager)
{
histogram_->connect_color_manager(manager);
vectorscope_->connect_color_manager(manager);
+1 -1
View File
@@ -61,7 +61,7 @@ public:
public slots:
void set_reference_buffer(TexturePtr frame);
void set_color_manager(ColorManager *manager);
void set_color_manager(OakEngineColorManager *manager);
protected:
virtual void retranslate() override;
+4 -1
View File
@@ -33,7 +33,10 @@ class NodeTablePanel : public TimeBasedPanel {
public:
NodeTablePanel();
public slots:
public:
// Not slots: signatures use the engine C++ type Node*, which must not be
// exposed to MOC (it would pull Node::staticMetaObject across the ABI
// boundary). All connections use new-style member-function syntax.
void select_nodes(const QVector<Node *> &nodes)
{
static_cast<NodeTableWidget *>(get_time_based_widget())->select_nodes(nodes);
+27 -10
View File
@@ -21,13 +21,15 @@
#include "taskmanager.h"
#include "task/taskmanager.h"
#include "engineeventbridge.h"
#include "oakengine/task.h"
namespace olive
{
TaskManagerPanel::TaskManagerPanel()
: PanelWidget(QStringLiteral("TaskManagerPanel"))
, bridge_(new EngineEventBridge(this))
{
// Create task view
view_ = new TaskView(this);
@@ -35,15 +37,30 @@ TaskManagerPanel::TaskManagerPanel()
// Set it as the main widget
setWidget(view_);
// Connect task view to the task manager
connect(TaskManager::instance(), &TaskManager::task_added, view_,
&TaskView::add_task);
connect(TaskManager::instance(), &TaskManager::task_removed, view_,
&TaskView::remove_task);
connect(TaskManager::instance(), &TaskManager::task_failed, view_,
&TaskView::task_failed);
connect(view_, &TaskView::task_cancelled, TaskManager::instance(),
&TaskManager::cancel_task);
// Connect task view to the task manager via EngineEventBridge
bridge_->subscribe(oakengine_task_manager_handle(),
OAKENGINE_EVENT_TASK_MANAGER_TASK_ADDED);
bridge_->subscribe(oakengine_task_manager_handle(),
OAKENGINE_EVENT_TASK_MANAGER_TASK_REMOVED);
bridge_->subscribe(oakengine_task_manager_handle(),
OAKENGINE_EVENT_TASK_MANAGER_TASK_FAILED);
connect(bridge_, &EngineEventBridge::task_manager_task_added, this,
[this](OakEngineTask *task, const QString &) {
view_->add_task(task);
});
connect(bridge_, &EngineEventBridge::task_manager_task_removed, this,
[this](OakEngineTask *task) {
view_->remove_task(task);
});
connect(bridge_, &EngineEventBridge::task_manager_task_failed, this,
[this](OakEngineTask *task) {
view_->task_failed(task);
});
connect(view_, &TaskView::task_cancelled, this,
[](OakEngineTask *t) {
oakengine_task_manager_cancel(t);
});
// Set strings
retranslate();
+4
View File
@@ -28,6 +28,8 @@
namespace olive
{
class EngineEventBridge;
/**
* @brief A PanelWidget wrapper around a TaskView widget
*/
@@ -40,6 +42,8 @@ private:
virtual void retranslate() override;
TaskView *view_;
EngineEventBridge *bridge_;
};
}
+13 -5
View File
@@ -29,6 +29,11 @@ TimeBasedPanel::TimeBasedPanel(const QString &object_name)
, widget_(nullptr)
, show_and_raise_on_connect_(false)
{
bridge_ = new EngineEventBridge(this);
connect(bridge_, &EngineEventBridge::node_label_changed, this,
[this](OakEngineNode *, const QString &label) {
set_subtitle(label);
});
}
TimeBasedPanel::~TimeBasedPanel()
@@ -142,16 +147,19 @@ void TimeBasedPanel::retranslate()
}
}
void TimeBasedPanel::connected_node_changed(ViewerOutput *old, ViewerOutput *now)
void TimeBasedPanel::connected_node_changed(OakEngineNode *old, OakEngineNode *now)
{
if (old) {
disconnect(old, &ViewerOutput::label_changed, this,
&TimeBasedPanel::set_subtitle);
if (label_sub_) {
bridge_->unsubscribe(label_sub_);
label_sub_ = 0;
}
}
if (now) {
connect(now, &ViewerOutput::label_changed, this,
&TimeBasedPanel::set_subtitle);
label_sub_ = bridge_->subscribe(
reinterpret_cast<void *>(now),
OAKENGINE_EVENT_NODE_LABEL_CHANGED);
if (show_and_raise_on_connect_) {
this->show();
+5 -1
View File
@@ -24,6 +24,7 @@
#include "panel/panel.h"
#include "widget/timebased/timebasedwidget.h"
#include "engineeventbridge.h"
namespace olive
{
@@ -141,8 +142,11 @@ private:
bool show_and_raise_on_connect_;
EngineEventBridge *bridge_ = nullptr;
int64_t label_sub_ = 0;
private slots:
void connected_node_changed(ViewerOutput *old, ViewerOutput *now);
void connected_node_changed(OakEngineNode *old, OakEngineNode *now);
};
}
+2 -2
View File
@@ -171,13 +171,13 @@ void TimelinePanel::rename_selected()
}
void TimelinePanel::insert_footage_at_playhead(
const QVector<ViewerOutput *> &footage)
const QVector<OakEngineNode *> &footage)
{
timeline_widget()->insert_footage_at_playhead(footage);
}
void TimelinePanel::overwrite_footage_at_playhead(
const QVector<ViewerOutput *> &footage)
const QVector<OakEngineNode *> &footage)
{
timeline_widget()->overwrite_footage_at_playhead(footage);
}
+5 -5
View File
@@ -103,9 +103,9 @@ public:
timeline_widget()->nest_selected_clips();
}
void insert_footage_at_playhead(const QVector<ViewerOutput *> &footage);
void insert_footage_at_playhead(const QVector<OakEngineNode *> &footage);
void overwrite_footage_at_playhead(const QVector<ViewerOutput *> &footage);
void overwrite_footage_at_playhead(const QVector<OakEngineNode *> &footage);
const QVector<Block *> &get_selected_blocks() const
{
@@ -121,13 +121,13 @@ protected:
virtual void retranslate() override;
signals:
void block_selection_changed(const QVector<Block *> &selected_blocks);
void block_selection_changed(const QVector<OakEngineBlock *> &selected_blocks);
void request_capture_start(const TimeRange &time,
const Track::Reference &track);
void reveal_viewer_in_project(ViewerOutput *r);
void reveal_viewer_in_footage_viewer(ViewerOutput *r, const TimeRange &range);
void reveal_viewer_in_project(OakEngineNode *r);
void reveal_viewer_in_footage_viewer(OakEngineNode *r, const TimeRange &range);
};
}
+2 -2
View File
@@ -93,9 +93,9 @@ void ViewerPanelBase::set_full_screen(QScreen *screen)
get_viewer_widget()->set_full_screen(screen);
}
void ViewerPanelBase::set_gizmos(Node *node)
void ViewerPanelBase::set_gizmos(OakEngineNode *node)
{
get_viewer_widget()->set_gizmos(node);
get_viewer_widget()->set_gizmos(reinterpret_cast<Node *>(node));
}
void ViewerPanelBase::cache_entire_sequence()
+8 -5
View File
@@ -22,8 +22,11 @@
#ifndef OAK_VIEWERPANELBASE_H
#define OAK_VIEWERPANELBASE_H
#include <memory>
#include "panel/pixelsampler/pixelsamplerpanel.h"
#include "panel/timebased/timebased.h"
#include "widget/manageddisplay/colorprocessorhandle.h"
#include "widget/viewer/viewer.h"
namespace olive
@@ -58,7 +61,7 @@ public:
*/
void set_full_screen(QScreen *screen = nullptr);
ColorManager *get_color_manager()
OakEngineColorManager *get_color_manager()
{
return get_viewer_widget()->color_manager();
}
@@ -78,7 +81,7 @@ public:
get_viewer_widget()->set_timeline_selected_blocks(b);
}
void set_node_view_selections(const QVector<Node *> &n)
void set_node_view_selections(const QVector<OakEngineNode *> &n)
{
get_viewer_widget()->set_node_view_selections(n);
}
@@ -89,7 +92,7 @@ public:
}
public slots:
void set_gizmos(Node *node);
void set_gizmos(OakEngineNode *node);
void cache_entire_sequence();
@@ -109,12 +112,12 @@ signals:
/**
* @brief Wrapper for ViewerGLWidget::ColorProcessorChanged()
*/
void color_processor_changed(ColorProcessorPtr processor);
void color_processor_changed(ColorProcessorHandlePtr processor);
/**
* @brief Wrapper for ViewerGLWidget::ColorManagerChanged()
*/
void color_manager_changed(ColorManager *color_manager);
void color_manager_changed(OakEngineColorManager *color_manager);
protected:
void set_viewer_widget(ViewerWidget *vw);