finished merge of viewer and footage

app/node/output/viewer/viewer.h

@@ -44,7 +44,7 @@ class ViewerOutput : public Node
 {
   Q_OBJECT
 public:
-  ViewerOutput();
+  ViewerOutput(bool create_default_streams = true);
   virtual ~ViewerOutput() override;
 
   virtual Node* copy() const override;
@@ -59,7 +59,7 @@ public:
 
   void set_default_parameters();
 
-  void set_parameters_from_footage(const QVector<Footage *> footage);
+  void set_parameters_from_footage(const QVector<ViewerOutput *> footage);
 
   void ShiftVideoCache(const rational& from, const rational& to);
   void ShiftAudioCache(const rational& from, const rational& to);
@@ -67,26 +67,47 @@ public:
 
   virtual void InvalidateCache(const TimeRange& range, const QString& from, int element, qint64 job_time) override;
 
-  VideoParams video_params() const
+  VideoParams GetVideoParams(int index = 0) const
   {
-    return GetStandardValue(kVideoParamsInput).value<VideoParams>();
+    return GetStandardValue(kVideoParamsInput, index).value<VideoParams>();
   }
 
-  AudioParams audio_params() const
+  AudioParams GetAudioParams(int index = 0) const
   {
-    return GetStandardValue(kAudioParamsInput).value<AudioParams>();
+    return GetStandardValue(kAudioParamsInput, index).value<AudioParams>();
   }
 
-  void set_video_params(const VideoParams &video)
+  void SetVideoParams(const VideoParams &video, int index = 0)
   {
-    SetStandardValue(kVideoParamsInput, QVariant::fromValue(video));
+    SetStandardValue(kVideoParamsInput, QVariant::fromValue(video), index);
   }
 
-  void set_audio_params(const AudioParams &audio)
+  void SetAudioParams(const AudioParams &audio, int index = 0)
   {
-    SetStandardValue(kAudioParamsInput, QVariant::fromValue(audio));
+    SetStandardValue(kAudioParamsInput, QVariant::fromValue(audio), index);
   }
 
+  int GetVideoStreamCount() const
+  {
+    return InputArraySize(kVideoParamsInput);
+  }
+
+  int GetAudioStreamCount() const
+  {
+    return InputArraySize(kAudioParamsInput);
+  }
+
+  int GetTotalStreamCount() const
+  {
+    return GetVideoStreamCount() + GetAudioStreamCount();
+  }
+
+  bool HasEnabledVideoStreams() const;
+  bool HasEnabledAudioStreams() const;
+
+  VideoParams GetFirstEnabledVideoStream() const;
+  AudioParams GetFirstEnabledAudioStream() const;
+
   const rational &GetLength() const;
 
   FrameHashCache* video_frame_cache()
@@ -104,12 +125,22 @@ public:
     return &timeline_points_;
   }
 
+  QVector<Track::Reference> GetEnabledStreamsAsReferences() const;
+
+  QVector<VideoParams> GetEnabledVideoStreams() const;
+
+  QVector<AudioParams> GetEnabledAudioStreams() const;
+
   virtual void Retranslate() override;
 
   virtual void BeginOperation() override;
 
   virtual void EndOperation() override;
 
+  virtual NodeOutput GetConnectedTextureOutput();
+
+  virtual NodeOutput GetConnectedSampleOutput();
+
   static const QString kVideoParamsInput;
   static const QString kAudioParamsInput;
 
@@ -154,6 +185,8 @@ protected:
 
   virtual void SaveCustom(QXmlStreamWriter *writer) const override;
 
+  int AddStream(Track::Type type, const QVariant &value);
+
 private:
   rational last_length_;
 
@@ -167,6 +200,9 @@ private:
 
   TimelinePoints timeline_points_;
 
+private slots:
+  void InputResized(const QString& input, int old_size, int new_size);
+
 };
 
 }