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

app: PlaybackController + playhead subscription migration (issues 0c, 1-4)

Browse Source 
New app/playback/playbackcontroller.{h,cpp}: a lazily created
process-wide singleton whose set_playhead() forwards to
oakengine_viewer_set_playhead and re-broadcasts playhead_changed as a
plain Qt signal. Every app-side oakengine_viewer_set_playhead call site
(17 across viewer, timelinewidget, timelineview, import tool,
timebasedwidget, keyframecontrol, export dialog, mainwindow) now goes
through it.

Migrate the first four playhead subscribers off the raw C event
subscription / EngineEventBridge to the controller signal:
- TimeBasedView (issue 1)
- NodeParamViewWidgetBridge (issue 2)
- NodeParamViewKeyframeControl (issue 3)
- NodeParamViewConnectedLabel (issue 4)

Each stores a QMetaObject::Connection filtered on its viewer node and
disconnects on teardown; the viewer_sub_ members are gone. Plan docs
mark issues 0c and 1-4 as done.

Closes #30, closes #31, closes #32, closes #51, closes #52.
This commit is contained in:
Mike-Solar
2026-08-05 00:01:12 +08:00
parent 712badbaa7
commit b77344b506
20 changed files with 184 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp
+13 -15
View File
@@ -21,6 +21,8 @@
#include "nodeparamviewconnectedlabel.h"
#include "playback/playbackcontroller.h"
#include <QHBoxLayout>
#include "oakutil/qtutils.h"
@@ -112,30 +114,26 @@ NodeParamViewConnectedLabel::NodeParamViewConnectedLabel(const oak::Input &input
NodeParamViewConnectedLabel::~NodeParamViewConnectedLabel()
{
// Raw C-API subscription carries `this` as userdata; not covered by
// Qt's auto-disconnect. Unsubscribe or the next playhead event calls
// into a dead object.
// Drop the PlaybackController connection (Qt would auto-disconnect
// anyway, but keep the symmetric teardown).
set_viewer_node(nullptr);
}
void NodeParamViewConnectedLabel::set_viewer_node(OakEngineNode *viewer)
{
if (viewer_) {
oakengine_event_unsubscribe(viewer_sub_);
viewer_sub_ = 0;
}
disconnect(viewer_conn_);
viewer_ = viewer;
if (viewer_) {
viewer_sub_ = oakengine_event_subscribe(
viewer_,
OAKENGINE_EVENT_VIEWER_PLAYHEAD_CHANGED,
[](const oakengine_event *, void *userdata) {
static_cast<NodeParamViewConnectedLabel *>(userdata)
->update_value_tree();
},
this);
viewer_conn_ = connect(
PlaybackController::instance(),
&PlaybackController::playhead_changed, this,
[this](OakEngineNode *n, const core::Rational &) {
if (n == viewer_) {
update_value_tree();
}
});
update_value_tree();
}
}
app/widget/nodeparamview/nodeparamviewconnectedlabel.h
+1 -1
View File
@@ -72,7 +72,7 @@ private:
EngineEventBridge *bridge_ = nullptr;
int64_t viewer_sub_ = 0;
QMetaObject::Connection viewer_conn_;
private slots:
void set_value_tree_visible(bool e);
app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp
+14 -21
View File
@@ -28,6 +28,7 @@
#include "oakengine/events.h"
#include "oakengine/undo.h"
#include "oakengine/viewer.h"
#include "playback/playbackcontroller.h"
#include "oakengine/node.h"
#include "ui/icons/icons.h"
@@ -159,13 +160,9 @@ NodeParamViewKeyframeControl::NodeParamViewKeyframeControl(bool right_align,
NodeParamViewKeyframeControl::~NodeParamViewKeyframeControl()
{
// Raw C-API subscription carries `this` as userdata; it is not covered
// by Qt's auto-disconnect. Without this, a playhead event delivered
// after destruction calls update_state() on a dead object.
if (viewer_sub_ > 0) {
oakengine_event_unsubscribe(viewer_sub_);
viewer_sub_ = 0;
}
// Qt auto-disconnect covers the PlaybackController connection; make it
// explicit for symmetry with TimeTargetDisconnectEvent.
disconnect(viewer_conn_);
// Drop the keyframe_* bridge subscriptions too (same raw-userdata
// mechanism underneath).
set_input(oak::Input());
@@ -211,22 +208,18 @@ void NodeParamViewKeyframeControl::set_input(const oak::Input &input)
void NodeParamViewKeyframeControl::TimeTargetDisconnectEvent(OakEngineNode *v)
{
if (viewer_sub_ > 0) {
oakengine_event_unsubscribe(viewer_sub_);
viewer_sub_ = 0;
}
disconnect(viewer_conn_);
}
void NodeParamViewKeyframeControl::TimeTargetConnectEvent(OakEngineNode *v)
{
viewer_sub_ = oakengine_event_subscribe(
v,
OAKENGINE_EVENT_VIEWER_PLAYHEAD_CHANGED,
[](const oakengine_event *, void *userdata) {
static_cast<NodeParamViewKeyframeControl *>(userdata)
->update_state();
},
this);
viewer_conn_ = connect(
PlaybackController::instance(), &PlaybackController::playhead_changed,
this, [this, v](OakEngineNode *n, const core::Rational &) {
if (n == v) {
update_state();
}
});
update_state();
}
@@ -391,7 +384,7 @@ void NodeParamViewKeyframeControl::go_to_previous_key()
&previous_time) &&
get_time_target()) {
Rational key_time = convert_to_viewer_time(previous_time);
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
reinterpret_cast<OakEngineNode *>(get_time_target()),
key_time.numerator(), key_time.denominator());
}
@@ -408,7 +401,7 @@ void NodeParamViewKeyframeControl::go_to_next_key()
&next_time) &&
get_time_target()) {
Rational key_time = convert_to_viewer_time(next_time);
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
reinterpret_cast<OakEngineNode *>(get_time_target()),
key_time.numerator(), key_time.denominator());
}
app/widget/nodeparamview/nodeparamviewkeyframecontrol.h
+1 -1
View File
@@ -77,7 +77,7 @@ private:
int64_t keyframe_removed_sub_ = 0;
int64_t keyframe_time_sub_ = 0;
int64_t viewer_sub_ = 0;
QMetaObject::Connection viewer_conn_;
private slots:
void show_buttons_from_keyframe_enable(bool e);
app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
+11 -16
View File
@@ -21,6 +21,8 @@
#include "nodeparamviewwidgetbridge.h"
#include "playback/playbackcontroller.h"
#include <QCheckBox>
#include <QFontComboBox>
#include <QUrl>
@@ -192,10 +194,7 @@ NodeParamViewWidgetBridge::~NodeParamViewWidgetBridge()
{
// oakengine_dragger_create() ownership is ours (no-op on NULL)
oakengine_dragger_free(dragger_);
// Raw viewer subscription carries `this` as userdata
if (viewer_sub_ > 0) {
oakengine_event_unsubscribe(viewer_sub_);
}
disconnect(viewer_conn_);
}
int get_slider_count(NodeValueType::Type type)
@@ -1131,22 +1130,18 @@ void NodeParamViewWidgetBridge::set_timebase(const Rational &timebase)
void NodeParamViewWidgetBridge::TimeTargetDisconnectEvent(OakEngineNode *v)
{
if (viewer_sub_ > 0) {
oakengine_event_unsubscribe(viewer_sub_);
viewer_sub_ = 0;
}
disconnect(viewer_conn_);
}
void NodeParamViewWidgetBridge::TimeTargetConnectEvent(OakEngineNode *v)
{
viewer_sub_ = oakengine_event_subscribe(
v,
OAKENGINE_EVENT_VIEWER_PLAYHEAD_CHANGED,
[](const oakengine_event *, void *userdata) {
static_cast<NodeParamViewWidgetBridge *>(userdata)
->update_widget_values();
},
this);
viewer_conn_ = connect(
PlaybackController::instance(), &PlaybackController::playhead_changed,
this, [this, v](OakEngineNode *n, const core::Rational &) {
if (n == v) {
update_widget_values();
}
});
}
void NodeParamViewWidgetBridge::input_value_changed(OakEngineNode *source,
app/widget/nodeparamview/nodeparamviewwidgetbridge.h
+1 -1
View File
@@ -121,7 +121,7 @@ private:
EngineEventBridge *bridge_ = nullptr;
int64_t viewer_sub_ = 0;
QMetaObject::Connection viewer_conn_;
private slots:
void widget_callback();