implemented a footage viewer

Essentially a minor derivation of a viewer type that can automatically view
footage from the project (i.e. not in a sequence).
This commit is contained in:
itsmattkc
2019-12-30 20:17:48 +11:00
parent 55ea4a8177
commit 0db13a96ab
34 changed files with 439 additions and 152 deletions
+2
View File
@@ -18,5 +18,7 @@ set(OLIVE_SOURCES
${OLIVE_SOURCES}
panel/viewer/viewer.h
panel/viewer/viewer.cpp
panel/viewer/viewerbase.h
panel/viewer/viewerbase.cpp
PARENT_SCOPE
)
+1 -56
View File
@@ -21,7 +21,7 @@
#include "viewer.h"
ViewerPanel::ViewerPanel(QWidget *parent) :
PanelWidget(parent)
ViewerPanelBase(parent)
{
// FIXME: This won't work if there's ever more than one of this panel
setObjectName("ViewerPanel");
@@ -37,61 +37,6 @@ ViewerPanel::ViewerPanel(QWidget *parent) :
Retranslate();
}
void ViewerPanel::ZoomIn()
{
viewer_->SetScale(viewer_->scale() * 2);
}
void ViewerPanel::ZoomOut()
{
viewer_->SetScale(viewer_->scale() * 0.5);
}
void ViewerPanel::GoToStart()
{
viewer_->GoToStart();
}
void ViewerPanel::PrevFrame()
{
viewer_->PrevFrame();
}
void ViewerPanel::PlayPause()
{
viewer_->TogglePlayPause();
}
void ViewerPanel::NextFrame()
{
viewer_->NextFrame();
}
void ViewerPanel::GoToEnd()
{
viewer_->GoToEnd();
}
void ViewerPanel::ShuttleLeft()
{
viewer_->ShuttleLeft();
}
void ViewerPanel::ShuttleStop()
{
viewer_->ShuttleStop();
}
void ViewerPanel::ShuttleRight()
{
viewer_->ShuttleRight();
}
void ViewerPanel::SetTimebase(const rational &timebase)
{
viewer_->SetTimebase(timebase);
}
void ViewerPanel::ConnectViewerNode(ViewerOutput *node)
{
viewer_->ConnectViewerNode(node);
+2 -26
View File
@@ -23,39 +23,16 @@
#include <QOpenGLFunctions>
#include "widget/panel/panel.h"
#include "widget/viewer/viewer.h"
#include "viewerbase.h"
/**
* @brief Dockable wrapper around a ViewerWidget
*/
class ViewerPanel : public PanelWidget {
class ViewerPanel : public ViewerPanelBase {
Q_OBJECT
public:
ViewerPanel(QWidget* parent);
virtual void ZoomIn() override;
virtual void ZoomOut() override;
virtual void GoToStart() override;
virtual void PrevFrame() override;
virtual void PlayPause() override;
virtual void NextFrame() override;
virtual void GoToEnd() override;
virtual void ShuttleLeft() override;
virtual void ShuttleStop() override;
virtual void ShuttleRight() override;
void SetTimebase(const rational& timebase);
void ConnectViewerNode(ViewerOutput* node);
void DisconnectViewerNode();
@@ -76,7 +53,6 @@ signals:
private:
void Retranslate();
ViewerWidget* viewer_;
};
#endif // VIEWER_PANEL_H
+56
View File
@@ -0,0 +1,56 @@
#include "viewerbase.h"
ViewerPanelBase::ViewerPanelBase(QWidget *parent) :
PanelWidget(parent)
{
}
void ViewerPanelBase::ZoomIn()
{
viewer_->SetScale(viewer_->scale() * 2);
}
void ViewerPanelBase::ZoomOut()
{
viewer_->SetScale(viewer_->scale() * 0.5);
}
void ViewerPanelBase::GoToStart()
{
viewer_->GoToStart();
}
void ViewerPanelBase::PrevFrame()
{
viewer_->PrevFrame();
}
void ViewerPanelBase::PlayPause()
{
viewer_->TogglePlayPause();
}
void ViewerPanelBase::NextFrame()
{
viewer_->NextFrame();
}
void ViewerPanelBase::GoToEnd()
{
viewer_->GoToEnd();
}
void ViewerPanelBase::ShuttleLeft()
{
viewer_->ShuttleLeft();
}
void ViewerPanelBase::ShuttleStop()
{
viewer_->ShuttleStop();
}
void ViewerPanelBase::ShuttleRight()
{
viewer_->ShuttleRight();
}
+40
View File
@@ -0,0 +1,40 @@
#ifndef VIEWERPANELBASE_H
#define VIEWERPANELBASE_H
#include "widget/panel/panel.h"
#include "widget/viewer/viewer.h"
class ViewerPanelBase : public PanelWidget
{
Q_OBJECT
public:
ViewerPanelBase(QWidget* parent = nullptr);
virtual void ZoomIn() override;
virtual void ZoomOut() override;
virtual void GoToStart() override;
virtual void PrevFrame() override;
virtual void PlayPause() override;
virtual void NextFrame() override;
virtual void GoToEnd() override;
virtual void ShuttleLeft() override;
virtual void ShuttleStop() override;
virtual void ShuttleRight() override;
protected:
ViewerWidget* viewer_;
private:
};
#endif // VIEWERPANELBASE_H