Merge branch 'move-time-to-viewer'

app/widget/curvewidget/curvewidget.cpp

@@ -59,7 +59,6 @@ CurveWidget::CurveWidget(QWidget *parent) :
   QHBoxLayout* top_controls = new QHBoxLayout();
 
   key_control_ = new NodeParamViewKeyframeControl(false);
-  connect(key_control_, &NodeParamViewKeyframeControl::RequestSetTime, this, &CurveWidget::SetTimeAndSignal);
   top_controls->addWidget(key_control_);
 
   top_controls->addStretch();
@@ -99,7 +98,6 @@ CurveWidget::CurveWidget(QWidget *parent) :
   layout->addLayout(ruler_view_layout);
 
   // Connect ruler and view together
-  connect(view_, &CurveView::TimeChanged, this, &CurveWidget::SetTimeAndSignal);
   connect(view_, &CurveView::SelectionChanged, this, &CurveWidget::SelectionChanged);
   connect(view_, &CurveView::Dragged, this, &CurveWidget::KeyframeViewDragged);
   connect(view_, &CurveView::Released, this, &CurveWidget::KeyframeViewReleased);
@@ -191,14 +189,6 @@ void CurveWidget::SetNodes(const QVector<Node *> &nodes)
   }
 }
 
-void CurveWidget::TimeChangedEvent(const rational &time)
-{
-  super::TimeChangedEvent(time);
-
-  view_->SetTime(time);
-  UpdateBridgeTime(time);
-}
-
 void CurveWidget::TimebaseChangedEvent(const rational &timebase)
 {
   super::TimebaseChangedEvent(timebase);
@@ -213,7 +203,7 @@ void CurveWidget::ScaleChangedEvent(const double &scale)
   view_->SetScale(scale);
 }
 
-void CurveWidget::TimeTargetChangedEvent(Node *target)
+void CurveWidget::TimeTargetChangedEvent(ViewerOutput *target)
 {
   TimeTargetObject::TimeTargetChangedEvent(target);
 
@@ -226,6 +216,8 @@ void CurveWidget::ConnectedNodeChangeEvent(ViewerOutput *n)
 {
   super::ConnectedNodeChangeEvent(n);
 
+  key_control_->SetTimeTarget(n);
+
   SetTimeTarget(n);
 }
 
@@ -250,11 +242,6 @@ void CurveWidget::SetKeyframeButtonCheckedFromType(NodeKeyframe::Type type)
   hold_button_->setChecked(type == NodeKeyframe::kHold);
 }
 
-void CurveWidget::UpdateBridgeTime(const rational &time)
-{
-  key_control_->SetTime(time);
-}
-
 void CurveWidget::ConnectInput(Node *node, const QString &input, int element)
 {
   if (element == -1 && node->InputIsArray(input)) {