minor refactoring and signalling panel subtitle by node change

Fixes issue where Footage Viewer subtitle wouldn't update when
dropping footage in.
This commit is contained in:
itsmattkc
2021-04-08 10:42:13 +10:00
parent 2597eea08b
commit ea29ffef96
15 changed files with 57 additions and 49 deletions
+4 -4
View File
@@ -40,20 +40,20 @@ FootageViewerWidget::FootageViewerWidget(QWidget *parent) :
connect(controls_, &PlaybackControls::AudioPressed, this, &FootageViewerWidget::StartAudioDrag);
}
void FootageViewerWidget::ConnectNodeInternal(ViewerOutput *n)
void FootageViewerWidget::ConnectNodeEvent(ViewerOutput *n)
{
super::ConnectNodeInternal(n);
super::ConnectNodeEvent(n);
SetTimestamp(cached_timestamps_.value(n, 0));
}
void FootageViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
void FootageViewerWidget::DisconnectNodeEvent(ViewerOutput *n)
{
// Cache timestamp in case this footage is opened again later
cached_timestamps_.insert(n, GetTimestamp());
SetTimestamp(0);
super::DisconnectNodeInternal(n);
super::DisconnectNodeEvent(n);
}
void FootageViewerWidget::StartFootageDragInternal(bool enable_video, bool enable_audio)
+2 -2
View File
@@ -33,9 +33,9 @@ public:
FootageViewerWidget(QWidget* parent = nullptr);
protected:
virtual void ConnectNodeInternal(ViewerOutput *) override;
virtual void ConnectNodeEvent(ViewerOutput *) override;
virtual void DisconnectNodeInternal(ViewerOutput *) override;
virtual void DisconnectNodeEvent(ViewerOutput *) override;
private:
void StartFootageDragInternal(bool enable_video, bool enable_audio);
+3 -3
View File
@@ -175,7 +175,7 @@ void ViewerWidget::TimeChangedEvent(const int64_t &i)
last_time_ = i;
}
void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
void ViewerWidget::ConnectNodeEvent(ViewerOutput *n)
{
connect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SetViewerResolution);
connect(n, &ViewerOutput::PixelAspectChanged, this, &ViewerWidget::SetViewerPixelAspect);
@@ -217,7 +217,7 @@ void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
ForceUpdate();
}
void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
void ViewerWidget::DisconnectNodeEvent(ViewerOutput *n)
{
PauseInternal();
@@ -248,7 +248,7 @@ void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
QMetaObject::invokeMethod(this, "UpdateStack", Qt::QueuedConnection);
}
void ViewerWidget::ConnectedNodeChanged(ViewerOutput *n)
void ViewerWidget::ConnectedNodeChangeEvent(ViewerOutput *n)
{
auto_cacher_.SetViewerNode(n);
}
+3 -3
View File
@@ -151,9 +151,9 @@ protected:
virtual void TimebaseChangedEvent(const rational &) override;
virtual void TimeChangedEvent(const int64_t &) override;
virtual void ConnectNodeInternal(ViewerOutput *) override;
virtual void DisconnectNodeInternal(ViewerOutput *) override;
virtual void ConnectedNodeChanged(ViewerOutput *) override;
virtual void ConnectNodeEvent(ViewerOutput *) override;
virtual void DisconnectNodeEvent(ViewerOutput *) override;
virtual void ConnectedNodeChangeEvent(ViewerOutput *) override;
virtual void ScaleChangedEvent(const double& s) override;
+3 -3
View File
@@ -101,9 +101,10 @@ void ViewerSizer::UpdateSize()
return;
}
// If the aspect ratio is 0, the widget is always hidden
// If the aspect ratio is 0, default to taking all space
if (!width_ || !height_) {
widget_->setVisible(false);
widget_->move(0, 0);
widget_->resize(width(), height());
return;
}
@@ -142,7 +143,6 @@ void ViewerSizer::UpdateSize()
}
// Size widget to the UI space we've calculated
widget_->setVisible(true);
widget_->resize(available_width, available_height);
// Adjust to aspect ratio