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

Merge branch 'move-time-to-viewer'

Browse Source
This commit is contained in:
itsmattkc
2022-11-01 18:20:22 -07:00
parent d52d5b13b2 3978a8501a
commit 451de7030b
49 changed files with 297 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/timebased/timebased.cpp
-14
View File
@@ -34,11 +34,6 @@ TimeBasedPanel::~TimeBasedPanel()
delete widget_;
}
rational TimeBasedPanel::GetTime()
{
return widget_->GetTime();
}
const rational& TimeBasedPanel::timebase()
{
return widget_->timebase();
@@ -79,11 +74,6 @@ void TimeBasedPanel::SetTimebase(const rational &timebase)
widget_->SetTimebase(timebase);
}
void TimeBasedPanel::SetTime(const rational &time)
{
widget_->SetTime(time);
}
void TimeBasedPanel::GoToPrevCut()
{
widget_->GoToPrevCut();
@@ -127,16 +117,12 @@ void TimeBasedPanel::ConnectViewerNode(ViewerOutput *node)
void TimeBasedPanel::SetTimeBasedWidget(TimeBasedWidget *widget)
{
if (widget_) {
disconnect(widget_, &TimeBasedWidget::TimeChanged, this, &TimeBasedPanel::TimeChanged);
disconnect(widget_, &TimeBasedWidget::TimebaseChanged, this, &TimeBasedPanel::TimebaseChanged);
disconnect(widget_, &TimeBasedWidget::ConnectedNodeChanged, this, &TimeBasedPanel::ConnectedNodeChanged);
}
widget_ = widget;
if (widget_) {
connect(widget_, &TimeBasedWidget::TimeChanged, this, &TimeBasedPanel::TimeChanged);
connect(widget_, &TimeBasedWidget::TimebaseChanged, this, &TimeBasedPanel::TimebaseChanged);
connect(widget_, &TimeBasedWidget::ConnectedNodeChanged, this, &TimeBasedPanel::ConnectedNodeChanged);
}
app/panel/timebased/timebased.h
-8
View File
@@ -41,8 +41,6 @@ public:
ConnectViewerNode(nullptr);
}
rational GetTime();
// Get the timebase of this panels widget
const rational& timebase();
@@ -113,13 +111,7 @@ public:
public slots:
void SetTimebase(const rational& timebase);
void SetTime(const rational &time);
signals:
void TimeChanged(const rational& time);
void TimebaseChanged(const rational& timebase);
void PlayPauseRequested();
void PlayInToOutRequested();