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

viewer: allow switching open sequences

Browse Source
This commit is contained in:
itsmattkc
2020-03-21 22:18:17 +11:00
parent 3c3543a2a9
commit 51f02ea01b
19 changed files with 207 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timebased/timebased.cpp
+5 -5
View File
@@ -116,7 +116,7 @@ ResizableScrollBar *TimeBasedWidget::scrollbar() const
void TimeBasedWidget::TimebaseChangedEvent(const rational &timebase)
{
TimelineScaledObject::TimebaseChangedEvent(timebase);
TimelineScaledWidget::TimebaseChangedEvent(timebase);
ruler_->SetTimebase(timebase);
@@ -125,7 +125,7 @@ void TimeBasedWidget::TimebaseChangedEvent(const rational &timebase)
void TimeBasedWidget::ScaleChangedEvent(const double &scale)
{
TimelineScaledObject::ScaleChangedEvent(scale);
TimelineScaledWidget::ScaleChangedEvent(scale);
ruler_->SetScale(scale);
@@ -166,13 +166,13 @@ void TimeBasedWidget::SetTime(int64_t timestamp)
void TimeBasedWidget::SetTimebase(const rational &timebase)
{
TimelineScaledObject::SetTimebase(timebase);
TimelineScaledWidget::SetTimebase(timebase);
}
void TimeBasedWidget::SetScale(const double &scale)
{
// Simple QObject slot wrapper around TimelineScaledObject::SetScale()
TimelineScaledObject::SetScale(scale);
// Simple QObject slot wrapper around TimelineScaledWidget::SetScale()
TimelineScaledWidget::SetScale(scale);
}
void TimeBasedWidget::ZoomIn()
app/widget/timelinewidget/tool/import.cpp
+2 -1
View File
@@ -35,6 +35,7 @@
#include "node/input/media/video/video.h"
#include "project/item/sequence/sequence.h"
#include "widget/nodeview/nodeviewundo.h"
#include "window/mainwindow/mainwindow.h"
Timeline::TrackType TrackTypeFromStreamType(Stream::Type stream_type)
{
@@ -433,6 +434,6 @@ void TimelineWidget::ImportTool::DropGhosts(bool insert)
dragged_footage_.clear();
if (open_sequence) {
Sequence::Open(open_sequence);
Core::instance()->main_window()->OpenSequence(open_sequence);
}
}