oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Mike-Solar
2026-07-26 22:43:21 +08:00
parent f95590e924
commit 0aa5879f35
256 changed files with 12357 additions and 4044 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/window/mainwindow/mainstatusbar.cpp
+59 -42
View File
@@ -23,13 +23,17 @@
#include <QCoreApplication>
#include "engineeventbridge.h"
namespace olive
{
MainStatusBar::MainStatusBar(QWidget *parent)
: QStatusBar(parent)
, manager_(nullptr)
, bridge_(nullptr)
, connected_task_(nullptr)
, task_progress_sub_(0)
, task_finished_sub_(0)
{
setSizeGripEnabled(false);
@@ -46,56 +50,69 @@ MainStatusBar::MainStatusBar(QWidget *parent)
10000);
}
void MainStatusBar::connect_task_manager(TaskManager *manager)
void MainStatusBar::connect_task_manager(EngineEventBridge *bridge)
{
if (manager_) {
disconnect(manager_, &TaskManager::task_list_changed, this,
&MainStatusBar::update_status);
}
bridge_ = bridge;
bridge_->subscribe(oakengine_task_manager_handle(),
OAKENGINE_EVENT_TASK_MANAGER_LIST_CHANGED);
connect(bridge_, &EngineEventBridge::task_manager_list_changed,
this, &MainStatusBar::update_status);
manager_ = manager;
if (manager_) {
connect(manager_, &TaskManager::task_list_changed, this,
&MainStatusBar::update_status);
}
// Route progress/finished events for any task we track
connect(bridge_, &EngineEventBridge::task_progress,
this, [this](OakEngineTask *task, double d) {
if (task == connected_task_) {
set_progress_bar_value(d);
}
});
connect(bridge_, &EngineEventBridge::task_finished,
this, [this](OakEngineTask *task, bool) {
if (task == connected_task_) {
connected_task_finished();
}
});
}
void MainStatusBar::update_status()
{
if (!manager_) {
return;
}
if (manager_->get_task_count() == 0) {
const int count = oakengine_task_manager_count();
if (count <= 0) {
clearMessage();
bar_->setVisible(false);
bar_->setValue(0);
} else {
Task *t = manager_->get_first_task();
if (manager_->get_task_count() == 1) {
showMessage(t->get_title());
} else {
showMessage(tr("Running %n background task(s)", nullptr,
manager_->get_task_count()));
}
bar_->setVisible(true);
if (connected_task_) {
disconnect(connected_task_, &Task::progress_changed, this,
&MainStatusBar::set_progress_bar_value);
disconnect(connected_task_, &Task::destroyed, this,
&MainStatusBar::connected_task_deleted);
}
connected_task_ = t;
connect(connected_task_, &Task::progress_changed, this,
&MainStatusBar::set_progress_bar_value);
connect(connected_task_, &Task::destroyed, this,
&MainStatusBar::connected_task_deleted);
connected_task_ = nullptr;
return;
}
OakEngineTask *t = oakengine_task_manager_first();
if (count == 1) {
char title[256];
oakengine_task_title(t, title, sizeof(title));
showMessage(QString::fromUtf8(title));
} else {
showMessage(tr("Running %n background task(s)", nullptr, count));
}
bar_->setVisible(true);
// Unsubscribe from previous task events
if (task_progress_sub_ > 0) {
bridge_->unsubscribe(task_progress_sub_);
task_progress_sub_ = 0;
}
if (task_finished_sub_ > 0) {
bridge_->unsubscribe(task_finished_sub_);
task_finished_sub_ = 0;
}
connected_task_ = t;
// Subscribe to progress and finished events on this task
task_progress_sub_ = bridge_->subscribe(
t, OAKENGINE_EVENT_TASK_PROGRESS);
task_finished_sub_ = bridge_->subscribe(
t, OAKENGINE_EVENT_TASK_FINISHED);
}
void MainStatusBar::set_progress_bar_value(double d)
@@ -103,7 +120,7 @@ void MainStatusBar::set_progress_bar_value(double d)
bar_->setValue(qRound(100.0 * d));
}
void MainStatusBar::connected_task_deleted()
void MainStatusBar::connected_task_finished()
{
connected_task_ = nullptr;
}