oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests 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();
app/widget/timebased/timebasedview.cpp
+11 -11
View File
@@ -21,6 +21,8 @@
#include "timebasedview.h"
#include "playback/playbackcontroller.h"
#include <QGraphicsRectItem>
#include <QMouseEvent>
#include <QScrollBar>
@@ -157,21 +159,19 @@ void TimeBasedView::set_y_scale(const double &y_scale)
void TimeBasedView::set_viewer_node(OakEngineNode *v)
{
if (viewer_) {
oakengine_event_unsubscribe(viewer_sub_);
viewer_sub_ = 0;
}
disconnect(viewer_conn_);
viewer_ = v;
if (viewer_) {
viewer_sub_ = oakengine_event_subscribe(
viewer_,
OAKENGINE_EVENT_VIEWER_PLAYHEAD_CHANGED,
[](const oakengine_event *, void *userdata) {
static_cast<TimeBasedView *>(userdata)->viewport()->update();
},
this);
viewer_conn_ = connect(
PlaybackController::instance(),
&PlaybackController::playhead_changed, this,
[this](OakEngineNode *n, const core::Rational &) {
if (n == viewer_) {
viewport()->update();
}
});
}
}
app/widget/timebased/timebasedview.h
+1 -1
View File
@@ -148,7 +148,7 @@ private:
OakEngineNode *viewer_;
int64_t viewer_sub_ = 0;
QMetaObject::Connection viewer_conn_;
};
}
app/widget/timebased/timebasedwidget.cpp
+9 -8
View File
@@ -34,6 +34,7 @@
#include "oakengine/node.h"
#include "oakengine/timeline.h"
#include "oakengine/viewer.h"
#include "playback/playbackcontroller.h"
#include "oakengine/timeline.h"
#include "oakengine/undo.h"
#include "widget/keyframeview/keyframehandle.h"
@@ -552,7 +553,7 @@ void TimeBasedWidget::go_to_prev_cut()
}
}
oakengine_viewer_set_playhead(sequence_node,
PlaybackController::instance()->set_playhead(sequence_node,
closest_cut.numerator(), closest_cut.denominator());
}
@@ -619,7 +620,7 @@ void TimeBasedWidget::go_to_next_cut()
}
if (closest_cut < RATIONAL_MAX) {
oakengine_viewer_set_playhead(sequence_node,
PlaybackController::instance()->set_playhead(sequence_node,
closest_cut.numerator(), closest_cut.denominator());
}
}
@@ -627,7 +628,7 @@ void TimeBasedWidget::go_to_next_cut()
void TimeBasedWidget::go_to_start()
{
if (viewer_node_) {
oakengine_viewer_set_playhead(get_connected_node(), 0, 1);
PlaybackController::instance()->set_playhead(get_connected_node(), 0, 1);
}
}
@@ -643,7 +644,7 @@ void TimeBasedWidget::prev_frame()
}
{
Rational _pt = qMax(Rational(0), proposed_time);
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
_pt.numerator(), _pt.denominator());
}
}
@@ -659,7 +660,7 @@ void TimeBasedWidget::next_frame()
// Catch rounding error, assume this time is snapped and just add a timebase
proposed_time += timebase();
}
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
proposed_time.numerator(), proposed_time.denominator());
}
}
@@ -668,7 +669,7 @@ void TimeBasedWidget::go_to_end()
{
if (viewer_node_) {
const Rational length = viewer_output_length(viewer_node_.data());
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
length.numerator(), length.denominator());
}
}
@@ -1006,7 +1007,7 @@ void TimeBasedWidget::go_to_in()
oakengine_viewer_workarea wa;
oakengine_viewer_get_workarea(get_connected_node(), &wa);
if (wa.enabled) {
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
wa.in_num, wa.in_den);
} else {
go_to_start();
@@ -1020,7 +1021,7 @@ void TimeBasedWidget::go_to_out()
oakengine_viewer_workarea wa;
oakengine_viewer_get_workarea(get_connected_node(), &wa);
if (wa.enabled) {
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
wa.out_num, wa.out_den);
} else {
go_to_end();
app/widget/timelinewidget/timelinewidget.cpp
+7 -6
View File
@@ -56,6 +56,7 @@
#include "oakengine/proxy.h"
#include "oakengine/timeline.h"
#include "oakengine/viewer.h"
#include "playback/playbackcontroller.h"
#include "common/configwrapper.h"
#include "tool/add.h"
#include "tool/beam.h"
@@ -555,7 +556,7 @@ TimelineWidget::TimelineWidget(QWidget *parent)
start = std::min(start, block_in(b));
}
if (start != RATIONAL_MAX) {
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
reinterpret_cast<OakEngineNode *>(get_connected_node()),
start.numerator(), start.denominator());
}
@@ -758,7 +759,7 @@ void TimelineWidget::ConnectNodeEvent(OakEngineNode *n)
connect(timecode_label_, &RationalSlider::value_changed, this,
[handle](const Rational &time) {
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
handle, time.numerator(), time.denominator());
});
{
@@ -1076,7 +1077,7 @@ void TimelineWidget::DeleteSelected(bool ripple)
clear_ghosts();
if (ripple && rippled && new_playhead != RATIONAL_MAX) {
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
reinterpret_cast<OakEngineNode *>(get_connected_node()),
new_playhead.numerator(), new_playhead.denominator());
}
@@ -1308,7 +1309,7 @@ void TimelineWidget::delete_in_to_out(bool ripple)
// Playhead move is not undoable and stays here (same as before).
if (ripple) {
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
reinterpret_cast<OakEngineNode *>(get_connected_node()),
wa_in.numerator(), wa_in.denominator());
}
@@ -3196,14 +3197,14 @@ void TimelineWidget::ripple_to(TimelineApp::MovementMode mode)
// If we rippled, ump to where new cut is if applicable
if (mode == TimelineApp::k_trim_in) {
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
reinterpret_cast<OakEngineNode *>(get_connected_node()),
closest_point_to_playhead.numerator(),
closest_point_to_playhead.denominator());
} else if (mode == TimelineApp::k_trim_out &&
closest_point_to_playhead ==
viewer_playhead(reinterpret_cast<OakEngineNode *>(get_connected_node()))) {
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
reinterpret_cast<OakEngineNode *>(get_connected_node()),
playhead_time.numerator(), playhead_time.denominator());
}
app/widget/timelinewidget/tool/import.cpp
+2 -1
View File
@@ -36,6 +36,7 @@
#include "oakengine/timeline.h"
#include "oakengine/undo.h"
#include "oakengine/viewer.h"
#include "playback/playbackcontroller.h"
#include "oakengine/project.h"
#include "widget/timelinewidget/cliphandle.h"
#include "window/mainwindow/mainwindow.h"
@@ -252,7 +253,7 @@ void ImportTool::place_at(const DraggedFootageData &footage,
drop_ghosts(insert, command);
if (jump_to_end) {
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
reinterpret_cast<OakEngineNode *>(this->sequence()),
max.numerator(), max.denominator());
}
app/widget/timelinewidget/view/timelineview.cpp
+2 -1
View File
@@ -35,6 +35,7 @@
#include "oakengine/preview.h"
#include "oakengine/timeline.h"
#include "oakengine/viewer.h"
#include "playback/playbackcontroller.h"
#include "panel/panelmanager.h"
#include "panel/timeline/timeline.h"
#include "widget/timelinewidget/cliphandle.h"
@@ -268,7 +269,7 @@ void TimelineView::mousePressEvent(QMouseEvent *event)
it++) {
if (it.value().contains(scene_pos)) {
const Rational marker_in = marker_time_range(it.key()).in();
oakengine_viewer_set_playhead(get_viewer_node(),
PlaybackController::instance()->set_playhead(get_viewer_node(),
marker_in.numerator(),
marker_in.denominator());
break;
app/widget/viewer/viewer.cpp
+7 -6
View File
@@ -47,6 +47,7 @@
#include "oakengine/display.h"
#include "widget/viewer/displaybuffer.h"
#include "oakengine/viewer.h"
#include "playback/playbackcontroller.h"
#include "oakengine/videoparams.h"
#include "panel/multicam/multicampanel.h"
#include "panel/panelmanager.h"
@@ -402,7 +403,7 @@ void ViewerWidget::ConnectNodeEvent(OakEngineNode *handle)
// Connect controls to set_playhead via facade
connect(controls_, &PlaybackControls::time_changed, this,
[handle](const Rational &time) {
oakengine_viewer_set_playhead(
PlaybackController::instance()->set_playhead(
handle, time.numerator(), time.denominator());
});
@@ -649,7 +650,7 @@ void ViewerWidget::set_gizmos(OakEngineNode *node)
void ViewerWidget::start_capture(TimelineWidget *source, const TimeRange &time,
const TrackReference &track)
{
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
time.in().numerator(), time.in().denominator());
arm_for_recording();
@@ -1349,10 +1350,10 @@ void ViewerWidget::play_internal(int speed, bool in_to_out_only)
if (!in_to_out_only &&
viewer_output_playhead(get_connected_node()) >= last_frame) {
if (speed > 0) {
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
0, 1);
} else {
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
last_frame.numerator(), last_frame.denominator());
}
}
@@ -2118,7 +2119,7 @@ void ViewerWidget::play(bool in_to_out_only)
OAKENGINE_OK &&
wa.enabled) {
// Jump to in point
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
wa.in_num, wa.in_den);
} else {
in_to_out_only = false;
@@ -2347,7 +2348,7 @@ void ViewerWidget::playback_timer_update()
// pausing. Even if we pause it later with `end_of_line`, we prefer pausing after setting the time
// so that an audio scrub event, etc. isn't sent.
time_changed_from_timer_ = true;
oakengine_viewer_set_playhead(get_connected_node(),
PlaybackController::instance()->set_playhead(get_connected_node(),
time_to_set.numerator(), time_to_set.denominator());
time_changed_from_timer_ = false;
if (end_of_line) {