finished merge of viewer and footage

2021-04-06 13:08:56 +10:00
parent 57ddae8920
commit 898ea25e89
58 changed files with 783 additions and 719 deletions
@@ -29,11 +29,11 @@ class FootageJob
 {
 public:
  FootageJob() :
-    type_(Stream::kUnknown)
+    type_(Track::kNone)
  {
  }

-  FootageJob(const QString& decoder, const QString& filename, Stream::Type type) :
+  FootageJob(const QString& decoder, const QString& filename, Track::Type type) :
    decoder_(decoder),
    filename_(filename),
    type_(type)
@@ -50,7 +50,7 @@ public:
    return filename_;
  }

-  Stream::Type type() const
+  Track::Type type() const
  {
    return type_;
  }
@@ -90,7 +90,7 @@ private:

  QString filename_;

-  Stream::Type type_;
+  Track::Type type_;

  VideoParams video_params_;