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

multicam: various improvements

Browse Source
This commit is contained in:
itsmattkc
2022-10-01 16:57:46 -07:00
parent e91ae5e4df
commit 14bf515d3f
9 changed files with 142 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/multicam/multicampanel.h
+3 -5
View File
@@ -14,13 +14,11 @@ public:
MulticamWidget *GetMulticamWidget() const { return static_cast<MulticamWidget *>(GetTimeBasedWidget()); }
void SetMulticamNode(MultiCamNode *n)
public slots:
void SetMulticamNode(ViewerOutput *viewer, MultiCamNode *n, ClipBlock *clip)
{
ConnectViewerNode(viewer);
GetMulticamWidget()->SetMulticamNode(n);
}
void SetClip(ClipBlock* clip)
{
GetMulticamWidget()->SetClip(clip);
}
app/panel/viewer/viewerbase.cpp
+1
View File
@@ -100,6 +100,7 @@ void ViewerPanelBase::SetViewerWidget(ViewerWidget *vw)
connect(vw, &ViewerWidget::TextureChanged, this, &ViewerPanelBase::TextureChanged);
connect(vw, &ViewerWidget::ColorProcessorChanged, this, &ViewerPanelBase::ColorProcessorChanged);
connect(vw, &ViewerWidget::ColorManagerChanged, this, &ViewerPanelBase::ColorManagerChanged);
connect(vw, &ViewerWidget::MulticamNodeDetected, this, &ViewerPanelBase::MulticamNodeDetected);
SetTimeBasedWidget(vw);
}
app/panel/viewer/viewerbase.h
+9 -2
View File
@@ -72,9 +72,14 @@ public:
GetViewerWidget()->AddPlaybackDevice(vw);
}
void SetMulticamNode(MultiCamNode *n)
void SetTimelineSelectedBlocks(const QVector<Block*> &b)
{
GetViewerWidget()->SetMulticamNode(n);
GetViewerWidget()->SetTimelineSelectedBlocks(b);
}
void ConnectMulticamPanel(MulticamPanel *p)
{
GetViewerWidget()->ConnectMulticamPanel(p);
}
public slots:
@@ -105,6 +110,8 @@ signals:
*/
void ColorManagerChanged(ColorManager* color_manager);
void MulticamNodeDetected(ViewerOutput *viewer, MultiCamNode *n, ClipBlock *clip);
protected:
void SetViewerWidget(ViewerWidget *vw);