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/widget/viewer/viewer.h
+1 -5
View File
@@ -63,8 +63,6 @@ public:
bool IsPlaying() const;
void ConnectViewerNode(ViewerOutput *node, ColorManager *color_manager = nullptr);
/**
* @brief Enable or disable the color management menu
*
@@ -155,7 +153,7 @@ protected:
virtual void ConnectNodeInternal(ViewerOutput *) override;
virtual void DisconnectNodeInternal(ViewerOutput *) override;
virtual void ConnectedNodeChanged(ViewerOutput*n) override;
virtual void ConnectedNodeChanged(ViewerOutput *) override;
virtual void ScaleChangedEvent(const double& s) override;
@@ -217,8 +215,6 @@ private:
bool color_menu_enabled_;
ColorManager* override_color_manager_;
bool time_changed_from_timer_;
bool play_in_to_out_only_;