Merge branch 'move-time-to-viewer'

app/node/output/viewer/viewer.cpp

@@ -316,6 +316,12 @@ void ViewerOutput::VerifyLength()
   }
 }
 
+void ViewerOutput::SetPlayhead(const rational &t)
+{
+  playhead_ = t;
+  emit PlayheadChanged(t);
+}
+
 void ViewerOutput::InputConnectedEvent(const QString &input, int element, Node *output)
 {
   if (input == kTextureInput) {

app/node/output/viewer/viewer.h

@@ -97,6 +97,8 @@ public:
     }
   }
 
+  const rational &GetPlayhead() { return playhead_; }
+
   void SetVideoParams(const VideoParams &video, int index = 0)
   {
     SetStandardValue(kVideoParamsInput, QVariant::fromValue(video), index);
@@ -219,9 +221,13 @@ signals:
 
   void ConnectedWaveformChanged();
 
+  void PlayheadChanged(const rational &t);
+
 public slots:
   void VerifyLength();
 
+  void SetPlayhead(const rational &t);
+
 protected:
   virtual void InputConnectedEvent(const QString &input, int element, Node *output) override;
 
@@ -253,6 +259,8 @@ private:
 
   bool waveform_requests_enabled_;
 
+  rational playhead_;
+
 };
 
 }