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

finished merge of viewer and footage

Browse Source
This commit is contained in:
itsmattkc
2021-04-06 13:08:56 +10:00
parent 57ddae8920
commit 898ea25e89
58 changed files with 783 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/timeline/timeline.cpp
+2 -2
View File
@@ -170,12 +170,12 @@ void TimelinePanel::SetColorLabel(int index)
static_cast<TimelineWidget*>(GetTimeBasedWidget())->SetColorLabel(index);
}
void TimelinePanel::InsertFootageAtPlayhead(const QVector<Footage *> &footage)
void TimelinePanel::InsertFootageAtPlayhead(const QVector<ViewerOutput *> &footage)
{
static_cast<TimelineWidget*>(GetTimeBasedWidget())->InsertFootageAtPlayhead(footage);
}
void TimelinePanel::OverwriteFootageAtPlayhead(const QVector<Footage *> &footage)
void TimelinePanel::OverwriteFootageAtPlayhead(const QVector<ViewerOutput *> &footage)
{
static_cast<TimelineWidget*>(GetTimeBasedWidget())->OverwriteFootageAtPlayhead(footage);
}
app/panel/timeline/timeline.h
+2 -2
View File
@@ -85,9 +85,9 @@ public:
virtual void SetColorLabel(int index) override;
void InsertFootageAtPlayhead(const QVector<Footage *> &footage);
void InsertFootageAtPlayhead(const QVector<ViewerOutput *> &footage);
void OverwriteFootageAtPlayhead(const QVector<Footage *> &footage);
void OverwriteFootageAtPlayhead(const QVector<ViewerOutput *> &footage);
protected:
virtual void Retranslate() override;