began merging footage and viewer

This commit is contained in:
itsmattkc
2021-04-05 16:41:37 +10:00
parent da4a93f1a5
commit 4066fcba90
26 changed files with 162 additions and 419 deletions
-8
View File
@@ -48,8 +48,6 @@ public:
ViewerOutput* GetConnectedNode() const;
TimelinePoints* GetConnectedTimelinePoints() const;
void ConnectViewerNode(ViewerOutput *node);
void SetScaleAndCenterOnPlayhead(const double& scale);
@@ -117,10 +115,6 @@ protected:
virtual void resizeEvent(QResizeEvent *event) override;
virtual TimelinePoints* GetTimelinePointsToConnect();
virtual Project* GetTimelinePointsProject();
void ConnectTimelineView(TimeBasedView* base, bool connect_time_change_event = true);
void PassWheelEventsToScrollBar(QObject* object);
@@ -197,8 +191,6 @@ private:
bool auto_max_scrollbar_;
TimelinePoints* points_;
QList<TimeBasedView*> timeline_views_;
bool toggle_show_all_;