From 6ebe0084a3f0f27c7525212af3a993828d384709 Mon Sep 17 00:00:00 2001
From: Troy James Sobotka <troy.sobotka@gmail.com>
Date: Mon, 11 May 2020 16:07:15 -0700
Subject: [PATCH 001/138] Implement Histogram

Basic pass at histogram. Uses a power based
scale compared against the total pixel count.
Probably needs a UI toggle to flip lines on
and off as the text and lines in OpenGL are
a large cycles sucker. Could be likely much
faster when migrated to a geometry shader
approach. Uses the scaled viewport resolution
to increase performance as much as possible.
---
 app/shaders/rgbhistogram.frag            |  37 +++++
 app/shaders/rgbhistogram.vert            |  29 ++++
 app/shaders/rgbhistogram_secondary.frag  |  35 +++++
 app/shaders/rgbwaveform.frag             |  60 +++-----
 app/widget/scope/histogram/histogram.cpp | 171 ++++++++++++++++++++++-
 app/widget/scope/histogram/histogram.h   |  17 ++-
 app/widget/scope/scopebase/scopebase.h   |   2 +-
 app/widget/scope/waveform/waveform.cpp   |  11 +-
 8 files changed, 314 insertions(+), 48 deletions(-)
 create mode 100644 app/shaders/rgbhistogram.frag
 create mode 100644 app/shaders/rgbhistogram.vert
 create mode 100644 app/shaders/rgbhistogram_secondary.frag

diff --git a/app/shaders/rgbhistogram.frag b/app/shaders/rgbhistogram.frag
new file mode 100644
index 000000000..435949138
--- /dev/null
+++ b/app/shaders/rgbhistogram.frag
@@ -0,0 +1,37 @@
+#version 150
+
+uniform sampler2D ove_maintex;
+uniform vec2 ove_resolution;
+uniform vec2 ove_viewport;
+
+uniform float histogram_scale;
+
+in vec2 ove_texcoord;
+
+out vec4 fragColor;
+
+void main(void) {
+    float histogram_width = ceil(histogram_scale * ove_viewport.y);
+    float quantisation = 1.0 / (histogram_width - 1.0);
+    vec3 cur_col = vec3(0.0);
+    vec3 sum = vec3(0.0);
+    float ratio = 0.0;
+
+    for (int i = 0; i < histogram_width; i++) {
+        ratio = float(i) / float(histogram_width - 1);
+        cur_col = texture(
+            ove_maintex,
+            vec2(ove_texcoord.y, ratio)
+        ).rgb;
+
+        sum += step(vec3(ove_texcoord.x - quantisation), cur_col) *
+            step(cur_col, vec3(ove_texcoord.x + quantisation)) +
+            (
+                // Account for values beyond the upper x limit.
+                step(1.0 - quantisation, ove_texcoord.x) *
+                step(vec3(1.0 - quantisation), cur_col)
+            );
+    }
+
+    fragColor = vec4(sum, 1.0);
+}
diff --git a/app/shaders/rgbhistogram.vert b/app/shaders/rgbhistogram.vert
new file mode 100644
index 000000000..92536144c
--- /dev/null
+++ b/app/shaders/rgbhistogram.vert
@@ -0,0 +1,29 @@
+#version 150
+
+uniform float histogram_scale;
+uniform vec2 ove_resolution;
+
+in vec4 a_position;
+in vec2 a_texcoord;
+
+out vec2 ove_texcoord;
+
+mat4 scale_mat4(vec3 scale) {
+    return mat4(
+        scale.x, 0.0, 0.0, 0.0,
+        0.0, scale.y, 0.0, 0.0,
+        0.0, 0.0, scale.z, 0.0,
+        0.0, 0.0, 0.0, 1.0
+    );
+}
+
+void main() {
+    // Create identity matrix
+    mat4 transform = mat4(1.0);
+
+    // Scale the scope
+    transform *= scale_mat4(vec3(histogram_scale, histogram_scale, 1.0));
+
+    gl_Position = transform * a_position;
+    ove_texcoord = a_texcoord;
+}
\ No newline at end of file
diff --git a/app/shaders/rgbhistogram_secondary.frag b/app/shaders/rgbhistogram_secondary.frag
new file mode 100644
index 000000000..474db6b74
--- /dev/null
+++ b/app/shaders/rgbhistogram_secondary.frag
@@ -0,0 +1,35 @@
+#version 150
+
+uniform sampler2D ove_maintex;
+uniform vec2 ove_resolution;
+uniform vec2 ove_viewport;
+
+uniform float histogram_scale;
+uniform float histogram_power;
+
+in vec2 ove_texcoord;
+
+out vec4 fragColor;
+
+void main(void) {
+    vec3 col = vec3(0.0);
+    float histogram_height = ceil(ove_viewport.y * histogram_scale);
+    vec3 histogram_ratio = vec3(0.0);
+    vec3 sum = vec3(0.0);
+    float ratio = 0.0;
+    vec3 total_pixels = vec3(ceil(ove_viewport.x * ove_resolution.y *
+        histogram_scale));
+
+    for (int i = 0; i < histogram_height; i++) {
+        ratio = float(i) / float(histogram_height - 1.0);
+        sum += texture(
+            ove_maintex,
+            vec2(ove_texcoord.x, ratio)
+        ).rgb;
+    }
+
+    histogram_ratio = pow(sum / total_pixels, vec3(histogram_power));
+    col = step(vec3(ove_texcoord.y), histogram_ratio);
+
+    fragColor = vec4(col, 1.0);
+}
diff --git a/app/shaders/rgbwaveform.frag b/app/shaders/rgbwaveform.frag
index 4e6b13f08..ab677523f 100644
--- a/app/shaders/rgbwaveform.frag
+++ b/app/shaders/rgbwaveform.frag
@@ -1,6 +1,3 @@
-// Adapted from "RGB Waveform" by lebek
-// https://www.shadertoy.com/view/4dK3Wc
-
 #version 150
 
 uniform sampler2D ove_maintex;
@@ -11,33 +8,14 @@ uniform vec3 luma_coeffs;
 uniform float waveform_scale;
 uniform vec2 waveform_dims;
 uniform vec4 waveform_region;
-uniform vec4 waveform_uv;
+uniform vec4 waveform_region_uv;
 
 in vec2 ove_texcoord;
 
 out vec4 fragColor;
 
 void main(void) {
-    vec3 col = vec3(0.0);
-    // Set an increment default to 10 bit encodings. This would likely be
-    // better served as a UI control, as waveforms will change their combing
-    // based on how granular the increment is set. For example, it can be
-    // challenging to spot 8 bit combing with an increment of 1. / 2.^8 - 1.
-    float increment = 1.0 / (pow(2, 10) - 1.0);
-    float maxb = waveform_dims.y + increment;
-    float minb = waveform_dims.y - increment;
-
-    // Intensity would make sense to also expose via the UI, as a density
-    // slider allows you to peek past certain values or reveal very low
-    // values. Hard coding it for now, as there isn't a clear way to have
-    // the various bit depth / code values always display at a consistent
-    // emission output strength.
-    float intensity = 0.10;
-
-    int y_lim = int(waveform_dims.y);
-
-    vec3 cur_col = vec3(0.0);
-    vec3 cur_lum = vec3(0.0);
+    vec4 col = vec4(0.0);
 
     if (
         (gl_FragCoord.x >= waveform_region.x) &&
@@ -45,28 +23,34 @@ void main(void) {
         (gl_FragCoord.x < waveform_region.z) &&
         (gl_FragCoord.y < waveform_region.w)
     ) {
-        // col = vec3(0.5, 0.5, 0.0);
-        // int start = int(waveform_region.y);
-        int stop = int(waveform_dims.y);
+        float increment = 0.5;
+        float uv_increment = increment / (ove_viewport.y - 1.0);
+        float intensity = 0.10;
+        vec4 cur_col = vec4(0.0);
         float ratio = 0.0;
-        float waveform_x = (ove_texcoord.x - waveform_uv.x) / waveform_scale;
-        float waveform_y = (ove_texcoord.y - waveform_uv.y) / waveform_scale;
+        vec2 waveform_current_uv = vec2(
+            (ove_texcoord.x - waveform_region_uv.x) / waveform_scale,
+            (ove_texcoord.y - waveform_region_uv.y) / waveform_scale
+        );
+
         for (int i = 0; i < waveform_dims.y; i++) {
             ratio = float(i) / float(waveform_dims.y - 1);
-            cur_col = texture(
+            cur_col.rgb = texture(
                 ove_maintex,
-                vec2(waveform_x, ratio)
+                vec2(waveform_current_uv.x, ratio)
             ).rgb;
 
-            col += step(vec3(waveform_y - increment), cur_col) *
-                step(cur_col, vec3(waveform_y + increment)) * intensity;
+            cur_col.w = dot(cur_col.rgb, luma_coeffs);
 
-            cur_lum = vec3(dot(cur_col, luma_coeffs));
-
-            col += step(vec3(waveform_y - increment), cur_lum) *
-                step(cur_lum, vec3(waveform_y + increment)) * intensity;
+            col += (
+                step(vec4(waveform_current_uv.y - uv_increment), cur_col) *
+                step(cur_col, vec4(waveform_current_uv.y + uv_increment)) *
+                intensity) +
+                (step(1.0 - uv_increment, waveform_current_uv.y) *
+                step(vec4(1.0 - uv_increment), cur_col) * intensity);
         }
     }
 
-    fragColor = vec4(col, 1.0);
+    col.rgb += vec3(col.w);
+    fragColor = vec4(col.rgb, 1.0);
 }
diff --git a/app/widget/scope/histogram/histogram.cpp b/app/widget/scope/histogram/histogram.cpp
index 9665e32de..be96bb2bd 100644
--- a/app/widget/scope/histogram/histogram.cpp
+++ b/app/widget/scope/histogram/histogram.cpp
@@ -23,8 +23,9 @@
 #include <QPainter>
 #include <QtMath>
 
-#include "common/clamp.h"
-#include "common/functiontimer.h"
+#include "common/qtutils.h"
+#include "node/node.h"
+#include "render/backend/opengl/openglrenderfunctions.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -33,4 +34,170 @@ HistogramScope::HistogramScope(QWidget* parent) :
 {
 }
 
+HistogramScope::~HistogramScope()
+{
+  CleanUp();
+
+  if (context()) {
+    disconnect(context(), &QOpenGLContext::aboutToBeDestroyed, this,
+      &HistogramScope::CleanUp);
+  }
+}
+
+void HistogramScope::initializeGL()
+{
+  ScopeBase::initializeGL();
+
+  pipeline_secondary_ = CreateSecondaryShader();
+
+  connect(context(), &QOpenGLContext::aboutToBeDestroyed, this,
+    &HistogramScope::CleanUp, Qt::DirectConnection);
+}
+
+void HistogramScope::AssertAdditionalTextures()
+{
+  if (!texture_row_sums_.IsCreated()
+        || texture_row_sums_.width() != width()
+        || texture_row_sums_.height() != height()) {
+    texture_row_sums_.Destroy();
+    texture_row_sums_.Create(context(), VideoRenderingParams(width(),
+      height(), managed_tex_.format()));
+  }
+}
+
+void HistogramScope::CleanUp()
+{
+  makeCurrent();
+
+  pipeline_secondary_ = nullptr;
+  texture_row_sums_.Destroy();
+
+  doneCurrent();
+}
+
+OpenGLShaderPtr HistogramScope::CreateShader()
+{
+  OpenGLShaderPtr pipeline = OpenGLShader::Create();
+
+  pipeline->create();
+  pipeline->addShaderFromSourceCode(QOpenGLShader::Vertex,
+     OpenGLShader::CodeDefaultVertex());
+  pipeline->addShaderFromSourceCode(QOpenGLShader::Fragment,
+    Node::ReadFileAsString(":/shaders/rgbhistogram.frag"));
+  pipeline->link();
+
+  return pipeline;
+}
+
+OpenGLShaderPtr HistogramScope::CreateSecondaryShader()
+{
+  OpenGLShaderPtr pipeline_secondary_ = OpenGLShader::Create();
+
+  pipeline_secondary_->create();
+  pipeline_secondary_->addShaderFromSourceCode(QOpenGLShader::Vertex,
+    Node::ReadFileAsString(":/shaders/rgbhistogram.vert"));
+  pipeline_secondary_->addShaderFromSourceCode(QOpenGLShader::Fragment,
+    Node::ReadFileAsString(":/shaders/rgbhistogram_secondary.frag"));
+  pipeline_secondary_->link();
+
+  return pipeline_secondary_;
+}
+
+void HistogramScope::DrawScope()
+{
+  float histogram_scale = 0.80f;
+  // This value is eyeballed for usefulness. Until we have a geometry
+  // shader approach, it is impossible to normalize against a peak
+  // sum of image values.
+  float histogram_base = 2.5f;
+  float histogram_power = 1.0f / histogram_base;
+
+  pipeline()->bind();
+  pipeline()->setUniformValue("ove_resolution", managed_tex().width(),
+    managed_tex().height());
+  pipeline()->setUniformValue("ove_viewport", width(), height());
+  pipeline()->setUniformValue("histogram_scale", histogram_scale);
+  pipeline()->release();
+
+  AssertAdditionalTextures();
+
+  framebuffer_.Attach(&texture_row_sums_, true);
+  framebuffer_.Bind();
+
+  managed_tex().Bind();
+
+  OpenGLRenderFunctions::Blit(pipeline());
+
+  managed_tex().Release();
+
+  framebuffer_.Release();
+  framebuffer_.Detach();
+
+  pipeline_secondary_->bind();
+  pipeline_secondary_->setUniformValue("ove_resolution",
+    texture_row_sums_.width(), texture_row_sums_.height());
+  pipeline_secondary_->setUniformValue("ove_viewport", width(), height());
+  pipeline_secondary_->setUniformValue("histogram_scale", histogram_scale);
+  pipeline_secondary_->setUniformValue("histogram_power", histogram_power);
+  pipeline_secondary_->release();
+
+  texture_row_sums_.Bind();
+
+  OpenGLRenderFunctions::Blit(pipeline_secondary_);
+
+  texture_row_sums_.Release();
+
+  // Draw line overlays
+  QPainter p(this);
+  QFont font = p.font();
+  font.setPixelSize(10);
+  QFontMetrics font_metrics = QFontMetrics(font);
+  QString label;
+  std::vector<float> histogram_increments = {
+    0.00,
+    0.25,
+    0.50,
+    1.0
+  };
+
+  int histogram_steps = histogram_increments.size();
+  QVector<QLine> histogram_lines(histogram_steps + 1);
+  int font_x_offset = 0;
+  int font_y_offset = font_metrics.capHeight() / 2.0f;
+
+  p.setCompositionMode(QPainter::CompositionMode_Plus);
+
+  p.setPen(QColor(0.0, 0.6 * 255.0, 0.0));
+  p.setFont(font);
+
+  float histogram_dim_x = ceil((width() - 1.0) * histogram_scale);
+  float histogram_dim_y = ceil((height() - 1.0) * histogram_scale);
+  float histogram_start_dim_x =
+    ((width() - 1.0) - histogram_dim_x) / 2.0f;
+  float histogram_start_dim_y =
+    ((height() - 1.0) - histogram_dim_y) / 2.0f;
+  float histogram_end_dim_x = (width() - 1.0) - histogram_start_dim_x;
+
+  // for (int i=0; i <= histogram_steps; i++) {
+  for(std::vector<float>::iterator it = histogram_increments.begin();
+    it != histogram_increments.end(); it++) {
+    histogram_lines[it - histogram_increments.begin()].setLine(
+      histogram_start_dim_x,
+      (histogram_dim_y * pow(1.0 - *it, histogram_base)) +
+        histogram_start_dim_y,
+      histogram_end_dim_x,
+      (histogram_dim_y * pow(1.0 - *it, histogram_base)) +
+        histogram_start_dim_y);
+      label = QString::number(
+        *it * 100, 'f', 1) + "%";
+      font_x_offset = QFontMetricsWidth(font_metrics, label) + 4;
+
+      p.drawText(
+        histogram_start_dim_x - font_x_offset,
+        (histogram_dim_y * pow(1.0 - *it, histogram_base)) +
+          histogram_start_dim_y + font_y_offset, label);
+  }
+  p.drawLines(histogram_lines);
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/scope/histogram/histogram.h b/app/widget/scope/histogram/histogram.h
index 625074a89..70751355f 100644
--- a/app/widget/scope/histogram/histogram.h
+++ b/app/widget/scope/histogram/histogram.h
@@ -31,11 +31,24 @@ class HistogramScope : public ScopeBase
 public:
   HistogramScope(QWidget* parent = nullptr);
 
+  virtual ~HistogramScope() override;
+
 protected:
-  //virtual OpenGLShaderPtr CreateShader() override;
+  virtual void initializeGL() override;
 
-  //virtual void DrawScope() override;
+  virtual OpenGLShaderPtr CreateShader() override;
+  OpenGLShaderPtr CreateSecondaryShader();
 
+  void AssertAdditionalTextures();
+
+  virtual void DrawScope() override;
+
+private:
+  OpenGLShaderPtr pipeline_secondary_;
+  OpenGLTexture texture_row_sums_;
+
+private slots:
+  void CleanUp();
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/scope/scopebase/scopebase.h b/app/widget/scope/scopebase/scopebase.h
index 3098af212..cec2256b1 100644
--- a/app/widget/scope/scopebase/scopebase.h
+++ b/app/widget/scope/scopebase/scopebase.h
@@ -55,7 +55,7 @@ protected:
 
   OpenGLTexture& managed_tex();
 
-private:
+protected:
   void UploadTextureFromBuffer();
 
   OpenGLShaderPtr pipeline_;
diff --git a/app/widget/scope/waveform/waveform.cpp b/app/widget/scope/waveform/waveform.cpp
index daefe84e7..78e054836 100644
--- a/app/widget/scope/waveform/waveform.cpp
+++ b/app/widget/scope/waveform/waveform.cpp
@@ -76,12 +76,13 @@ void WaveformScope::DrawScope()
     waveform_start_dim_x, waveform_start_dim_y,
     waveform_end_dim_x, waveform_end_dim_y);
 
-  float waveform_start_uv_x = waveform_start_dim_x / width();
-  float waveform_start_uv_y = waveform_start_dim_y / height();
-  float waveform_end_uv_x = waveform_end_dim_x / width();
-  float waveform_end_uv_y = waveform_end_dim_y / height();
+  float waveform_start_uv_x = (waveform_start_dim_x - 1.0) / (width() - 1.0);
+  float waveform_start_uv_y = (waveform_start_dim_y - 1.0) / (height() - 1.0);
+  float waveform_end_uv_x = (waveform_end_dim_x - 1.0) / (width() - 1.0);
+  float waveform_end_uv_y = (waveform_end_dim_y - 1.0) / (height() - 1.0);
+
   pipeline()->setUniformValue(
-    "waveform_uv",
+    "waveform_region_uv",
     waveform_start_uv_x, waveform_start_uv_y,
     waveform_end_uv_x, waveform_end_uv_y);
 

From 80badaa5a81ab9f99302e6b89a479e0860df8988 Mon Sep 17 00:00:00 2001
From: Troy James Sobotka <troy.sobotka@gmail.com>
Date: Mon, 11 May 2020 16:07:15 -0700
Subject: [PATCH 002/138] Waveform Fixes and Modifications

Fixes:
 * Values exceeding the encoded range.
   Future may account for a certain range
   above and below current values.
 * Minor calculation problem that prevented
   the above fix from working properly.
 * Streamlined the shader code.
 * Add a vertex shader to handle the scaling.
 * Use the viewport resolution as the scaled
   version to save performance.
---
 app/shaders/rgbwaveform.frag           | 71 ++++++++------------------
 app/shaders/rgbwaveform.vert           | 29 +++++++++++
 app/widget/scope/waveform/waveform.cpp | 42 ++++++---------
 3 files changed, 65 insertions(+), 77 deletions(-)
 create mode 100644 app/shaders/rgbwaveform.vert

diff --git a/app/shaders/rgbwaveform.frag b/app/shaders/rgbwaveform.frag
index 4e6b13f08..e568b37cd 100644
--- a/app/shaders/rgbwaveform.frag
+++ b/app/shaders/rgbwaveform.frag
@@ -1,6 +1,3 @@
-// Adapted from "RGB Waveform" by lebek
-// https://www.shadertoy.com/view/4dK3Wc
-
 #version 150
 
 uniform sampler2D ove_maintex;
@@ -9,64 +6,36 @@ uniform vec2 ove_viewport;
 uniform vec3 luma_coeffs;
 
 uniform float waveform_scale;
-uniform vec2 waveform_dims;
-uniform vec4 waveform_region;
-uniform vec4 waveform_uv;
 
 in vec2 ove_texcoord;
 
 out vec4 fragColor;
 
 void main(void) {
-    vec3 col = vec3(0.0);
-    // Set an increment default to 10 bit encodings. This would likely be
-    // better served as a UI control, as waveforms will change their combing
-    // based on how granular the increment is set. For example, it can be
-    // challenging to spot 8 bit combing with an increment of 1. / 2.^8 - 1.
-    float increment = 1.0 / (pow(2, 10) - 1.0);
-    float maxb = waveform_dims.y + increment;
-    float minb = waveform_dims.y - increment;
-
-    // Intensity would make sense to also expose via the UI, as a density
-    // slider allows you to peek past certain values or reveal very low
-    // values. Hard coding it for now, as there isn't a clear way to have
-    // the various bit depth / code values always display at a consistent
-    // emission output strength.
+    float waveform_height = ceil(waveform_scale * ove_viewport.y);
+    float quantisation = 1.0 / (waveform_height - 1.0);
     float intensity = 0.10;
+    vec4 col = vec4(0.0);
+    vec4 cur_col = vec4(0.0);
+    float ratio = 0.0;
 
-    int y_lim = int(waveform_dims.y);
+    for (int i = 0; i < waveform_height; i++) {
+        ratio = float(i) / float(waveform_height - 1.0);
+        cur_col.rgb = texture(
+            ove_maintex,
+            vec2(ove_texcoord.x, ratio)
+        ).rgb;
 
-    vec3 cur_col = vec3(0.0);
-    vec3 cur_lum = vec3(0.0);
+        cur_col.w = dot(cur_col.rgb, luma_coeffs);
 
-    if (
-        (gl_FragCoord.x >= waveform_region.x) &&
-        (gl_FragCoord.y >= waveform_region.y) &&
-        (gl_FragCoord.x < waveform_region.z) &&
-        (gl_FragCoord.y < waveform_region.w)
-    ) {
-        // col = vec3(0.5, 0.5, 0.0);
-        // int start = int(waveform_region.y);
-        int stop = int(waveform_dims.y);
-        float ratio = 0.0;
-        float waveform_x = (ove_texcoord.x - waveform_uv.x) / waveform_scale;
-        float waveform_y = (ove_texcoord.y - waveform_uv.y) / waveform_scale;
-        for (int i = 0; i < waveform_dims.y; i++) {
-            ratio = float(i) / float(waveform_dims.y - 1);
-            cur_col = texture(
-                ove_maintex,
-                vec2(waveform_x, ratio)
-            ).rgb;
-
-            col += step(vec3(waveform_y - increment), cur_col) *
-                step(cur_col, vec3(waveform_y + increment)) * intensity;
-
-            cur_lum = vec3(dot(cur_col, luma_coeffs));
-
-            col += step(vec3(waveform_y - increment), cur_lum) *
-                step(cur_lum, vec3(waveform_y + increment)) * intensity;
-        }
+        col += (
+            step(vec4(ove_texcoord.y - quantisation), cur_col) *
+            step(cur_col, vec4(ove_texcoord.y + quantisation)) *
+            intensity) +
+            (step(1.0 - quantisation, ove_texcoord.y) *
+            step(vec4(1.0 - quantisation), cur_col) * intensity);
     }
 
-    fragColor = vec4(col, 1.0);
+    col.rgb += vec3(col.w);
+    fragColor = vec4(col.rgb, 1.0);
 }
diff --git a/app/shaders/rgbwaveform.vert b/app/shaders/rgbwaveform.vert
new file mode 100644
index 000000000..88fde9934
--- /dev/null
+++ b/app/shaders/rgbwaveform.vert
@@ -0,0 +1,29 @@
+#version 150
+
+uniform float waveform_scale;
+uniform vec2 ove_resolution;
+
+in vec4 a_position;
+in vec2 a_texcoord;
+
+out vec2 ove_texcoord;
+
+mat4 scale_mat4(vec3 scale) {
+    return mat4(
+        scale.x, 0.0, 0.0, 0.0,
+        0.0, scale.y, 0.0, 0.0,
+        0.0, 0.0, scale.z, 0.0,
+        0.0, 0.0, 0.0, 1.0
+    );
+}
+
+void main() {
+    // Create identity matrix
+    mat4 transform = mat4(1.0);
+
+    // Scale the scope
+    transform *= scale_mat4(vec3(waveform_scale, waveform_scale, 1.0));
+
+    gl_Position = transform * a_position;
+    ove_texcoord = a_texcoord;
+}
\ No newline at end of file
diff --git a/app/widget/scope/waveform/waveform.cpp b/app/widget/scope/waveform/waveform.cpp
index daefe84e7..ff4f1296b 100644
--- a/app/widget/scope/waveform/waveform.cpp
+++ b/app/widget/scope/waveform/waveform.cpp
@@ -41,8 +41,10 @@ OpenGLShaderPtr WaveformScope::CreateShader()
   OpenGLShaderPtr pipeline = OpenGLShader::Create();
 
   pipeline->create();
-  pipeline->addShaderFromSourceCode(QOpenGLShader::Vertex, OpenGLShader::CodeDefaultVertex());
-  pipeline->addShaderFromSourceCode(QOpenGLShader::Fragment, Node::ReadFileAsString(":/shaders/rgbwaveform.frag"));
+  pipeline->addShaderFromSourceCode(QOpenGLShader::Vertex,
+    Node::ReadFileAsString(":/shaders/rgbwaveform.vert"));
+  pipeline->addShaderFromSourceCode(QOpenGLShader::Fragment,
+    Node::ReadFileAsString(":/shaders/rgbwaveform.frag"));
   pipeline->link();
 
   return pipeline;
@@ -51,12 +53,6 @@ OpenGLShaderPtr WaveformScope::CreateShader()
 void WaveformScope::DrawScope()
 {
   float waveform_scale = 0.80f;
-  float waveform_dim_x = width() * waveform_scale;
-  float waveform_dim_y = height() * waveform_scale;
-  float waveform_start_dim_x = (width() - waveform_dim_x) / 2.0f;
-  float waveform_start_dim_y = (height() - waveform_dim_y) / 2.0f;
-  float waveform_end_dim_x = width() - waveform_start_dim_x;
-  float waveform_end_dim_y = height() - waveform_start_dim_y;
 
   // Draw waveform through shader
   pipeline()->bind();
@@ -68,22 +64,6 @@ void WaveformScope::DrawScope()
 
   // Scale of the waveform relative to the viewport surface.
   pipeline()->setUniformValue("waveform_scale", waveform_scale);
-  pipeline()->setUniformValue(
-    "waveform_dims", waveform_dim_x, waveform_dim_y);
-
-  pipeline()->setUniformValue(
-    "waveform_region",
-    waveform_start_dim_x, waveform_start_dim_y,
-    waveform_end_dim_x, waveform_end_dim_y);
-
-  float waveform_start_uv_x = waveform_start_dim_x / width();
-  float waveform_start_uv_y = waveform_start_dim_y / height();
-  float waveform_end_uv_x = waveform_end_dim_x / width();
-  float waveform_end_uv_y = waveform_end_dim_y / height();
-  pipeline()->setUniformValue(
-    "waveform_uv",
-    waveform_start_uv_x, waveform_start_uv_y,
-    waveform_end_uv_x, waveform_end_uv_y);
 
   pipeline()->release();
 
@@ -93,9 +73,19 @@ void WaveformScope::DrawScope()
 
   managed_tex().Release();
 
+  float waveform_dim_x = ceil((width() - 1.0) * waveform_scale);
+  float waveform_dim_y = ceil((height() - 1.0) * waveform_scale);
+  float waveform_start_dim_x =
+    ((width() - 1.0) - waveform_dim_x) / 2.0f;
+  float waveform_start_dim_y =
+    ((height() - 1.0) - waveform_dim_y) / 2.0f;
+  float waveform_end_dim_x = (width() - 1.0) - waveform_start_dim_x;
+
   // Draw line overlays
   QPainter p(this);
-  QFontMetrics font_metrics = QFontMetrics(QFont());
+  QFont font;
+  font.setPixelSize(10);
+  QFontMetrics font_metrics = QFontMetrics(font);
   QString label;
   float ire_increment = 0.1f;
   int ire_steps = qRound(1.0 / ire_increment);
@@ -106,7 +96,7 @@ void WaveformScope::DrawScope()
   p.setCompositionMode(QPainter::CompositionMode_Plus);
 
   p.setPen(QColor(0.0, 0.6 * 255.0, 0.0));
-  p.setFont(QFont());
+  p.setFont(font);
 
   for (int i=0; i <= ire_steps; i++) {
     ire_lines[i].setLine(

From 67ee78ac9ac76a1d5f3545c7ad417f53916c330e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 16 Jun 2020 17:48:10 +1000
Subject: [PATCH 003/138] nodeparamview: allow disconnecting nodes by right
 clicking the "connected to" label

---
 app/widget/clickablelabel/clickablelabel.cpp    | 12 ++++++++----
 .../nodeparamviewconnectedlabel.cpp             | 17 +++++++++++++++++
 .../nodeparamview/nodeparamviewconnectedlabel.h |  2 ++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/widget/clickablelabel/clickablelabel.cpp b/app/widget/clickablelabel/clickablelabel.cpp
index 0ab4dd631..a267a1019 100644
--- a/app/widget/clickablelabel/clickablelabel.cpp
+++ b/app/widget/clickablelabel/clickablelabel.cpp
@@ -20,6 +20,8 @@
 
 #include "clickablelabel.h"
 
+#include <QMouseEvent>
+
 OLIVE_NAMESPACE_ENTER
 
 ClickableLabel::ClickableLabel(const QString &text, QWidget *parent) :
@@ -32,16 +34,18 @@ ClickableLabel::ClickableLabel(QWidget *parent) :
 {
 }
 
-void ClickableLabel::mouseReleaseEvent(QMouseEvent *)
+void ClickableLabel::mouseReleaseEvent(QMouseEvent *event)
 {
-  if (underMouse()) {
+  if (event->button() == Qt::LeftButton && underMouse()) {
     emit MouseClicked();
   }
 }
 
-void ClickableLabel::mouseDoubleClickEvent(QMouseEvent *)
+void ClickableLabel::mouseDoubleClickEvent(QMouseEvent *event)
 {
-  emit MouseDoubleClicked();
+  if (event->button() == Qt::LeftButton) {
+    emit MouseDoubleClicked();
+  }
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp b/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp
index 612b14f81..43507cac6 100644
--- a/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp
+++ b/app/widget/nodeparamview/nodeparamviewconnectedlabel.cpp
@@ -23,7 +23,10 @@
 #include <QHBoxLayout>
 
 #include "common/qtutils.h"
+#include "core.h"
 #include "node/node.h"
+#include "widget/menu/menu.h"
+#include "widget/nodeview/nodeviewundo.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -39,7 +42,9 @@ NodeParamViewConnectedLabel::NodeParamViewConnectedLabel(NodeInput *input, QWidg
 
   connected_to_lbl_ = new ClickableLabel();
   connected_to_lbl_->setCursor(Qt::PointingHandCursor);
+  connected_to_lbl_->setContextMenuPolicy(Qt::CustomContextMenu);
   connect(connected_to_lbl_, &ClickableLabel::MouseClicked, this, &NodeParamViewConnectedLabel::ConnectionClicked);
+  connect(connected_to_lbl_, &ClickableLabel::customContextMenuRequested, this, &NodeParamViewConnectedLabel::ShowLabelContextMenu);
   layout->addWidget(connected_to_lbl_);
 
   layout->addStretch();
@@ -69,4 +74,16 @@ void NodeParamViewConnectedLabel::UpdateConnected()
   connected_to_lbl_->setText(connection_str);
 }
 
+void NodeParamViewConnectedLabel::ShowLabelContextMenu()
+{
+  Menu m(this);
+
+  QAction* disconnect_action = m.addAction(tr("Disconnect"));
+  connect(disconnect_action, &QAction::triggered, this, [this](){
+    Core::instance()->undo_stack()->push(new NodeEdgeRemoveCommand(input_->get_connected_output(), input_));
+  });
+
+  m.exec(QCursor::pos());
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodeparamview/nodeparamviewconnectedlabel.h b/app/widget/nodeparamview/nodeparamviewconnectedlabel.h
index 161bf2a0d..04103cae1 100644
--- a/app/widget/nodeparamview/nodeparamviewconnectedlabel.h
+++ b/app/widget/nodeparamview/nodeparamviewconnectedlabel.h
@@ -37,6 +37,8 @@ signals:
 private slots:
   void UpdateConnected();
 
+  void ShowLabelContextMenu();
+
 private:
   ClickableLabel* connected_to_lbl_;
 

From 29d56a15830ec31762b799a1bb0315d3d86da34d Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 16 Jun 2020 18:30:00 +1000
Subject: [PATCH 004/138] timeline: implemented UI indicator for tools like
 razor and edit

---
 app/widget/timelinewidget/timelinewidget.cpp  |  7 ++
 app/widget/timelinewidget/timelinewidget.h    | 15 +++-
 app/widget/timelinewidget/tool/CMakeLists.txt |  1 +
 app/widget/timelinewidget/tool/beam.cpp       | 35 ++++++++
 app/widget/timelinewidget/tool/edit.cpp       |  2 +-
 app/widget/timelinewidget/tool/razor.cpp      |  2 +-
 .../timelinewidget/view/timelineview.cpp      | 88 ++++++++++++++-----
 app/widget/timelinewidget/view/timelineview.h |  7 ++
 8 files changed, 129 insertions(+), 28 deletions(-)
 create mode 100644 app/widget/timelinewidget/tool/beam.cpp

diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index c011fa558..97f186cca 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -1241,6 +1241,13 @@ void TimelineWidget::UpdateViewTimebases()
   }
 }
 
+void TimelineWidget::SetViewBeamCursor(const TimelineCoordinate &coord)
+{
+  foreach (TimelineAndTrackView* tview, views_) {
+    tview->view()->SetBeamCursor(coord);
+  }
+}
+
 void TimelineWidget::SetBlockLinksSelected(Block* block, bool selected)
 {
   TimelineViewBlockItem* link_item;
diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h
index d8a6c0dc5..fad1da588 100644
--- a/app/widget/timelinewidget/timelinewidget.h
+++ b/app/widget/timelinewidget/timelinewidget.h
@@ -209,6 +209,15 @@ private:
 
   };
 
+  class BeamTool : public Tool
+  {
+  public:
+    BeamTool(TimelineWidget *parent);
+
+    virtual void HoverMove(TimelineViewMouseEvent *event) override;
+
+  };
+
   class PointerTool : public Tool
   {
   public:
@@ -327,7 +336,7 @@ private:
 
   };
 
-  class EditTool : public Tool
+  class EditTool : public BeamTool
   {
   public:
     EditTool(TimelineWidget* parent);
@@ -337,7 +346,7 @@ private:
     virtual void MouseRelease(TimelineViewMouseEvent *event) override;
   };
 
-  class RazorTool : public Tool
+  class RazorTool : public BeamTool
   {
   public:
     RazorTool(TimelineWidget* parent);
@@ -498,6 +507,8 @@ private:
 
   void UpdateViewTimebases();
 
+  void SetViewBeamCursor(const TimelineCoordinate& coord);
+
 private slots:
   void ViewMousePressed(TimelineViewMouseEvent* event);
   void ViewMouseMoved(TimelineViewMouseEvent* event);
diff --git a/app/widget/timelinewidget/tool/CMakeLists.txt b/app/widget/timelinewidget/tool/CMakeLists.txt
index 53b862a84..f14d4a8de 100644
--- a/app/widget/timelinewidget/tool/CMakeLists.txt
+++ b/app/widget/timelinewidget/tool/CMakeLists.txt
@@ -17,6 +17,7 @@
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
   widget/timelinewidget/tool/add.cpp
+  widget/timelinewidget/tool/beam.cpp
   widget/timelinewidget/tool/edit.cpp
   widget/timelinewidget/tool/import.cpp
   widget/timelinewidget/tool/pointer.cpp
diff --git a/app/widget/timelinewidget/tool/beam.cpp b/app/widget/timelinewidget/tool/beam.cpp
new file mode 100644
index 000000000..a04d14b9e
--- /dev/null
+++ b/app/widget/timelinewidget/tool/beam.cpp
@@ -0,0 +1,35 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "widget/timelinewidget/timelinewidget.h"
+
+OLIVE_NAMESPACE_ENTER
+
+TimelineWidget::BeamTool::BeamTool(TimelineWidget *parent) :
+  Tool(parent)
+{
+}
+
+void TimelineWidget::BeamTool::HoverMove(TimelineViewMouseEvent *event)
+{
+  parent()->SetViewBeamCursor(event->GetCoordinates(true));
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/timelinewidget/tool/edit.cpp b/app/widget/timelinewidget/tool/edit.cpp
index d7940f0c4..cb804bebc 100644
--- a/app/widget/timelinewidget/tool/edit.cpp
+++ b/app/widget/timelinewidget/tool/edit.cpp
@@ -23,7 +23,7 @@
 OLIVE_NAMESPACE_ENTER
 
 TimelineWidget::EditTool::EditTool(TimelineWidget* parent) :
-  Tool(parent)
+  BeamTool(parent)
 {
 }
 
diff --git a/app/widget/timelinewidget/tool/razor.cpp b/app/widget/timelinewidget/tool/razor.cpp
index d89e9125d..298a36b3b 100644
--- a/app/widget/timelinewidget/tool/razor.cpp
+++ b/app/widget/timelinewidget/tool/razor.cpp
@@ -23,7 +23,7 @@
 OLIVE_NAMESPACE_ENTER
 
 TimelineWidget::RazorTool::RazorTool(TimelineWidget* parent) :
-  Tool(parent)
+  BeamTool(parent)
 {
 }
 
diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp
index 91409bf94..2d3cc4511 100644
--- a/app/widget/timelinewidget/view/timelineview.cpp
+++ b/app/widget/timelinewidget/view/timelineview.cpp
@@ -141,21 +141,21 @@ void TimelineView::wheelEvent(QWheelEvent *event)
     }
     
     QWheelEvent e(
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-      event->position(),
-      event->globalPosition(),
-#else
-      event->pos(),
-      event->globalPos(),
-#endif
-      event->pixelDelta(),
-      angle_delta,
-      event->buttons(),
-      event->modifiers(),
-      event->phase(),
-      event->inverted(),
-      event->source()
-    );
+      #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+          event->position(),
+          event->globalPosition(),
+      #else
+          event->pos(),
+          event->globalPos(),
+      #endif
+          event->pixelDelta(),
+          angle_delta,
+          event->buttons(),
+          event->modifiers(),
+          event->phase(),
+          event->inverted(),
+          event->source()
+          );
 
 #else
 
@@ -166,15 +166,15 @@ void TimelineView::wheelEvent(QWheelEvent *event)
     }
 
     QWheelEvent e(
-      event->pos(),
-      event->globalPos(),
-      event->pixelDelta(),
-      event->angleDelta(),
-      event->delta(),
-      orientation,
-      event->buttons(),
-      event->modifiers()
-    );
+          event->pos(),
+          event->globalPos(),
+          event->pixelDelta(),
+          event->angleDelta(),
+          event->delta(),
+          orientation,
+          event->buttons(),
+          event->modifiers()
+          );
 #endif
 
     QGraphicsView::wheelEvent(&e);
@@ -244,6 +244,26 @@ void TimelineView::drawBackground(QPainter *painter, const QRectF &rect)
   }
 }
 
+void TimelineView::drawForeground(QPainter *painter, const QRectF &rect)
+{
+  TimelineViewBase::drawForeground(painter, rect);
+
+  if (show_beam_cursor_
+      && connected_track_list_
+      && cursor_coord_.GetTrack().type() == connected_track_list_->type()
+      && cursor_coord_.GetTrack().index() < connected_track_list_->GetTrackCount()) {
+    painter->setPen(Qt::gray);
+
+    double cursor_x = TimeToScene(cursor_coord_.GetFrame());
+    int track_index = cursor_coord_.GetTrack().index();
+
+    painter->drawLine(cursor_x,
+                      GetTrackY(track_index),
+                      cursor_x,
+                      GetTrackHeight(track_index));
+  }
+}
+
 void TimelineView::ToolChangedEvent(Tool::Item tool)
 {
   switch (tool) {
@@ -261,6 +281,12 @@ void TimelineView::ToolChangedEvent(Tool::Item tool)
   default:
     unsetCursor();
   }
+
+  // Hide/show cursor if necessary
+  if (show_beam_cursor_) {
+    show_beam_cursor_ = false;
+    viewport()->update();
+  }
 }
 
 void TimelineView::SceneRectUpdateEvent(QRectF &rect)
@@ -399,6 +425,20 @@ void TimelineView::ConnectTrackList(TrackList *list)
   }
 }
 
+void TimelineView::SetBeamCursor(const TimelineCoordinate &coord)
+{
+  bool update_required = true;/*(coord.GetTrack().type() == connected_track_list_->type()
+                          || cursor_coord_.GetTrack().type() == connected_track_list_->type()
+                          || !show_beam_cursor_);*/
+
+  show_beam_cursor_ = true;
+  cursor_coord_ = coord;
+
+  if (update_required) {
+    viewport()->update();
+  }
+}
+
 int TimelineView::SceneToTrack(double y)
 {
   int track = -1;
diff --git a/app/widget/timelinewidget/view/timelineview.h b/app/widget/timelinewidget/view/timelineview.h
index 53daceca0..4bacad401 100644
--- a/app/widget/timelinewidget/view/timelineview.h
+++ b/app/widget/timelinewidget/view/timelineview.h
@@ -61,6 +61,8 @@ public:
 
   void ConnectTrackList(TrackList* list);
 
+  void SetBeamCursor(const TimelineCoordinate& coord);
+
 signals:
   void MousePressed(TimelineViewMouseEvent* event);
   void MouseMoved(TimelineViewMouseEvent* event);
@@ -88,6 +90,7 @@ protected:
   virtual void dropEvent(QDropEvent *event) override;
 
   virtual void drawBackground(QPainter *painter, const QRectF &rect) override;
+  virtual void drawForeground(QPainter *painter, const QRectF &rect) override;
 
   virtual void ToolChangedEvent(Tool::Item tool) override;
 
@@ -111,6 +114,10 @@ private:
 
   void UpdatePlayheadRect();
 
+  bool show_beam_cursor_;
+
+  TimelineCoordinate cursor_coord_;
+
   TrackList* connected_track_list_;
 
 };

From 1b6e9c1c79f72865da0afbc942fbf1e061a9b809 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 17 Jun 2020 03:00:00 +1000
Subject: [PATCH 005/138] viewer: moved nouveau to application launch rather
 than viewer init

Viewer init was kind of too late since in many cases the sequence
would start caching and crash the app before the user could even read
the message. Moving to the startup makes it clearer from the beginning.
---
 app/widget/viewer/viewerdisplay.cpp  | 31 ----------------------------
 app/widget/viewer/viewerdisplay.h    | 11 ----------
 app/window/mainwindow/mainwindow.cpp | 30 +++++++++++++++++++++++++++
 app/window/mainwindow/mainwindow.h   |  6 ++++++
 4 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp
index 420eaf423..943314ef7 100644
--- a/app/widget/viewer/viewerdisplay.cpp
+++ b/app/widget/viewer/viewerdisplay.cpp
@@ -38,10 +38,6 @@
 
 OLIVE_NAMESPACE_ENTER
 
-#ifdef Q_OS_LINUX
-bool ViewerDisplayWidget::nouveau_check_done_ = false;
-#endif
-
 ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) :
   ManagedDisplayWidget(parent),
   signal_cursor_color_(false),
@@ -199,21 +195,6 @@ void ViewerDisplayWidget::initializeGL()
   ManagedDisplayWidget::initializeGL();
 
   connect(context(), &QOpenGLContext::aboutToBeDestroyed, this, &ViewerDisplayWidget::ContextCleanup, Qt::DirectConnection);
-
-#ifdef Q_OS_LINUX
-  if (!nouveau_check_done_) {
-    const char* vendor = reinterpret_cast<const char*>(context()->functions()->glGetString(GL_VENDOR));
-
-    if (!strcmp(vendor, "nouveau")) {
-      // Working with Qt widgets in this function segfaults, so we queue the messagebox for later
-      QMetaObject::invokeMethod(this,
-                                "ShowNouveauWarning",
-                                Qt::QueuedConnection);
-    }
-
-    nouveau_check_done_ = true;
-  }
-#endif
 }
 
 void ViewerDisplayWidget::paintGL()
@@ -305,18 +286,6 @@ rational ViewerDisplayWidget::GetGizmoTime()
   return GetAdjustedTime(GetTimeTarget(), gizmos_, time_, NodeParam::kInput);
 }
 
-#ifdef Q_OS_LINUX
-void ViewerDisplayWidget::ShowNouveauWarning()
-{
-  QMessageBox::warning(this,
-                       tr("Driver Warning"),
-                       tr("Olive has detected your system is using the Nouveau graphics driver.\n\nThis driver is "
-                          "known to have stability and performance issues with Olive. It is highly recommended "
-                          "you install the proprietary NVIDIA driver before continuing to use Olive."),
-                       QMessageBox::Ok);
-}
-#endif
-
 void ViewerDisplayWidget::ContextCleanup()
 {
   makeCurrent();
diff --git a/app/widget/viewer/viewerdisplay.h b/app/widget/viewer/viewerdisplay.h
index 5f18cc303..f8db608ef 100644
--- a/app/widget/viewer/viewerdisplay.h
+++ b/app/widget/viewer/viewerdisplay.h
@@ -160,10 +160,6 @@ private:
    */
   QMatrix4x4 matrix_;
 
-#ifdef Q_OS_LINUX
-  static bool nouveau_check_done_;
-#endif
-
   bool signal_cursor_color_;
 
   ViewerSafeMarginInfo safe_margin_;
@@ -184,13 +180,6 @@ private slots:
    */
   void ContextCleanup();
 
-#ifdef Q_OS_LINUX
-  /**
-   * @brief Shows warning messagebox if Nouveau is detected
-   */
-  void ShowNouveauWarning();
-#endif
-
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 31239436d..5e61cd1d6 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -415,6 +415,18 @@ void MainWindow::StatusBarDoubleClicked()
   task_man_panel_->raise();
 }
 
+#ifdef Q_OS_LINUX
+void MainWindow::ShowNouveauWarning()
+{
+  QMessageBox::warning(this,
+                       tr("Driver Warning"),
+                       tr("Olive has detected your system is using the Nouveau graphics driver.\n\nThis driver is "
+                          "known to have stability and performance issues with Olive. It is highly recommended "
+                          "you install the proprietary NVIDIA driver before continuing to use Olive."),
+                       QMessageBox::Ok);
+}
+#endif
+
 void MainWindow::UpdateTitle()
 {
   if (Core::instance()->GetActiveProject()) {
@@ -626,6 +638,24 @@ void MainWindow::SetDefaultLayout()
               Qt::Vertical);
 }
 
+void MainWindow::showEvent(QShowEvent *e)
+{
+  QMainWindow::showEvent(e);
+
+#ifdef Q_OS_LINUX
+  // Check for nouveau since that driver really doesn't work with Olive
+  QOffscreenSurface surface;
+  surface.create();
+  QOpenGLContext context;
+  context.create();
+  context.makeCurrent(&surface);
+  const char* vendor = reinterpret_cast<const char*>(context.functions()->glGetString(GL_VENDOR));
+  if (!strcmp(vendor, "nouveau")) {
+    QMetaObject::invokeMethod(this, "ShowNouveauWarning", Qt::QueuedConnection);
+  }
+#endif
+}
+
 template<typename T>
 T *MainWindow::AppendPanelInternal(QList<T*>& list)
 {
diff --git a/app/window/mainwindow/mainwindow.h b/app/window/mainwindow/mainwindow.h
index 21a6d561c..f01f0524a 100644
--- a/app/window/mainwindow/mainwindow.h
+++ b/app/window/mainwindow/mainwindow.h
@@ -103,6 +103,8 @@ public slots:
   void SetDefaultLayout();
 
 protected:
+  virtual void showEvent(QShowEvent* e) override;
+
   virtual void closeEvent(QCloseEvent* e) override;
 
 #ifdef Q_OS_WINDOWS
@@ -167,6 +169,10 @@ private slots:
 
   void StatusBarDoubleClicked();
 
+#ifdef Q_OS_LINUX
+  void ShowNouveauWarning();
+#endif
+
 };
 
 OLIVE_NAMESPACE_EXIT

From a871c5081bdc947ec4c72997ec54b0cf8e0c12c0 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 17 Jun 2020 17:48:07 +1000
Subject: [PATCH 006/138] nodeparamtable: bare bones table view for node inputs

---
 app/codec/ffmpeg/ffmpegdecoder.cpp            |   1 +
 app/codec/oiio/oiiodecoder.cpp                |  31 +++--
 app/codec/oiio/oiiodecoder.h                  |   2 +
 app/node/param.cpp                            |  85 ++++++++-----
 app/node/param.h                              |   7 +-
 app/node/value.cpp                            |  15 ---
 app/node/value.h                              |  32 ++++-
 app/panel/CMakeLists.txt                      |   1 +
 app/panel/table/CMakeLists.txt                |  22 ++++
 app/panel/table/table.cpp                     |  44 +++++++
 app/panel/table/table.h                       |  45 +++++++
 app/project/item/footage/imagestream.cpp      |  20 ----
 app/project/item/footage/imagestream.h        |  35 +++++-
 app/render/videoparams.h                      |   2 +
 app/widget/CMakeLists.txt                     |   1 +
 app/widget/nodetableview/CMakeLists.txt       |  26 ++++
 .../nodetableview/nodetabletraverser.cpp      |  44 +++++++
 app/widget/nodetableview/nodetabletraverser.h |  42 +++++++
 app/widget/nodetableview/nodetableview.cpp    | 113 ++++++++++++++++++
 app/widget/nodetableview/nodetableview.h      |  43 +++++++
 app/widget/nodetableview/nodetablewidget.cpp  |  49 ++++++++
 app/widget/nodetableview/nodetablewidget.h    |  43 +++++++
 app/window/mainwindow/mainwindow.cpp          |   6 +
 app/window/mainwindow/mainwindow.h            |   2 +
 24 files changed, 620 insertions(+), 91 deletions(-)
 create mode 100644 app/panel/table/CMakeLists.txt
 create mode 100644 app/panel/table/table.cpp
 create mode 100644 app/panel/table/table.h
 create mode 100644 app/widget/nodetableview/CMakeLists.txt
 create mode 100644 app/widget/nodetableview/nodetabletraverser.cpp
 create mode 100644 app/widget/nodetableview/nodetabletraverser.h
 create mode 100644 app/widget/nodetableview/nodetableview.cpp
 create mode 100644 app/widget/nodetableview/nodetableview.h
 create mode 100644 app/widget/nodetableview/nodetablewidget.cpp
 create mode 100644 app/widget/nodetableview/nodetablewidget.h

diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp
index 4d2430e30..3b54fcdb2 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.cpp
+++ b/app/codec/ffmpeg/ffmpegdecoder.cpp
@@ -458,6 +458,7 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
 
         video_stream->set_width(avstream->codecpar->width);
         video_stream->set_height(avstream->codecpar->height);
+        video_stream->set_format(GetNativePixelFormat(FFmpegCommon::GetCompatiblePixelFormat(static_cast<AVPixelFormat>(avstream->codecpar->format))));
         video_stream->set_frame_rate(av_guess_frame_rate(fmt_ctx, avstream, nullptr));
         video_stream->set_start_time(avstream->start_time);
 
diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp
index e5f7b74c8..6d0804267 100644
--- a/app/codec/oiio/oiiodecoder.cpp
+++ b/app/codec/oiio/oiiodecoder.cpp
@@ -117,6 +117,7 @@ bool OIIODecoder::Probe(Footage *f, const QAtomicInt *cancelled)
 
   image_stream->set_width(in->spec().width);
   image_stream->set_height(in->spec().height);
+  image_stream->set_format(GetFormatFromOIIOBasetype(in->spec()));
 
   // Images will always have just one stream
   image_stream->set_index(0);
@@ -278,6 +279,23 @@ void OIIODecoder::BufferToFrame(OIIO::ImageBuf *buf, FramePtr frame)
 #endif
 }
 
+PixelFormat::Format OIIODecoder::GetFormatFromOIIOBasetype(const OIIO::ImageSpec& spec)
+{
+  bool has_alpha = (spec.nchannels == kRGBAChannels);
+
+  if (spec.format == OIIO::TypeDesc::UINT8) {
+    return has_alpha ? PixelFormat::PIX_FMT_RGBA8 : PixelFormat::PIX_FMT_RGB8;
+  } else if (spec.format == OIIO::TypeDesc::UINT16) {
+    return has_alpha ? PixelFormat::PIX_FMT_RGBA16U : PixelFormat::PIX_FMT_RGB16U;
+  } else if (spec.format == OIIO::TypeDesc::HALF) {
+    return has_alpha ? PixelFormat::PIX_FMT_RGBA16F : PixelFormat::PIX_FMT_RGB16F;
+  } else if (spec.format == OIIO::TypeDesc::FLOAT) {
+    return has_alpha ? PixelFormat::PIX_FMT_RGBA32F : PixelFormat::PIX_FMT_RGB32F;
+  } else {
+    return PixelFormat::PIX_FMT_INVALID;
+  }
+}
+
 bool OIIODecoder::FileTypeIsSupported(const QString& fn)
 {
   // We prioritize OIIO over FFmpeg to pick up still images more effectively, but some OIIO decoders (notably OpenJPEG)
@@ -361,16 +379,9 @@ bool OIIODecoder::OpenImageHandler(const QString &fn)
 
   is_rgba_ = (spec.nchannels == kRGBAChannels);
 
-  // Weirdly, switch statement doesn't work correctly here
-  if (spec.format == OIIO::TypeDesc::UINT8) {
-    pix_fmt_ = is_rgba_ ? PixelFormat::PIX_FMT_RGBA8 : PixelFormat::PIX_FMT_RGB8;
-  } else if (spec.format == OIIO::TypeDesc::UINT16) {
-    pix_fmt_ = is_rgba_ ? PixelFormat::PIX_FMT_RGBA16U : PixelFormat::PIX_FMT_RGB16U;
-  } else if (spec.format == OIIO::TypeDesc::HALF) {
-    pix_fmt_ = is_rgba_ ? PixelFormat::PIX_FMT_RGBA16F : PixelFormat::PIX_FMT_RGB16F;
-  } else if (spec.format == OIIO::TypeDesc::FLOAT) {
-    pix_fmt_ = is_rgba_ ? PixelFormat::PIX_FMT_RGBA32F : PixelFormat::PIX_FMT_RGB32F;
-  } else {
+  pix_fmt_ = GetFormatFromOIIOBasetype(spec.format);
+
+  if (pix_fmt_ == PixelFormat::PIX_FMT_INVALID) {
     qWarning() << "Failed to convert OIIO::ImageDesc to native pixel format";
     return false;
   }
diff --git a/app/codec/oiio/oiiodecoder.h b/app/codec/oiio/oiiodecoder.h
index f481481b1..990fc3aff 100644
--- a/app/codec/oiio/oiiodecoder.h
+++ b/app/codec/oiio/oiiodecoder.h
@@ -57,6 +57,8 @@ public:
 
   static void BufferToFrame(OIIO::ImageBuf* buf, FramePtr frame);
 
+  static PixelFormat::Format GetFormatFromOIIOBasetype(const OIIO::ImageSpec& spec);
+
 private:
 #if OIIO_VERSION < 10903
   OIIO::ImageInput* image_;
diff --git a/app/node/param.cpp b/app/node/param.cpp
index ff8e72b21..ec1eb8b65 100644
--- a/app/node/param.cpp
+++ b/app/node/param.cpp
@@ -185,6 +185,58 @@ NodeEdgePtr NodeParam::DisconnectForNewOutput(NodeInput *input)
   return nullptr;
 }
 
+QString NodeParam::GetPrettyDataTypeName(const NodeParam::DataType &type)
+{
+  switch (type) {
+  case kNone:
+    return tr("None");
+  case kInt:
+  case kCombo:
+    return tr("Integer");
+  case kFloat:
+    return tr("Float");
+  case kRational:
+    return tr("Rational");
+  case kBoolean:
+    return tr("Boolean");
+  case kColor:
+    return tr("Color");
+  case kMatrix:
+    return tr("Matrix");
+  case kText:
+    return tr("Text");
+  case kFont:
+    return tr("Font");
+  case kFile:
+    return tr("File");
+  case kTexture:
+    return tr("Texture");
+  case kSamples:
+    return tr("Samples");
+  case kFootage:
+    return tr("Footage");
+  case kVec2:
+    return tr("Vector 2D");
+  case kVec3:
+    return tr("Vector 3D");
+  case kVec4:
+    return tr("Vector 4D");
+
+  case kDecimal:
+  case kNumber:
+  case kString:
+  case kBuffer:
+  case kVector:
+  case kShaderJob:
+  case kSampleJob:
+  case kGenerateJob:
+  case kAny:
+    break;
+  }
+
+  return tr("Unknown");
+}
+
 QByteArray NodeParam::ValueToBytes(const NodeParam::DataType &type, const QVariant &value)
 {
   switch (type) {
@@ -222,39 +274,6 @@ QByteArray NodeParam::ValueToBytes(const NodeParam::DataType &type, const QVaria
   return QByteArray();
 }
 
-NodeParam::DataType NodeParam::StringToDataType(const QString &s)
-{
-  QString type_id = s.toLower();
-
-  if (type_id == QStringLiteral("float")) {
-    return kFloat;
-  } else if (type_id == QStringLiteral("int")) {
-    return kInt;
-  } else if (type_id == QStringLiteral("rational")) {
-    return kRational;
-  } else if (type_id == QStringLiteral("bool")) {
-    return kBoolean;
-  } else if (type_id == QStringLiteral("color")) {
-    return kColor;
-  } else if (type_id == QStringLiteral("matrix")) {
-    return kMatrix;
-  } else if (type_id == QStringLiteral("text")) {
-    return kText;
-  } else if (type_id == QStringLiteral("texture")) {
-    return kTexture;
-  } else if (type_id == QStringLiteral("vec2")) {
-    return kVec2;
-  } else if (type_id == QStringLiteral("vec3")) {
-    return kVec3;
-  } else if (type_id == QStringLiteral("vec4")) {
-    return kVec4;
-  } else if (type_id == QStringLiteral("combo")) {
-    return kCombo;
-  }
-
-  return kAny;
-}
-
 template<typename T>
 QByteArray NodeParam::ValueToBytesInternal(const QVariant &v)
 {
diff --git a/app/node/param.h b/app/node/param.h
index 40e5a9716..03e667936 100644
--- a/app/node/param.h
+++ b/app/node/param.h
@@ -378,18 +378,13 @@ public:
   /**
    * @brief Get a human-readable translated name for a certain data type
    */
-  static QString GetDefaultDataTypeName(const DataType &type);
+  static QString GetPrettyDataTypeName(const DataType &type);
 
   /**
    * @brief Convert a value from a NodeParam into bytes
    */
   static QByteArray ValueToBytes(const DataType &type, const QVariant& value);
 
-  /**
-   * @brief Convert a string to a data type
-   */
-  static DataType StringToDataType(const QString& s);
-
 signals:
   /**
    * @brief Signal emitted when an edge is added to this parameter
diff --git a/app/node/value.cpp b/app/node/value.cpp
index d487f0a3d..e2f9913c5 100644
--- a/app/node/value.cpp
+++ b/app/node/value.cpp
@@ -61,26 +61,11 @@ NodeValue::NodeValue(const NodeParam::DataType &type, const QVariant &data, cons
 {
 }
 
-const NodeParam::DataType &NodeValue::type() const
-{
-  return type_;
-}
-
-const QString &NodeValue::tag() const
-{
-  return tag_;
-}
-
 bool NodeValue::operator==(const NodeValue &rhs) const
 {
   return type_ == rhs.type_ && tag_ == rhs.tag_ && data_ == rhs.data_;
 }
 
-const QVariant &NodeValue::data() const
-{
-  return data_;
-}
-
 QVariant NodeValueTable::Get(const NodeParam::DataType &type, const QString &tag) const
 {
   return GetWithMeta(type, tag).data();
diff --git a/app/node/value.h b/app/node/value.h
index 387117993..7efb8592a 100644
--- a/app/node/value.h
+++ b/app/node/value.h
@@ -33,9 +33,25 @@ public:
   NodeValue();
   NodeValue(const NodeParam::DataType& type, const QVariant& data, const Node* from, const QString& tag = QString());
 
-  const NodeParam::DataType& type() const;
-  const QVariant& data() const;
-  const QString& tag() const;
+  const NodeParam::DataType& type() const
+  {
+    return type_;
+  }
+
+  const QVariant& data() const
+  {
+    return data_;
+  }
+
+  const QString& tag() const
+  {
+    return tag_;
+  }
+
+  const Node* source() const
+  {
+    return from_;
+  }
 
   bool operator==(const NodeValue& rhs) const;
 
@@ -90,6 +106,16 @@ public:
 
   NodeValueTable Merge() const;
 
+  using const_iterator = QHash<QString, NodeValueTable>::const_iterator;
+
+  inline QHash<QString, NodeValueTable>::const_iterator begin() const {
+    return tables_.cbegin();
+  }
+
+  inline QHash<QString, NodeValueTable>::const_iterator end() const {
+    return tables_.cend();
+  }
+
 private:
   QHash<QString, NodeValueTable> tables_;
 
diff --git a/app/panel/CMakeLists.txt b/app/panel/CMakeLists.txt
index 0c6423398..75c1c7738 100644
--- a/app/panel/CMakeLists.txt
+++ b/app/panel/CMakeLists.txt
@@ -23,6 +23,7 @@ add_subdirectory(pixelsampler)
 add_subdirectory(project)
 add_subdirectory(scope)
 add_subdirectory(sequenceviewer)
+add_subdirectory(table)
 add_subdirectory(taskmanager)
 add_subdirectory(timebased)
 add_subdirectory(timeline)
diff --git a/app/panel/table/CMakeLists.txt b/app/panel/table/CMakeLists.txt
new file mode 100644
index 000000000..f332aa646
--- /dev/null
+++ b/app/panel/table/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  panel/table/table.h
+  panel/table/table.cpp
+  PARENT_SCOPE
+)
diff --git a/app/panel/table/table.cpp b/app/panel/table/table.cpp
new file mode 100644
index 000000000..7183e9c23
--- /dev/null
+++ b/app/panel/table/table.cpp
@@ -0,0 +1,44 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "table.h"
+
+OLIVE_NAMESPACE_ENTER
+
+NodeTablePanel::NodeTablePanel(QWidget* parent) :
+  TimeBasedPanel(QStringLiteral("NodeTablePanel"), parent)
+{
+  view_ = new NodeTableWidget();
+  SetTimeBasedWidget(view_);
+
+  Retranslate();
+}
+
+void NodeTablePanel::SetNodes(const QList<Node *> &nodes)
+{
+  view_->SetNodes(nodes);
+}
+
+void NodeTablePanel::Retranslate()
+{
+  SetTitle(tr("Table View"));
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/panel/table/table.h b/app/panel/table/table.h
new file mode 100644
index 000000000..0587cf51b
--- /dev/null
+++ b/app/panel/table/table.h
@@ -0,0 +1,45 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef NODETABLEPANEL_H
+#define NODETABLEPANEL_H
+
+#include "panel/timebased/timebased.h"
+#include "widget/nodetableview/nodetablewidget.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class NodeTablePanel : public TimeBasedPanel
+{
+public:
+  NodeTablePanel(QWidget* parent);
+
+public slots:
+  void SetNodes(const QList<Node*>& nodes);
+
+private:
+  virtual void Retranslate() override;
+
+  NodeTableWidget* view_;
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // NODETABLEPANEL_H
diff --git a/app/project/item/footage/imagestream.cpp b/app/project/item/footage/imagestream.cpp
index beb5f3b3b..41a9d0d23 100644
--- a/app/project/item/footage/imagestream.cpp
+++ b/app/project/item/footage/imagestream.cpp
@@ -72,26 +72,6 @@ QString ImageStream::description() const
                                                                         QString::number(height()));
 }
 
-const int &ImageStream::width() const
-{
-  return width_;
-}
-
-void ImageStream::set_width(const int &width)
-{
-  width_ = width;
-}
-
-const int &ImageStream::height() const
-{
-  return height_;
-}
-
-void ImageStream::set_height(const int &height)
-{
-  height_ = height;
-}
-
 bool ImageStream::premultiplied_alpha() const
 {
   return premultiplied_alpha_;
diff --git a/app/project/item/footage/imagestream.h b/app/project/item/footage/imagestream.h
index 9e3b6f72b..30fc712a2 100644
--- a/app/project/item/footage/imagestream.h
+++ b/app/project/item/footage/imagestream.h
@@ -21,6 +21,7 @@
 #ifndef IMAGESTREAM_H
 #define IMAGESTREAM_H
 
+#include "render/pixelformat.h"
 #include "stream.h"
 
 OLIVE_NAMESPACE_ENTER
@@ -36,11 +37,35 @@ public:
 
   virtual QString description() const override;
 
-  const int& width() const;
-  void set_width(const int& width);
+  const int& width() const
+  {
+    return width_;
+  }
 
-  const int& height() const;
-  void set_height(const int& height);
+  void set_width(const int& width)
+  {
+    width_ = width;
+  }
+
+  const int& height() const
+  {
+    return height_;
+  }
+
+  void set_height(const int& height)
+  {
+    height_ = height;
+  }
+
+  const PixelFormat::Format& format() const
+  {
+    return format_;
+  }
+
+  void set_format(const PixelFormat::Format& format)
+  {
+    format_ = format;
+  }
 
   bool premultiplied_alpha() const;
   void set_premultiplied_alpha(bool e);
@@ -63,6 +88,8 @@ private:
   bool premultiplied_alpha_;
   QString colorspace_;
 
+  PixelFormat::Format format_;
+
 private slots:
   void ColorConfigChanged();
 
diff --git a/app/render/videoparams.h b/app/render/videoparams.h
index b108874d5..56534ed3c 100644
--- a/app/render/videoparams.h
+++ b/app/render/videoparams.h
@@ -91,4 +91,6 @@ private:
 
 OLIVE_NAMESPACE_EXIT
 
+Q_DECLARE_METATYPE(OLIVE_NAMESPACE::VideoParams)
+
 #endif // VIDEOPARAMS_H
diff --git a/app/widget/CMakeLists.txt b/app/widget/CMakeLists.txt
index dc068e82b..67c20349e 100644
--- a/app/widget/CMakeLists.txt
+++ b/app/widget/CMakeLists.txt
@@ -31,6 +31,7 @@ add_subdirectory(nodecombobox)
 add_subdirectory(nodecopypaste)
 add_subdirectory(nodeview)
 add_subdirectory(nodeparamview)
+add_subdirectory(nodetableview)
 add_subdirectory(panel)
 add_subdirectory(pixelsampler)
 add_subdirectory(playbackcontrols)
diff --git a/app/widget/nodetableview/CMakeLists.txt b/app/widget/nodetableview/CMakeLists.txt
new file mode 100644
index 000000000..f12dff040
--- /dev/null
+++ b/app/widget/nodetableview/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  widget/nodetableview/nodetabletraverser.h
+  widget/nodetableview/nodetabletraverser.cpp
+  widget/nodetableview/nodetableview.h
+  widget/nodetableview/nodetableview.cpp
+  widget/nodetableview/nodetablewidget.h
+  widget/nodetableview/nodetablewidget.cpp
+  PARENT_SCOPE
+)
diff --git a/app/widget/nodetableview/nodetabletraverser.cpp b/app/widget/nodetableview/nodetabletraverser.cpp
new file mode 100644
index 000000000..1ca0e1080
--- /dev/null
+++ b/app/widget/nodetableview/nodetabletraverser.cpp
@@ -0,0 +1,44 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "nodetabletraverser.h"
+
+OLIVE_NAMESPACE_ENTER
+
+QVariant NodeTableTraverser::ProcessVideoFootage(StreamPtr stream, const rational &input_time)
+{
+  ImageStreamPtr video_stream = std::static_pointer_cast<ImageStream>(stream);
+
+  return QVariant::fromValue(VideoParams(video_stream->width(),
+                                         video_stream->height(),
+                                         video_stream->timebase(),
+                                         video_stream->format()));
+}
+
+QVariant NodeTableTraverser::ProcessAudioFootage(StreamPtr stream, const TimeRange &input_time)
+{
+  AudioStreamPtr audio_stream = std::static_pointer_cast<AudioStream>(stream);
+
+  return QVariant::fromValue(AudioParams(audio_stream->sample_rate(),
+                                         audio_stream->channel_layout(),
+                                         SampleFormat::kInternalFormat));
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodetableview/nodetabletraverser.h b/app/widget/nodetableview/nodetabletraverser.h
new file mode 100644
index 000000000..20dae8e2e
--- /dev/null
+++ b/app/widget/nodetableview/nodetabletraverser.h
@@ -0,0 +1,42 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef NODETABLETRAVERSER_H
+#define NODETABLETRAVERSER_H
+
+#include "node/traverser.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class NodeTableTraverser : public NodeTraverser
+{
+public:
+  NodeTableTraverser() = default;
+
+protected:
+  virtual QVariant ProcessVideoFootage(StreamPtr stream, const rational &input_time);
+
+  virtual QVariant ProcessAudioFootage(StreamPtr stream, const TimeRange &input_time);
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // NODETABLETRAVERSER_H
diff --git a/app/widget/nodetableview/nodetableview.cpp b/app/widget/nodetableview/nodetableview.cpp
new file mode 100644
index 000000000..8e9f5aab0
--- /dev/null
+++ b/app/widget/nodetableview/nodetableview.cpp
@@ -0,0 +1,113 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "nodetableview.h"
+
+#include <QHeaderView>
+
+#include "node/param.h"
+#include "nodetabletraverser.h"
+
+OLIVE_NAMESPACE_ENTER
+
+NodeTableView::NodeTableView(QWidget* parent) :
+  QTreeWidget(parent)
+{
+  setColumnCount(3);
+  setHeaderLabels({tr("Type"), tr("Value"), tr("Source")});
+}
+
+void NodeTableView::SetNode(Node *n, const rational &time)
+{
+  clear();
+
+  NodeTableTraverser traverser;
+  NodeValueDatabase db = traverser.GenerateDatabase(n, TimeRange(time, time));
+
+  NodeValueDatabase::const_iterator i;
+
+  for (i=db.begin(); i!=db.end(); i++) {
+    const NodeValueTable& table = i.value();
+
+    NodeInput* input = n->GetInputWithID(i.key());
+    if (!input) {
+      // Filters out table entries that aren't inputs (like "global")
+      continue;
+    }
+
+    QTreeWidgetItem* top_item = new QTreeWidgetItem();
+    top_item->setText(0, input->name());
+    top_item->setFirstColumnSpanned(true);
+    this->addTopLevelItem(top_item);
+
+    for (int j=table.Count()-1; j>=0; j--) {
+      const NodeValue& value = table.at(j);
+
+      QString value_str = NodeInput::ValueToString(value.type(), value.data());
+
+      QString source_name;
+      if (value.source()) {
+        source_name = value.source()->Name();
+      } else {
+        source_name = tr("(unknown)");
+      }
+
+      QTreeWidgetItem* sub_item = new QTreeWidgetItem();
+      sub_item->setText(0, NodeParam::GetPrettyDataTypeName(value.type()));
+      sub_item->setText(1, value_str);
+      sub_item->setText(2, source_name);
+      top_item->addChild(sub_item);
+
+      // Special cases
+      if (value.type() == NodeParam::kTexture) {
+        // NodeTableTraverser converts footage to VideoParams
+        QTreeWidgetItem* red_channel = new QTreeWidgetItem();
+        red_channel->setText(0, tr("Red"));
+        sub_item->addChild(red_channel);
+
+        QTreeWidgetItem* green_channel = new QTreeWidgetItem();
+        green_channel->setText(0, tr("Green"));
+        sub_item->addChild(green_channel);
+
+        QTreeWidgetItem* blue_channel = new QTreeWidgetItem();
+        blue_channel->setText(0, tr("Blue"));
+        sub_item->addChild(blue_channel);
+
+        if (PixelFormat::FormatHasAlphaChannel(value.data().value<VideoParams>().format())) {
+          QTreeWidgetItem* alpha_channel = new QTreeWidgetItem();
+          alpha_channel->setText(0, tr("Alpha"));
+          sub_item->addChild(alpha_channel);
+        }
+      }
+    }
+  }
+}
+
+void NodeTableView::SetMultipleNodeMessage()
+{
+  this->clear();
+
+  QTreeWidgetItem* item = new QTreeWidgetItem();
+  item->setText(0, tr("Multiple nodes selected"));
+  item->setFirstColumnSpanned(true);
+  this->addTopLevelItem(item);
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodetableview/nodetableview.h b/app/widget/nodetableview/nodetableview.h
new file mode 100644
index 000000000..e453903b7
--- /dev/null
+++ b/app/widget/nodetableview/nodetableview.h
@@ -0,0 +1,43 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef NODETABLEVIEW_H
+#define NODETABLEVIEW_H
+
+#include <QTreeWidget>
+
+#include "node/node.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class NodeTableView : public QTreeWidget
+{
+public:
+  NodeTableView(QWidget* parent = nullptr);
+
+  void SetNode(Node* n, const rational& time);
+
+  void SetMultipleNodeMessage();
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // NODETABLEVIEW_H
diff --git a/app/widget/nodetableview/nodetablewidget.cpp b/app/widget/nodetableview/nodetablewidget.cpp
new file mode 100644
index 000000000..20db058c2
--- /dev/null
+++ b/app/widget/nodetableview/nodetablewidget.cpp
@@ -0,0 +1,49 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "nodetablewidget.h"
+
+#include <QVBoxLayout>
+
+OLIVE_NAMESPACE_ENTER
+
+NodeTableWidget::NodeTableWidget(QWidget* parent) :
+  TimeBasedWidget(parent)
+{
+  QVBoxLayout* layout = new QVBoxLayout(this);
+  layout->setSpacing(0);
+  layout->setMargin(0);
+
+  view_ = new NodeTableView();
+  layout->addWidget(view_);
+}
+
+void NodeTableWidget::SetNodes(const QList<Node *> &nodes)
+{
+  if (nodes.isEmpty()) {
+    view_->clear();
+  } else if (nodes.size() == 1) {
+    view_->SetNode(nodes.first(), rational());
+  } else {
+    view_->SetMultipleNodeMessage();
+  }
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodetableview/nodetablewidget.h b/app/widget/nodetableview/nodetablewidget.h
new file mode 100644
index 000000000..ae0c82cc4
--- /dev/null
+++ b/app/widget/nodetableview/nodetablewidget.h
@@ -0,0 +1,43 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef NODETABLEWIDGET_H
+#define NODETABLEWIDGET_H
+
+#include "nodetableview.h"
+#include "widget/timebased/timebased.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class NodeTableWidget : public TimeBasedWidget
+{
+public:
+  NodeTableWidget(QWidget* parent = nullptr);
+
+  void SetNodes(const QList<Node*>& nodes);
+
+private:
+  NodeTableView* view_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // NODETABLEWIDGET_H
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 31239436d..e6b0f8d34 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -72,6 +72,7 @@ MainWindow::MainWindow(QWidget *parent) :
   node_panel_ = PanelManager::instance()->CreatePanel<NodePanel>(this);
   footage_viewer_panel_ = PanelManager::instance()->CreatePanel<FootageViewerPanel>(this);
   param_panel_ = PanelManager::instance()->CreatePanel<ParamPanel>(this);
+  table_panel_ = PanelManager::instance()->CreatePanel<NodeTablePanel>(this);
   sequence_viewer_panel_ = PanelManager::instance()->CreatePanel<SequenceViewerPanel>(this);
   pixel_sampler_panel_ = PanelManager::instance()->CreatePanel<PixelSamplerPanel>(this);
   AppendProjectPanel();
@@ -82,6 +83,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
   // Make connections to sequence viewer
   connect(node_panel_, &NodePanel::SelectionChanged, param_panel_, &ParamPanel::SetNodes);
+  connect(node_panel_, &NodePanel::SelectionChanged, table_panel_, &NodeTablePanel::SetNodes);
   connect(param_panel_, &ParamPanel::RequestSelectNode, node_panel_, &NodePanel::Select);
   connect(sequence_viewer_panel_, &SequenceViewerPanel::TimeChanged, param_panel_, &ParamPanel::SetTimestamp);
   connect(param_panel_, &ParamPanel::TimeChanged, sequence_viewer_panel_, &SequenceViewerPanel::SetTimestamp);
@@ -590,6 +592,10 @@ void MainWindow::SetDefaultLayout()
   tabifyDockWidget(footage_viewer_panel_, param_panel_);
   footage_viewer_panel_->raise();
 
+  table_panel_->hide();
+  table_panel_->setFloating(true);
+  addDockWidget(Qt::TopDockWidgetArea, table_panel_);
+
   sequence_viewer_panel_->show();
   addDockWidget(Qt::TopDockWidgetArea, sequence_viewer_panel_);
 
diff --git a/app/window/mainwindow/mainwindow.h b/app/window/mainwindow/mainwindow.h
index 21a6d561c..787eb2899 100644
--- a/app/window/mainwindow/mainwindow.h
+++ b/app/window/mainwindow/mainwindow.h
@@ -30,6 +30,7 @@
 #include "panel/param/param.h"
 #include "panel/project/project.h"
 #include "panel/scope/scope.h"
+#include "panel/table/table.h"
 #include "panel/taskmanager/taskmanager.h"
 #include "panel/timeline/timeline.h"
 #include "panel/tool/tool.h"
@@ -145,6 +146,7 @@ private:
   QList<CurvePanel*> curve_panels_;
   PixelSamplerPanel* pixel_sampler_panel_;
   QList<ScopePanel*> scope_panels_;
+  NodeTablePanel* table_panel_;
 
 #ifdef Q_OS_WINDOWS
   unsigned int taskbar_btn_id_;

From 2261f1147d3a0610c4d05165fca25cf069759461 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 17 Jun 2020 17:48:41 +1000
Subject: [PATCH 007/138] renderer: catch failure to load pre-cached frame

---
 app/render/backend/renderworker.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/render/backend/renderworker.cpp b/app/render/backend/renderworker.cpp
index 7142eae07..1ff861658 100644
--- a/app/render/backend/renderworker.cpp
+++ b/app/render/backend/renderworker.cpp
@@ -244,14 +244,16 @@ QVariant RenderWorker::GetCachedFrame(const Node* node, const rational& time)
     if (QFileInfo::exists(fn)) {
       FramePtr f = FrameHashCache::LoadCacheFrame(hash);
 
-      // The cached frame won't load with the correct divider by default, so we enforce it here
-      f->set_video_params(VideoParams(f->width() * video_params_.divider(),
-                                      f->height() * video_params_.divider(),
-                                      f->video_params().time_base(),
-                                      f->video_params().format(),
-                                      video_params_.divider()));
+      if (f) {
+        // The cached frame won't load with the correct divider by default, so we enforce it here
+        f->set_video_params(VideoParams(f->width() * video_params_.divider(),
+                                        f->height() * video_params_.divider(),
+                                        f->video_params().time_base(),
+                                        f->video_params().format(),
+                                        video_params_.divider()));
 
-      return CachedFrameToTexture(f);
+        return CachedFrameToTexture(f);
+      }
     }
   }
 
@@ -316,9 +318,7 @@ QVariant RenderWorker::ProcessVideoFootage(StreamPtr stream, const rational &inp
         // Return a texture from the derived class
         value = FootageFrameToTexture(stream, frame);
 
-        if (value.isNull()) {
-          qDebug() << "Texture from derivative was blank";
-        } else {
+        if (!value.isNull()) {
           // Put this into the image cache instead
           still_image_cache_.insert(stream.get(), {value,
                                                    colorspace_match,
@@ -326,8 +326,6 @@ QVariant RenderWorker::ProcessVideoFootage(StreamPtr stream, const rational &inp
                                                    video_params_.divider(),
                                                    time_match});
         }
-      } else {
-        qDebug() << "Frame from decoder was blank";
       }
     }
 

From c3c26a8e240a504b75e00af58216acec76009146 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 17 Jun 2020 17:49:54 +1000
Subject: [PATCH 008/138] cache: use openexr directly

OIIO lacks fidelity over OpenEXR's threading. Using it directly gives us
a little more control.
---
 app/render/framehashcache.cpp | 65 ++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/app/render/framehashcache.cpp b/app/render/framehashcache.cpp
index 0bde0581a..58f18a957 100644
--- a/app/render/framehashcache.cpp
+++ b/app/render/framehashcache.cpp
@@ -206,34 +206,51 @@ FramePtr FrameHashCache::LoadCacheFrame(const QString &fn)
   FramePtr frame = nullptr;
 
   if (!fn.isEmpty() && QFileInfo::exists(fn)) {
-    auto input = OIIO::ImageInput::open(fn.toStdString());
+    Imf::InputFile file(fn.toUtf8(), 0);
 
-    if (input) {
-
-      PixelFormat::Format image_format = PixelFormat::OIIOFormatToOliveFormat(input->spec().format,
-                                                                              input->spec().nchannels == kRGBAChannels);
-
-      frame = Frame::Create();
-      frame->set_video_params(VideoParams(input->spec().width,
-                                          input->spec().height,
-                                          image_format));
-
-      frame->allocate();
-
-      input->read_image(input->spec().format,
-                        frame->data(),
-                        OIIO::AutoStride,
-                        frame->linesize_bytes());
-
-      input->close();
-
-#if OIIO_VERSION < 10903
-      OIIO::ImageInput::destroy(input);
-#endif
+    Imath::Box2i dw = file.header().dataWindow();
+    Imf::PixelType pix_type = file.header().channels().begin().channel().type;
+    int width = dw.max.x - dw.min.x + 1;
+    int height = dw.max.y - dw.min.y + 1;
+    bool has_alpha = file.header().channels().findChannel("A");
 
+    PixelFormat::Format image_format;
+    if (pix_type == Imf::HALF) {
+      if (has_alpha) {
+        image_format = PixelFormat::PIX_FMT_RGBA16F;
+      } else {
+        image_format = PixelFormat::PIX_FMT_RGB16F;
+      }
     } else {
-      qWarning() << "OIIO Error:" << OIIO::geterror().c_str();
+      if (has_alpha) {
+        image_format = PixelFormat::PIX_FMT_RGBA32F;
+      } else {
+        image_format = PixelFormat::PIX_FMT_RGB32F;
+      }
     }
+
+    frame = Frame::Create();
+    frame->set_video_params(VideoParams(width,
+                                        height,
+                                        image_format));
+
+    frame->allocate();
+
+    int bpc = PixelFormat::BytesPerChannel(image_format);
+
+    size_t xs = PixelFormat::ChannelCount(image_format) * bpc;
+    size_t ys = frame->linesize_bytes();
+
+    Imf::FrameBuffer framebuffer;
+    framebuffer.insert("R", Imf::Slice(pix_type, frame->data(), xs, ys));
+    framebuffer.insert("G", Imf::Slice(pix_type, frame->data() + bpc, xs, ys));
+    framebuffer.insert("B", Imf::Slice(pix_type, frame->data() + 2*bpc, xs, ys));
+    if (has_alpha) {
+      framebuffer.insert("A", Imf::Slice(pix_type, frame->data() + 3*bpc, xs, ys));
+    }
+
+    file.setFrameBuffer(framebuffer);
+    file.readPixels(dw.min.y, dw.max.y);
   }
 
   return frame;

From a818e17c551fd4ff4be1fb020cb6e3831ce62f91 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 17 Jun 2020 18:06:50 +1000
Subject: [PATCH 009/138] export: made progress on headless export

Still incomplete and unusable, but less so than before.
---
 app/cli/cliexport/cliexportmanager.cpp    |  30 ++++
 app/cli/cliexport/cliexportmanager.h      |  36 ++++
 app/cli/cliprogress/cliprogressdialog.cpp |   9 +-
 app/cli/cliprogress/cliprogressdialog.h   |   4 +-
 app/cli/clitask/clitaskdialog.cpp         |  10 +-
 app/cli/clitask/clitaskdialog.h           |   6 +
 app/codec/encoder.cpp                     |  57 ++++++
 app/codec/encoder.h                       |   3 +
 app/core.cpp                              | 206 ++++++++++++++++------
 app/core.h                                |  18 +-
 app/main.cpp                              |  20 +--
 app/task/export/exportparams.cpp          |  22 +++
 app/task/export/exportparams.h            |   2 +
 app/task/project/load/load.cpp            |   2 +
 14 files changed, 337 insertions(+), 88 deletions(-)
 create mode 100644 app/cli/cliexport/cliexportmanager.cpp
 create mode 100644 app/cli/cliexport/cliexportmanager.h

diff --git a/app/cli/cliexport/cliexportmanager.cpp b/app/cli/cliexport/cliexportmanager.cpp
new file mode 100644
index 000000000..de0145729
--- /dev/null
+++ b/app/cli/cliexport/cliexportmanager.cpp
@@ -0,0 +1,30 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "cliexportmanager.h"
+
+OLIVE_NAMESPACE_ENTER
+
+CLIExportManager::CLIExportManager()
+{
+
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/cli/cliexport/cliexportmanager.h b/app/cli/cliexport/cliexportmanager.h
new file mode 100644
index 000000000..6d3fc346b
--- /dev/null
+++ b/app/cli/cliexport/cliexportmanager.h
@@ -0,0 +1,36 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef CLIEXPORTMANAGER_H
+#define CLIEXPORTMANAGER_H
+
+#include "task/export/export.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class CLIExportManager : public QObject
+{
+public:
+  CLIExportManager();
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // CLIEXPORTMANAGER_H
diff --git a/app/cli/cliprogress/cliprogressdialog.cpp b/app/cli/cliprogress/cliprogressdialog.cpp
index fa846c1ff..88c0cfd57 100644
--- a/app/cli/cliprogress/cliprogressdialog.cpp
+++ b/app/cli/cliprogress/cliprogressdialog.cpp
@@ -27,9 +27,10 @@ OLIVE_NAMESPACE_ENTER
 CLIProgressDialog::CLIProgressDialog(const QString& title, QObject *parent) :
   QObject(parent),
   title_(title),
-  progress_(0),
+  progress_(-1),
   drawn_(false)
 {
+  SetProgress(0);
 }
 
 void CLIProgressDialog::Update()
@@ -68,7 +69,7 @@ void CLIProgressDialog::Update()
   std::cout << "[";
 
   // Get UI bar progress
-  int bar_prog = qRound(progress_ * 0.01 * progress_bar_columns);
+  int bar_prog = qRound(progress_ * progress_bar_columns);
 
   // Draw filled in bar
   for (int i=0;i<bar_prog;i++) {
@@ -90,10 +91,10 @@ void CLIProgressDialog::Update()
     std::cout << " ";
   }
 
-  std::cout << progress_ << "% " << std::flush;
+  std::cout << qRound(progress_ * 100.0) << "% " << std::endl << std::flush;
 }
 
-void CLIProgressDialog::SetProgress(int p)
+void CLIProgressDialog::SetProgress(double p)
 {
   if (progress_ != p) {
     progress_ = p;
diff --git a/app/cli/cliprogress/cliprogressdialog.h b/app/cli/cliprogress/cliprogressdialog.h
index 94cf65c84..40ffea6e8 100644
--- a/app/cli/cliprogress/cliprogressdialog.h
+++ b/app/cli/cliprogress/cliprogressdialog.h
@@ -34,14 +34,14 @@ public:
   CLIProgressDialog(const QString &title, QObject* parent = nullptr);
 
 public slots:
-  void SetProgress(int p);
+  void SetProgress(double p);
 
 private:
   void Update();
 
   QString title_;
 
-  int progress_;
+  double progress_;
 
   bool drawn_;
 
diff --git a/app/cli/clitask/clitaskdialog.cpp b/app/cli/clitask/clitaskdialog.cpp
index 69bd9b4cf..bb567f586 100644
--- a/app/cli/clitask/clitaskdialog.cpp
+++ b/app/cli/clitask/clitaskdialog.cpp
@@ -23,9 +23,15 @@
 OLIVE_NAMESPACE_ENTER
 
 CLITaskDialog::CLITaskDialog(Task *task, QObject* parent) :
-  CLIProgressDialog(task->GetTitle(), parent)
+  CLIProgressDialog(task->GetTitle(), parent),
+  task_(task)
 {
-  // FIXME: Still developing this, don't try to use
+  connect(task_, &Task::ProgressChanged, this, &CLITaskDialog::SetProgress);
+}
+
+bool CLITaskDialog::Run()
+{
+  return task_->Start();
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/cli/clitask/clitaskdialog.h b/app/cli/clitask/clitaskdialog.h
index 6408b238e..c574b6011 100644
--- a/app/cli/clitask/clitaskdialog.h
+++ b/app/cli/clitask/clitaskdialog.h
@@ -28,9 +28,15 @@ OLIVE_NAMESPACE_ENTER
 
 class CLITaskDialog : public CLIProgressDialog
 {
+  Q_OBJECT
 public:
   CLITaskDialog(Task *task, QObject* parent = nullptr);
 
+  bool Run();
+
+private:
+  Task* task_;
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/codec/encoder.cpp b/app/codec/encoder.cpp
index 43e0ca1a6..388278525 100644
--- a/app/codec/encoder.cpp
+++ b/app/codec/encoder.cpp
@@ -158,6 +158,63 @@ void EncodingParams::SetExportLength(const rational &export_length)
   export_length_ = export_length;
 }
 
+void EncodingParams::Save(QXmlStreamWriter *writer) const
+{
+  writer->writeStartElement(QStringLiteral("encode"));
+
+  writer->writeTextElement(QStringLiteral("filename"), filename_);
+
+  writer->writeStartElement(QStringLiteral("video"));
+
+  writer->writeAttribute(QStringLiteral("enabled"), QString::number(video_enabled_));
+
+  if (video_enabled_) {
+    writer->writeTextElement(QStringLiteral("codec"), QString::number(video_codec_));
+    writer->writeTextElement(QStringLiteral("width"), QString::number(video_params_.width()));
+    writer->writeTextElement(QStringLiteral("height"), QString::number(video_params_.height()));
+    writer->writeTextElement(QStringLiteral("format"), QString::number(video_params_.format()));
+    writer->writeTextElement(QStringLiteral("timebase"), video_params_.time_base().toString());
+    writer->writeTextElement(QStringLiteral("divider"), QString::number(video_params_.divider()));
+    writer->writeTextElement(QStringLiteral("bitrate"), QString::number(video_bit_rate_));
+    writer->writeTextElement(QStringLiteral("maxbitrate"), QString::number(video_max_bit_rate_));
+    writer->writeTextElement(QStringLiteral("bufsize"), QString::number(video_buffer_size_));
+    writer->writeTextElement(QStringLiteral("threads"), QString::number(video_threads_));
+
+    if (!video_opts_.isEmpty()) {
+      writer->writeStartElement(QStringLiteral("opts"));
+
+      QHash<QString, QString>::const_iterator i;
+      for (i=video_opts_.constBegin(); i!=video_opts_.constEnd(); i++) {
+        writer->writeStartElement(QStringLiteral("entry"));
+
+        writer->writeTextElement(QStringLiteral("key"), i.key());
+        writer->writeTextElement(QStringLiteral("value"), i.value());
+
+        writer->writeEndElement(); // entry
+      }
+
+      writer->writeEndElement(); // opts
+    }
+  }
+
+  writer->writeEndElement(); // video
+
+  writer->writeStartElement(QStringLiteral("audio"));
+
+  writer->writeAttribute(QStringLiteral("enabled"), QString::number(audio_enabled_));
+
+  if (audio_enabled_) {
+    writer->writeTextElement(QStringLiteral("codec"), QString::number(audio_codec_));
+    writer->writeTextElement(QStringLiteral("samplerate"), QString::number(audio_params_.sample_rate()));
+    writer->writeTextElement(QStringLiteral("channellayout"), QString::number(audio_params_.channel_layout()));
+    writer->writeTextElement(QStringLiteral("format"), QString::number(audio_params_.format()));
+  }
+
+  writer->writeEndElement(); // audio
+
+  writer->writeEndElement(); // encode
+}
+
 Encoder* Encoder::CreateFromID(const QString &id, const EncodingParams& params)
 {
   Q_UNUSED(id)
diff --git a/app/codec/encoder.h b/app/codec/encoder.h
index 8a60a75cc..260c735a3 100644
--- a/app/codec/encoder.h
+++ b/app/codec/encoder.h
@@ -23,6 +23,7 @@
 
 #include <memory>
 #include <QString>
+#include <QXmlStreamWriter>
 
 #include "codec/exportcodec.h"
 #include "codec/exportformat.h"
@@ -69,6 +70,8 @@ public:
   const rational& GetExportLength() const;
   void SetExportLength(const rational& GetExportLength);
 
+  virtual void Save(QXmlStreamWriter* writer) const;
+
 private:
   QString filename_;
 
diff --git a/app/core.cpp b/app/core.cpp
index 70fb71f6c..d737a0563 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -81,18 +81,17 @@ Core *Core::instance()
   return &instance_;
 }
 
-bool Core::Start()
+int Core::execute(QCoreApplication* a)
 {
-  // Reset config (Config sets to default on construction already, but we do it again here as a workaround that fixes
-  //               the fact that some of the config paths set by default rely on the app name having been set (in main())
-  Config::Current().SetDefaults();
+  int exit_code = 1;
+
+  // Start core
+  OLIVE_NAMESPACE::Core::instance()->Start();
 
   //
   // Parse command line arguments
   //
 
-  QCoreApplication* app = QCoreApplication::instance();
-
   QCommandLineParser parser;
   parser.addHelpOption();
   parser.addVersionOption();
@@ -111,7 +110,7 @@ bool Core::Start()
   parser.addOption(headless_export_option);
 
   // Parse options
-  parser.process(*app);
+  parser.process(*a);
 
   QStringList args = parser.positionalArguments();
 
@@ -120,6 +119,44 @@ bool Core::Start()
     startup_project_ = args.first();
   }
 
+  gui_active_ = !parser.isSet(headless_export_option);
+
+  if (gui_active_) {
+
+    // Start GUI
+    StartGUI(parser.isSet(fullscreen_option));
+
+    // If we have a startup
+    QMetaObject::invokeMethod(this, "OpenStartupProject", Qt::QueuedConnection);
+
+    // Run application loop and receive exit code
+    exit_code = a->exec();
+
+  } else {
+
+    if (parser.isSet(headless_export_option)) {
+      // Start a headless export
+      if (StartHeadlessExport()) {
+        exit_code = 0;
+      }
+    }
+
+  }
+
+
+
+  // Clear core memory
+  OLIVE_NAMESPACE::Core::instance()->Stop();
+
+  return exit_code;
+}
+
+void Core::Start()
+{
+  // Reset config (Config sets to default on construction already, but we do it again here as a workaround that fixes
+  //               the fact that some of the config paths set by default rely on the app name having been set (in main())
+  Config::Current().SetDefaults();
+
   // Declare custom types for Qt signal/slot system
   DeclareTypesForQt();
 
@@ -141,53 +178,6 @@ bool Core::Start()
   //
 
   qInfo() << "Using Qt version:" << qVersion();
-
-  gui_active_ = !parser.isSet(headless_export_option);
-
-  if (gui_active_) {
-
-    // Start GUI
-    StartGUI(parser.isSet(fullscreen_option));
-
-    // Load startup project
-    if (!startup_project_.isEmpty() && !QFileInfo::exists(startup_project_)) {
-      QMessageBox::warning(main_window(),
-                           tr("Failed to open startup file"),
-                           tr("The project \"%1\" doesn't exist. A new project will be started instead.").arg(startup_project_),
-                           QMessageBox::Ok);
-
-      startup_project_.clear();
-    }
-
-    if (startup_project_.isEmpty()) {
-      // If no load project is set, create a new one on open
-      CreateNewProject();
-    } else {
-      OpenProjectInternal(startup_project_);
-    }
-
-    return true;
-
-  } else {
-
-    if (parser.isSet(headless_export_option)) {
-
-      if (startup_project_.isEmpty()) {
-        qCritical().noquote() << tr("You must specify a project file to export");
-      } else {
-        OpenProjectInternal(startup_project_);
-
-        qDebug() << "Ready for exporting!";
-
-        return true;
-      }
-
-    }
-
-    // Error fallback
-    return false;
-
-  }
 }
 
 void Core::Stop()
@@ -539,6 +529,106 @@ void Core::ProjectWasModified(bool e)
   }
 }
 
+bool Core::StartHeadlessExport()
+{
+  if (startup_project_.isEmpty()) {
+    qCritical().noquote() << tr("You must specify a project file to export");
+    return false;
+  }
+
+  if (!QFileInfo::exists(startup_project_)) {
+    qCritical().noquote() << tr("Specified project does not exist");
+    return false;
+  }
+
+  // Start a load task and try running it
+  ProjectLoadTask plm(startup_project_);
+  CLITaskDialog task_dialog(&plm);
+
+  if (task_dialog.Run()) {
+    ProjectPtr p = plm.GetLoadedProjects().first();
+    QList<ItemPtr> items = p->get_items_of_type(Item::kSequence);
+
+    // Check if this project contains sequences
+    if (items.isEmpty()) {
+      qCritical().noquote() << tr("Project contains no sequences, nothing to export");
+      return false;
+    }
+
+    SequencePtr sequence = nullptr;
+
+    // Check if this project contains multiple sequences
+    if (items.size() > 1) {
+      qInfo().noquote() << tr("This project has multiple sequences. Which do you wish to export?");
+      for (int i=0;i<items.size();i++) {
+        std::cout << "[" << i << "] " << items.at(i)->name().toStdString();
+      }
+
+      QTextStream stream(stdin);
+      QString sequence_read;
+      int sequence_index = -1;
+      QString quit_code = QStringLiteral("q");
+      std::string prompt = tr("Enter number (or %1 to cancel): ").arg(quit_code).toStdString();
+      forever {
+        std::cout << prompt;
+
+        stream.readLineInto(&sequence_read);
+
+        if (!QString::compare(sequence_read, quit_code, Qt::CaseInsensitive)) {
+          return false;
+        }
+
+        bool ok;
+        sequence_index = sequence_read.toInt(&ok);
+
+        if (ok && sequence_index >= 0 && sequence_index < items.size()) {
+          break;
+        } else {
+          qCritical().noquote() << tr("Invalid sequence number");
+        }
+      }
+
+      sequence = std::static_pointer_cast<Sequence>(items.at(sequence_index));
+    } else {
+      sequence = std::static_pointer_cast<Sequence>(items.first());
+    }
+
+    ExportParams params;
+    ExportTask export_task(sequence->viewer_output(), p->color_manager(), params);
+    CLITaskDialog export_dialog(&export_task);
+    if (export_dialog.Run()) {
+      qInfo().noquote() << tr("Export succeeded");
+      return true;
+    } else {
+      qInfo().noquote() << tr("Export failed: %1").arg(export_task.GetError());
+      return false;
+    }
+  } else {
+    qCritical().noquote() << tr("Project failed to load: %1").arg(plm.GetError());
+    return false;
+  }
+}
+
+void Core::OpenStartupProject()
+{
+  // Load startup project
+  if (!startup_project_.isEmpty() && !QFileInfo::exists(startup_project_)) {
+    QMessageBox::warning(main_window_,
+                         tr("Failed to open startup file"),
+                         tr("The project \"%1\" doesn't exist. A new project will be started instead.").arg(startup_project_),
+                         QMessageBox::Ok);
+
+    startup_project_.clear();
+  }
+
+  if (startup_project_.isEmpty()) {
+    // If no load project is set, create a new one on open
+    CreateNewProject();
+  } else {
+    OpenProjectInternal(startup_project_);
+  }
+}
+
 void Core::DeclareTypesForQt()
 {
   qRegisterMetaType<rational>();
@@ -559,6 +649,7 @@ void Core::DeclareTypesForQt()
   qRegisterMetaType<OLIVE_NAMESPACE::SampleJob>();
   qRegisterMetaType<OLIVE_NAMESPACE::ShaderJob>();
   qRegisterMetaType<OLIVE_NAMESPACE::GenerateJob>();
+  qRegisterMetaType<OLIVE_NAMESPACE::VideoParams>();
 }
 
 void Core::StartGUI(bool full_screen)
@@ -877,6 +968,11 @@ bool Core::SaveProjectAs(ProjectPtr p)
                                             GetProjectFilter());
 
   if (!fn.isEmpty()) {
+    QString extension(QStringLiteral(".ove"));
+    if (!fn.endsWith(extension, Qt::CaseInsensitive)) {
+      fn.append(extension);
+    }
+
     p->set_filename(fn);
 
     SaveProjectInternal(p);
@@ -927,7 +1023,7 @@ void Core::OpenProjectInternal(const QString &filename)
 
     //connect(plm, &ProjectLoadManager::ProjectLoaded, this, &Core::AddOpenProject);
 
-    CLITaskDialog task_dialog(plm);
+
 
   }
 }
diff --git a/app/core.h b/app/core.h
index 07aeccb08..9b3d25728 100644
--- a/app/core.h
+++ b/app/core.h
@@ -66,12 +66,14 @@ public:
    */
   static Core* instance();
 
+  int execute(QCoreApplication *a);
+
   /**
    * @brief Start Olive Core
    *
    * Main application launcher. Parses command line arguments and constructs main window (if entering a GUI mode).
    */
-  bool Start();
+  void Start();
 
   /**
    * @brief Stop Olive Core
@@ -405,11 +407,6 @@ private:
    */
   void PushRecentlyOpenedProject(const QString &s);
 
-  /**
-   * @brief Internal project open
-   */
-  void OpenProjectInternal(const QString& filename);
-
   /**
    * @brief Declare custom types/classes for Qt's signal/slot system
    *
@@ -507,6 +504,15 @@ private slots:
 
   void ProjectWasModified(bool e);
 
+  bool StartHeadlessExport();
+
+  void OpenStartupProject();
+
+  /**
+   * @brief Internal project open
+   */
+  void OpenProjectInternal(const QString& filename);
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/main.cpp b/app/main.cpp
index e87f1fd34..0026395f0 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -86,23 +86,5 @@ int main(int argc, char *argv[]) {
   avfilter_register_all();
 #endif
 
-  int exit_code;
-
-  // Start core
-  if (OLIVE_NAMESPACE::Core::instance()->Start()) {
-
-    // Run application loop and receive exit code
-    exit_code = a.exec();
-
-  } else {
-
-    // Core failed to start, exit now
-    exit_code = 1;
-
-  }
-
-  // Clear core memory
-  OLIVE_NAMESPACE::Core::instance()->Stop();
-
-  return exit_code;
+  return OLIVE_NAMESPACE::Core::instance()->execute(&a);
 }
diff --git a/app/task/export/exportparams.cpp b/app/task/export/exportparams.cpp
index a603735ee..299c1fca3 100644
--- a/app/task/export/exportparams.cpp
+++ b/app/task/export/exportparams.cpp
@@ -100,4 +100,26 @@ QMatrix4x4 ExportParams::GenerateMatrix(ExportParams::VideoScalingMethod method,
   return preview_matrix;
 }
 
+void ExportParams::Save(QXmlStreamWriter *writer) const
+{
+  writer->writeStartElement(QStringLiteral("export"));
+
+  writer->writeTextElement(QStringLiteral("encoder"), encoder_id_);
+
+  writer->writeTextElement(QStringLiteral("vscale"), QString::number(video_scaling_method_));
+
+  writer->writeTextElement(QStringLiteral("range"), QString::number(has_custom_range_));
+
+  writer->writeTextElement(QStringLiteral("customrangein"), custom_range_.in().toString());
+
+  writer->writeTextElement(QStringLiteral("customrangeout"), custom_range_.out().toString());
+
+  // FIXME: Change this when color chains are implemented
+  writer->writeTextElement(QStringLiteral("color"), color_transform_.output());
+
+  EncodingParams::Save(writer);
+
+  writer->writeEndElement(); // export
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/task/export/exportparams.h b/app/task/export/exportparams.h
index a74ea3c5d..ed6106d67 100644
--- a/app/task/export/exportparams.h
+++ b/app/task/export/exportparams.h
@@ -56,6 +56,8 @@ public:
                                    int source_width, int source_height,
                                    int dest_width, int dest_height);
 
+  virtual void Save(QXmlStreamWriter* writer) const override;
+
 private:
   QString encoder_id_;
 
diff --git a/app/task/project/load/load.cpp b/app/task/project/load/load.cpp
index 20d05ce7d..932a94c74 100644
--- a/app/task/project/load/load.cpp
+++ b/app/task/project/load/load.cpp
@@ -70,6 +70,8 @@ bool ProjectLoadTask::Run()
 
     project_file.close();
 
+    emit ProgressChanged(1);
+
     if (reader.hasError()) {
       SetError(reader.errorString());
       return false;

From b456b6b0f668b2c79cfee4496202462ea25fbb21 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 17 Jun 2020 19:53:21 +1000
Subject: [PATCH 010/138] oiiodecoder: make sure spec is used instead of
 basetype

Fixed issue with image alpha handling.
---
 app/codec/oiio/oiiodecoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp
index 6d0804267..5a7650e89 100644
--- a/app/codec/oiio/oiiodecoder.cpp
+++ b/app/codec/oiio/oiiodecoder.cpp
@@ -379,7 +379,7 @@ bool OIIODecoder::OpenImageHandler(const QString &fn)
 
   is_rgba_ = (spec.nchannels == kRGBAChannels);
 
-  pix_fmt_ = GetFormatFromOIIOBasetype(spec.format);
+  pix_fmt_ = GetFormatFromOIIOBasetype(spec);
 
   if (pix_fmt_ == PixelFormat::PIX_FMT_INVALID) {
     qWarning() << "Failed to convert OIIO::ImageDesc to native pixel format";

From 57eb039b4caffb1a4fd7610445a34f1457952494 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 17 Jun 2020 20:50:03 +1000
Subject: [PATCH 011/138] debug: print graphics driver in debug log

Might help with debugging GPU issues from users.
---
 app/window/mainwindow/mainwindow.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 5e61cd1d6..c3eaf7e75 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -650,6 +650,7 @@ void MainWindow::showEvent(QShowEvent *e)
   context.create();
   context.makeCurrent(&surface);
   const char* vendor = reinterpret_cast<const char*>(context.functions()->glGetString(GL_VENDOR));
+  qDebug() << "Using graphics driver:" << vendor;
   if (!strcmp(vendor, "nouveau")) {
     QMetaObject::invokeMethod(this, "ShowNouveauWarning", Qt::QueuedConnection);
   }

From 5397457c8db0226b03f9feab699ac50fd27259da Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 18 Jun 2020 03:35:59 +1000
Subject: [PATCH 012/138] timeline: treat non-primary clicks as non-moving

Fixes bug where drag would get stuck if the user right clicked on the
timeline.
---
 app/widget/timelinewidget/timelinewidget.cpp        | 6 ++++++
 app/widget/timelinewidget/view/timelineviewbase.cpp | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index 97f186cca..908d7e3a2 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -893,6 +893,12 @@ void TimelineWidget::ViewMousePressed(TimelineViewMouseEvent *event)
   if (GetConnectedNode() && active_tool_ != nullptr) {
     active_tool_->MousePress(event);
   }
+
+  if (event->GetButton() != Qt::LeftButton) {
+    // Suspend tool immediately if the cursor isn't the primary button
+    active_tool_->MouseRelease(event);
+    active_tool_ = nullptr;
+  }
 }
 
 void TimelineWidget::ViewMouseMoved(TimelineViewMouseEvent *event)
diff --git a/app/widget/timelinewidget/view/timelineviewbase.cpp b/app/widget/timelinewidget/view/timelineviewbase.cpp
index 88798540c..c945f80db 100644
--- a/app/widget/timelinewidget/view/timelineviewbase.cpp
+++ b/app/widget/timelinewidget/view/timelineviewbase.cpp
@@ -134,7 +134,9 @@ bool TimelineViewBase::PlayheadPress(QMouseEvent *event)
 {
   QPointF scene_pos = mapToScene(event->pos());
 
-  dragging_playhead_ = (scene_pos.x() >= playhead_scene_left_ && scene_pos.x() < playhead_scene_right_);
+  dragging_playhead_ = (event->button() == Qt::LeftButton
+                        && scene_pos.x() >= playhead_scene_left_
+                        && scene_pos.x() < playhead_scene_right_);
 
   return dragging_playhead_;
 }

From c5dd406ff165177af14c8300de0442b33f21b35c Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 18 Jun 2020 14:11:50 +1000
Subject: [PATCH 013/138] slider: improved ladder usability

---
 app/widget/slider/sliderbase.cpp   |   9 +--
 app/widget/slider/sliderbase.h     |   2 +-
 app/widget/slider/sliderlabel.cpp  |   4 --
 app/widget/slider/sliderladder.cpp | 107 ++++++++++++++---------------
 app/widget/slider/sliderladder.h   |  20 ++----
 5 files changed, 65 insertions(+), 77 deletions(-)

diff --git a/app/widget/slider/sliderbase.cpp b/app/widget/slider/sliderbase.cpp
index 875d5f4e2..7818e4fd0 100644
--- a/app/widget/slider/sliderbase.cpp
+++ b/app/widget/slider/sliderbase.cpp
@@ -250,7 +250,8 @@ void SliderBase::LabelDragged()
     break;
   case kInteger:
   case kFloat:
-    drag_ladder_ = new SliderLadder(value_.toDouble(), drag_multiplier_, enable_ladder_ ? ladder_element_count_ : 0);
+    drag_ladder_ = new SliderLadder(drag_multiplier_, enable_ladder_ ? ladder_element_count_ : 0);
+    drag_ladder_->SetValue(ValueToString(value_));
     drag_ladder_->show();
 
     QPoint label_global_pos = label_->mapToGlobal(label_->pos());
@@ -263,7 +264,7 @@ void SliderBase::LabelDragged()
   }
 }
 
-void SliderBase::LadderDragged(int value, double multiplier)
+void SliderBase::LadderDragged(double value, double multiplier)
 {
   switch (mode_) {
   case kString:
@@ -272,7 +273,7 @@ void SliderBase::LadderDragged(int value, double multiplier)
   case kInteger:
   case kFloat:
   {
-    dragged_diff_ += static_cast<double>(value) * drag_multiplier_ * multiplier;
+    dragged_diff_ += value * drag_multiplier_ * multiplier;
 
     double drag_val = AdjustDragDistanceInternal(value_.toDouble(), dragged_diff_);
 
@@ -291,7 +292,7 @@ void SliderBase::LadderDragged(int value, double multiplier)
     }
 
     UpdateLabel(temp_dragged_value_);
-    drag_ladder_->SetValue(temp_dragged_value_.toDouble());
+    drag_ladder_->SetValue(ValueToString(temp_dragged_value_));
     emit ValueChanged(temp_dragged_value_);
     break;
   }
diff --git a/app/widget/slider/sliderbase.h b/app/widget/slider/sliderbase.h
index fa956db22..cbc9630a8 100644
--- a/app/widget/slider/sliderbase.h
+++ b/app/widget/slider/sliderbase.h
@@ -133,7 +133,7 @@ private slots:
 
   void LabelDragged();
 
-  void LadderDragged(int value, double multiplier);
+  void LadderDragged(double value, double multiplier);
 
   void LadderReleased();
 
diff --git a/app/widget/slider/sliderlabel.cpp b/app/widget/slider/sliderlabel.cpp
index ab80988da..8fcf30592 100644
--- a/app/widget/slider/sliderlabel.cpp
+++ b/app/widget/slider/sliderlabel.cpp
@@ -24,10 +24,6 @@
 #include <QMouseEvent>
 #include <QDebug>
 
-#ifdef Q_OS_MAC
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
 OLIVE_NAMESPACE_ENTER
 
 SliderLabel::SliderLabel(QWidget *parent) :
diff --git a/app/widget/slider/sliderladder.cpp b/app/widget/slider/sliderladder.cpp
index 41bc4d031..f21ab8852 100644
--- a/app/widget/slider/sliderladder.cpp
+++ b/app/widget/slider/sliderladder.cpp
@@ -26,16 +26,18 @@
 #include <QtMath>
 #include <QVBoxLayout>
 
+#ifdef Q_OS_MAC
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
 #include "common/clamp.h"
 #include "common/lerp.h"
 
 OLIVE_NAMESPACE_ENTER
 
-SliderLadder::SliderLadder(double start_val, double drag_multiplier, int nb_outer_values, QWidget* parent) :
+SliderLadder::SliderLadder(double drag_multiplier, int nb_outer_values, QWidget* parent) :
   QFrame(parent, Qt::Popup),
-  start_val_(start_val),
-  active_element_(nullptr),
-  relative_y_(-1)
+  y_mobility_(0)
 {
   QVBoxLayout* layout = new QVBoxLayout(this);
   layout->setMargin(0);
@@ -48,14 +50,17 @@ SliderLadder::SliderLadder(double start_val, double drag_multiplier, int nb_oute
     elements_.append(new SliderLadderElement(qPow(10, i + 1) * drag_multiplier));
   }
 
-  elements_.append(new SliderLadderElement(drag_multiplier));
+  // Create center entry
+  SliderLadderElement* start_element = new SliderLadderElement(drag_multiplier);
+  active_element_ = elements_.size();
+  start_element->SetHighlighted(true);
+  elements_.append(start_element);
 
   for (int i=0;i<nb_outer_values;i++) {
     elements_.append(new SliderLadderElement(qPow(10, - i - 1) * drag_multiplier));
   }
 
   foreach (SliderLadderElement* e, elements_) {
-    e->SetValue(start_val_);
     layout->addWidget(e);
   }
 
@@ -87,10 +92,10 @@ SliderLadder::~SliderLadder()
 #endif
 }
 
-void SliderLadder::SetValue(double val)
+void SliderLadder::SetValue(const QString &s)
 {
   foreach (SliderLadderElement* e, elements_) {
-    e->SetValue(val);
+    e->SetValue(s);
   }
 }
 
@@ -105,38 +110,7 @@ void SliderLadder::showEvent(QShowEvent *event)
 {
   QWidget::showEvent(event);
 
-  QMetaObject::invokeMethod(this, "InitRelativeY", Qt::QueuedConnection);
-  QMetaObject::invokeMethod(&drag_timer_, "start", Qt::QueuedConnection);
-}
-
-void SliderLadder::SetActiveElement()
-{
-  if (!active_element_
-      || relative_y_ < active_element_->y()
-      || relative_y_ >= active_element_->y() + active_element_->height()) {
-    if (active_element_) {
-      // Un-highlight active element if one is set
-      active_element_->SetHighlighted(false);
-    }
-
-    // Find new active element
-    foreach (SliderLadderElement* ele, elements_) {
-      if (relative_y_ >= ele->y() && relative_y_ < ele->y() + ele->height()) {
-        // This is the element!
-        active_element_ = ele;
-        active_element_->SetHighlighted(true);
-        relative_y_ = active_element_->y() + active_element_->height() / 2;
-        break;
-      }
-    }
-  }
-}
-
-void SliderLadder::InitRelativeY()
-{
-  relative_y_ = QCursor::pos().y() - this->y();
-
-  SetActiveElement();
+  drag_timer_.start();
 }
 
 void SliderLadder::TimerUpdate()
@@ -155,22 +129,45 @@ void SliderLadder::TimerUpdate()
   QCursor::setPos(drag_start_);
 #endif
 
-  int target = active_element_->y() + active_element_->height() / 2;
-  relative_y_ = lerp(relative_y_, static_cast<float>(target), 0.1f);
+  int y_threshold = fontMetrics().height() / 2;
 
-  if (!x_mvmt && !y_mvmt) {
-    return;
-  }
+  if (qAbs(y_mvmt) > qAbs(x_mvmt)
+      || qApp->keyboardModifiers() & Qt::ControlModifier) {
+    // Movement is vertical
+    y_mobility_ += y_mvmt;
 
-  // Determine which element we're in
-  relative_y_ = clamp(relative_y_ + y_mvmt,
-                      static_cast<float>(elements_.first()->y()),
-                      static_cast<float>(elements_.last()->y() + elements_.last()->height() - 1));
+    if (qAbs(y_mobility_) > y_threshold) {
+      int new_active_element;
 
-  SetActiveElement();
+      if (y_mvmt < 0) {
+        // Movement is UP
+        new_active_element = active_element_ - 1;
+      } else {
+        // Movement is DOWN
+        new_active_element = active_element_ + 1;
+      }
 
-  if (qAbs(x_mvmt) > qAbs(y_mvmt)) {
-    emit DraggedByValue(x_mvmt, active_element_->GetMultiplier());
+      // Check if the proposed element is valid
+      if (new_active_element >= 0 && new_active_element < elements_.size()) {
+        elements_.at(active_element_)->SetHighlighted(false);
+
+        active_element_ = new_active_element;
+
+        elements_.at(active_element_)->SetHighlighted(true);
+      }
+
+      y_mobility_ = 0;
+    }
+  } else {
+    // Movement is horizontal
+    emit DraggedByValue(x_mvmt , elements_.at(active_element_)->GetMultiplier());
+
+    // Reduce Y mobility
+    if (y_mobility_ > 0) {
+      y_mobility_--;
+    } else if (y_mobility_ < 0) {
+      y_mobility_++;
+    }
   }
 }
 
@@ -210,7 +207,7 @@ void SliderLadderElement::SetHighlighted(bool e)
   UpdateLabel();
 }
 
-void SliderLadderElement::SetValue(double value)
+void SliderLadderElement::SetValue(const QString &value)
 {
   value_ = value;
 
@@ -230,13 +227,13 @@ void SliderLadderElement::UpdateLabel()
     QString val_text;
 
     if (highlighted_) {
-      val_text = QString::number(value_);
+      val_text = value_;
     }
 
     label_->setText(QStringLiteral("%1\n%2").arg(QString::number(multiplier_),
                                                  val_text));
   } else {
-    label_->setText(QString::number(value_));
+    label_->setText(value_);
   }
 }
 
diff --git a/app/widget/slider/sliderladder.h b/app/widget/slider/sliderladder.h
index d404b1fb0..ce0ae6193 100644
--- a/app/widget/slider/sliderladder.h
+++ b/app/widget/slider/sliderladder.h
@@ -37,7 +37,7 @@ public:
 
   void SetHighlighted(bool e);
 
-  void SetValue(double value);
+  void SetValue(const QString& value);
 
   void SetMultiplierVisible(bool e);
 
@@ -52,7 +52,7 @@ private:
   QLabel* label_;
 
   double multiplier_;
-  double value_;
+  QString value_;
 
   bool highlighted_;
 
@@ -64,11 +64,11 @@ class SliderLadder : public QFrame
 {
   Q_OBJECT
 public:
-  SliderLadder(double start_val, double drag_multiplier, int nb_outer_values, QWidget* parent = nullptr);
+  SliderLadder(double drag_multiplier, int nb_outer_values, QWidget* parent = nullptr);
 
   virtual ~SliderLadder() override;
 
-  void SetValue(double val);
+  void SetValue(const QString& s);
 
 protected:
   virtual void mouseReleaseEvent(QMouseEvent *event) override;
@@ -81,23 +81,17 @@ signals:
   void Released();
 
 private:
-  void SetActiveElement();
-
   QPoint drag_start_;
 
-  double start_val_;
-
   QList<SliderLadderElement*> elements_;
 
-  SliderLadderElement* active_element_;
-
-  float relative_y_;
+  int active_element_;
 
   QTimer drag_timer_;
 
-private slots:
-  void InitRelativeY();
+  int y_mobility_;
 
+private slots:
   void TimerUpdate();
 
 };

From 897b9ca3dde162a85d22e1f7de7bdbe9651b9a8c Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 18 Jun 2020 15:06:07 +1000
Subject: [PATCH 014/138] statusbar: disconnect old task when connecting a new
 one

---
 app/window/mainwindow/mainstatusbar.cpp | 21 ++++++++++++++++++---
 app/window/mainwindow/mainstatusbar.h   |  4 ++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/window/mainwindow/mainstatusbar.cpp b/app/window/mainwindow/mainstatusbar.cpp
index bf3532dc6..fada2d6e7 100644
--- a/app/window/mainwindow/mainstatusbar.cpp
+++ b/app/window/mainwindow/mainstatusbar.cpp
@@ -26,7 +26,8 @@ OLIVE_NAMESPACE_ENTER
 
 MainStatusBar::MainStatusBar(QWidget *parent) :
   QStatusBar(parent),
-  manager_(nullptr)
+  manager_(nullptr),
+  connected_task_(nullptr)
 {
   setSizeGripEnabled(false);
 
@@ -37,7 +38,8 @@ MainStatusBar::MainStatusBar(QWidget *parent) :
   bar_->setMaximum(100);
   bar_->setVisible(false);
 
-  showMessage(tr("Welcome to %1 %2").arg(QCoreApplication::applicationName(), QCoreApplication::applicationVersion()));
+  showMessage(tr("Welcome to %1 %2").arg(QCoreApplication::applicationName(),
+                                         QCoreApplication::applicationVersion()));
 }
 
 void MainStatusBar::ConnectTaskManager(TaskManager *manager)
@@ -73,7 +75,15 @@ void MainStatusBar::UpdateStatus()
     }
 
     bar_->setVisible(true);
-    connect(t, &Task::ProgressChanged, this, &MainStatusBar::SetProgressBarValue);
+
+    if (connected_task_) {
+      disconnect(connected_task_, &Task::ProgressChanged, this, &MainStatusBar::SetProgressBarValue);
+      disconnect(connected_task_, &Task::destroyed, this, &MainStatusBar::ConnectedTaskDeleted);
+    }
+
+    connected_task_ = t;
+    connect(connected_task_, &Task::ProgressChanged, this, &MainStatusBar::SetProgressBarValue);
+    connect(connected_task_, &Task::destroyed, this, &MainStatusBar::ConnectedTaskDeleted);
   }
 }
 
@@ -82,6 +92,11 @@ void MainStatusBar::SetProgressBarValue(double d)
   bar_->setValue(qRound(100.0 * d));
 }
 
+void MainStatusBar::ConnectedTaskDeleted()
+{
+  connected_task_ = nullptr;
+}
+
 void MainStatusBar::mouseDoubleClickEvent(QMouseEvent* e)
 {
   QStatusBar::mouseDoubleClickEvent(e);
diff --git a/app/window/mainwindow/mainstatusbar.h b/app/window/mainwindow/mainstatusbar.h
index 5951c2dd7..a1bd8fb27 100644
--- a/app/window/mainwindow/mainstatusbar.h
+++ b/app/window/mainwindow/mainstatusbar.h
@@ -50,11 +50,15 @@ private slots:
 
   void SetProgressBarValue(double d);
 
+  void ConnectedTaskDeleted();
+
 private:
   TaskManager* manager_;
 
   QProgressBar* bar_;
 
+  Task* connected_task_;
+
 };
 
 OLIVE_NAMESPACE_EXIT

From a717742cbca7ecfa9bc168ee6d57cf0f5f0214cb Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 18 Jun 2020 15:07:47 +1000
Subject: [PATCH 015/138] nodetable: show values in separate columns

Works for vector coordinates (e.g. XY, XYZ, etc.) as well as displays
checkboxes for RGB/A. Still non-functional.
---
 app/widget/nodetableview/nodetableview.cpp | 58 ++++++++++++----------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/app/widget/nodetableview/nodetableview.cpp b/app/widget/nodetableview/nodetableview.cpp
index 8e9f5aab0..f876b82d5 100644
--- a/app/widget/nodetableview/nodetableview.cpp
+++ b/app/widget/nodetableview/nodetableview.cpp
@@ -20,6 +20,7 @@
 
 #include "nodetableview.h"
 
+#include <QCheckBox>
 #include <QHeaderView>
 
 #include "node/param.h"
@@ -31,7 +32,12 @@ NodeTableView::NodeTableView(QWidget* parent) :
   QTreeWidget(parent)
 {
   setColumnCount(3);
-  setHeaderLabels({tr("Type"), tr("Value"), tr("Source")});
+  setHeaderLabels({tr("Type"),
+                   tr("Source"),
+                   tr("R/X"),
+                   tr("G/Y"),
+                   tr("B/Z"),
+                   tr("A/W")});
 }
 
 void NodeTableView::SetNode(Node *n, const rational &time)
@@ -60,41 +66,41 @@ void NodeTableView::SetNode(Node *n, const rational &time)
     for (int j=table.Count()-1; j>=0; j--) {
       const NodeValue& value = table.at(j);
 
-      QString value_str = NodeInput::ValueToString(value.type(), value.data());
+      // Create item
+      QTreeWidgetItem* sub_item = new QTreeWidgetItem();
+      top_item->addChild(sub_item);
 
+      // Set data type name
+      sub_item->setText(0, NodeParam::GetPrettyDataTypeName(value.type()));
+
+      // Determine source
       QString source_name;
       if (value.source()) {
         source_name = value.source()->Name();
       } else {
         source_name = tr("(unknown)");
       }
+      sub_item->setText(1, source_name);
 
-      QTreeWidgetItem* sub_item = new QTreeWidgetItem();
-      sub_item->setText(0, NodeParam::GetPrettyDataTypeName(value.type()));
-      sub_item->setText(1, value_str);
-      sub_item->setText(2, source_name);
-      top_item->addChild(sub_item);
+      switch (value.type()) {
+      case NodeParam::kTexture:
+      {
+        // NodeTableTraverser puts video params in here
+        VideoParams p = value.data().value<VideoParams>();
+        int channel_count = PixelFormat::ChannelCount(p.format());
 
-      // Special cases
-      if (value.type() == NodeParam::kTexture) {
-        // NodeTableTraverser converts footage to VideoParams
-        QTreeWidgetItem* red_channel = new QTreeWidgetItem();
-        red_channel->setText(0, tr("Red"));
-        sub_item->addChild(red_channel);
-
-        QTreeWidgetItem* green_channel = new QTreeWidgetItem();
-        green_channel->setText(0, tr("Green"));
-        sub_item->addChild(green_channel);
-
-        QTreeWidgetItem* blue_channel = new QTreeWidgetItem();
-        blue_channel->setText(0, tr("Blue"));
-        sub_item->addChild(blue_channel);
-
-        if (PixelFormat::FormatHasAlphaChannel(value.data().value<VideoParams>().format())) {
-          QTreeWidgetItem* alpha_channel = new QTreeWidgetItem();
-          alpha_channel->setText(0, tr("Alpha"));
-          sub_item->addChild(alpha_channel);
+        for (int k=0;k<channel_count;k++) {
+          this->setItemWidget(sub_item, 2 + k, new QCheckBox());
         }
+        break;
+      }
+      default:
+      {
+        QVector<QVariant> split_values = input->split_normal_value_into_track_values(value.data());
+        for (int k=0;k<split_values.size();k++) {
+          sub_item->setText(2 + k, NodeInput::ValueToString(value.type(), split_values.at(k)));
+        }
+      }
       }
     }
   }

From e47c985baaebd297509fe31eee2c26244fa1dd92 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 18 Jun 2020 16:30:36 +1000
Subject: [PATCH 016/138] slider: if a ladder appears, signal the label that
 the drag has finished

---
 app/widget/slider/sliderbase.cpp | 2 ++
 app/widget/slider/sliderlabel.h  | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/app/widget/slider/sliderbase.cpp b/app/widget/slider/sliderbase.cpp
index 7818e4fd0..67ff5b7de 100644
--- a/app/widget/slider/sliderbase.cpp
+++ b/app/widget/slider/sliderbase.cpp
@@ -260,6 +260,8 @@ void SliderBase::LabelDragged()
 
     connect(drag_ladder_, &SliderLadder::DraggedByValue, this, &SliderBase::LadderDragged);
     connect(drag_ladder_, &SliderLadder::Released, this, &SliderBase::LadderReleased);
+
+    label_->CancelDrag();
     break;
   }
 }
diff --git a/app/widget/slider/sliderlabel.h b/app/widget/slider/sliderlabel.h
index 081c5eafa..6ac8f9e5a 100644
--- a/app/widget/slider/sliderlabel.h
+++ b/app/widget/slider/sliderlabel.h
@@ -33,6 +33,11 @@ class SliderLabel : public QLabel
 public:
   SliderLabel(QWidget* parent);
 
+  void CancelDrag()
+  {
+    dragging_ = false;
+  }
+
 protected:
   virtual void mousePressEvent(QMouseEvent *ev) override;
 

From 57f858dd92daae08c91b6df07a25f80ee263c497 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 18 Jun 2020 16:30:57 +1000
Subject: [PATCH 017/138] nodetable: correctly update with time

---
 app/node/value.cpp                           |  8 ++-
 app/node/value.h                             | 11 +++-
 app/panel/table/table.h                      |  1 +
 app/widget/nodetableview/nodetableview.cpp   | 56 ++++++++++++++++----
 app/widget/nodetableview/nodetableview.h     |  3 ++
 app/widget/nodetableview/nodetablewidget.cpp | 27 +++++++++-
 app/widget/nodetableview/nodetablewidget.h   |  7 +++
 app/window/mainwindow/mainwindow.cpp         |  3 ++
 8 files changed, 100 insertions(+), 16 deletions(-)

diff --git a/app/node/value.cpp b/app/node/value.cpp
index e2f9913c5..ef5ac05bd 100644
--- a/app/node/value.cpp
+++ b/app/node/value.cpp
@@ -44,7 +44,12 @@ void NodeValueDatabase::Insert(const NodeInput *key, const NodeValueTable &value
 
 NodeValueTable NodeValueDatabase::Merge() const
 {
-  return NodeValueTable::Merge(tables_.values());
+  QHash<QString, NodeValueTable> copy = tables_;
+
+  // Kinda hacky, but we don't need this table to slipstream
+  copy.remove(QStringLiteral("global"));
+
+  return NodeValueTable::Merge(copy.values());
 }
 
 NodeValue::NodeValue() :
@@ -176,7 +181,6 @@ NodeValueTable NodeValueTable::Merge(QList<NodeValueTable> tables)
   NodeValueTable merged_table;
 
   // Slipstreams all tables together
-  // FIXME: I don't actually know if this is the right approach...
   foreach (const NodeValueTable& t, tables) {
     if (row >= t.Count()) {
       continue;
diff --git a/app/node/value.h b/app/node/value.h
index 7efb8592a..448c1c54d 100644
--- a/app/node/value.h
+++ b/app/node/value.h
@@ -108,14 +108,21 @@ public:
 
   using const_iterator = QHash<QString, NodeValueTable>::const_iterator;
 
-  inline QHash<QString, NodeValueTable>::const_iterator begin() const {
+  inline QHash<QString, NodeValueTable>::const_iterator begin() const
+  {
     return tables_.cbegin();
   }
 
-  inline QHash<QString, NodeValueTable>::const_iterator end() const {
+  inline QHash<QString, NodeValueTable>::const_iterator end() const
+  {
     return tables_.cend();
   }
 
+  inline bool contains(const QString& s) const
+  {
+    return tables_.contains(s);
+  }
+
 private:
   QHash<QString, NodeValueTable> tables_;
 
diff --git a/app/panel/table/table.h b/app/panel/table/table.h
index 0587cf51b..d08fe0de3 100644
--- a/app/panel/table/table.h
+++ b/app/panel/table/table.h
@@ -28,6 +28,7 @@ OLIVE_NAMESPACE_ENTER
 
 class NodeTablePanel : public TimeBasedPanel
 {
+  Q_OBJECT
 public:
   NodeTablePanel(QWidget* parent);
 
diff --git a/app/widget/nodetableview/nodetableview.cpp b/app/widget/nodetableview/nodetableview.cpp
index f876b82d5..9d6590cbc 100644
--- a/app/widget/nodetableview/nodetableview.cpp
+++ b/app/widget/nodetableview/nodetableview.cpp
@@ -29,7 +29,8 @@
 OLIVE_NAMESPACE_ENTER
 
 NodeTableView::NodeTableView(QWidget* parent) :
-  QTreeWidget(parent)
+  QTreeWidget(parent),
+  last_set_node_(nullptr)
 {
   setColumnCount(3);
   setHeaderLabels({tr("Type"),
@@ -42,11 +43,23 @@ NodeTableView::NodeTableView(QWidget* parent) :
 
 void NodeTableView::SetNode(Node *n, const rational &time)
 {
-  clear();
+  if (last_set_node_ != n) {
+    // Clear everything if the node has changed
+    clear();
+  }
+  last_set_node_ = n;
 
   NodeTableTraverser traverser;
   NodeValueDatabase db = traverser.GenerateDatabase(n, TimeRange(time, time));
 
+  // Remove top items if necessary
+  for (int i=0;i<this->topLevelItemCount();i++) {
+    if (!db.contains(this->topLevelItem(i)->data(0, Qt::UserRole).toString())) {
+      delete this->takeTopLevelItem(i);
+      i--;
+    }
+  }
+
   NodeValueDatabase::const_iterator i;
 
   for (i=db.begin(); i!=db.end(); i++) {
@@ -58,17 +71,40 @@ void NodeTableView::SetNode(Node *n, const rational &time)
       continue;
     }
 
-    QTreeWidgetItem* top_item = new QTreeWidgetItem();
-    top_item->setText(0, input->name());
-    top_item->setFirstColumnSpanned(true);
-    this->addTopLevelItem(top_item);
+    QTreeWidgetItem* top_item = nullptr;
 
-    for (int j=table.Count()-1; j>=0; j--) {
-      const NodeValue& value = table.at(j);
+    for (int j=0;j<this->topLevelItemCount();j++) {
+      QTreeWidgetItem* compare = this->topLevelItem(j);
+
+      if (compare->data(0, Qt::UserRole).toString() == input->id()) {
+        top_item = compare;
+        break;
+      }
+    }
+
+    if (!top_item) {
+      top_item = new QTreeWidgetItem();
+      top_item->setText(0, input->name());
+      top_item->setData(0, Qt::UserRole, input->id());
+      top_item->setFirstColumnSpanned(true);
+      this->addTopLevelItem(top_item);
+    }
+
+    // Create children if necessary
+    while (top_item->childCount() < table.Count())  {
+      top_item->addChild(new QTreeWidgetItem());
+    }
+
+    // Remove children if necessary
+    while (top_item->childCount() > table.Count()) {
+      delete top_item->takeChild(top_item->childCount() - 1);
+    }
+
+    for (int j=0;j<table.Count();j++) {
+      const NodeValue& value = table.at(table.Count() - 1 - j);
 
       // Create item
-      QTreeWidgetItem* sub_item = new QTreeWidgetItem();
-      top_item->addChild(sub_item);
+      QTreeWidgetItem* sub_item = top_item->child(j);
 
       // Set data type name
       sub_item->setText(0, NodeParam::GetPrettyDataTypeName(value.type()));
diff --git a/app/widget/nodetableview/nodetableview.h b/app/widget/nodetableview/nodetableview.h
index e453903b7..1ce906c09 100644
--- a/app/widget/nodetableview/nodetableview.h
+++ b/app/widget/nodetableview/nodetableview.h
@@ -36,6 +36,9 @@ public:
 
   void SetMultipleNodeMessage();
 
+private:
+  Node* last_set_node_;
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodetableview/nodetablewidget.cpp b/app/widget/nodetableview/nodetablewidget.cpp
index 20db058c2..0c50794ab 100644
--- a/app/widget/nodetableview/nodetablewidget.cpp
+++ b/app/widget/nodetableview/nodetablewidget.cpp
@@ -25,7 +25,8 @@
 OLIVE_NAMESPACE_ENTER
 
 NodeTableWidget::NodeTableWidget(QWidget* parent) :
-  TimeBasedWidget(parent)
+  TimeBasedWidget(parent),
+  node_(nullptr)
 {
   QVBoxLayout* layout = new QVBoxLayout(this);
   layout->setSpacing(0);
@@ -37,13 +38,35 @@ NodeTableWidget::NodeTableWidget(QWidget* parent) :
 
 void NodeTableWidget::SetNodes(const QList<Node *> &nodes)
 {
+  node_ = nullptr;
+
   if (nodes.isEmpty()) {
     view_->clear();
   } else if (nodes.size() == 1) {
-    view_->SetNode(nodes.first(), rational());
+    node_ = nodes.first();
+
+    ViewerOutput* viewer = node_->FindOutputNode<ViewerOutput>();
+    if (viewer) {
+      qDebug() << "Found timebase";
+      SetTimebase(viewer->video_params().time_base());
+    }
+
+    UpdateView();
   } else {
     view_->SetMultipleNodeMessage();
   }
 }
 
+void NodeTableWidget::TimeChangedEvent(const int64_t &)
+{
+  UpdateView();
+}
+
+void NodeTableWidget::UpdateView()
+{
+  if (node_) {
+    view_->SetNode(node_, GetTime());
+  }
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodetableview/nodetablewidget.h b/app/widget/nodetableview/nodetablewidget.h
index ae0c82cc4..bc05d768d 100644
--- a/app/widget/nodetableview/nodetablewidget.h
+++ b/app/widget/nodetableview/nodetablewidget.h
@@ -33,9 +33,16 @@ public:
 
   void SetNodes(const QList<Node*>& nodes);
 
+protected:
+  virtual void TimeChangedEvent(const int64_t& ts) override;
+
 private:
+  void UpdateView();
+
   NodeTableView* view_;
 
+  Node* node_;
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index a917143f6..09286c316 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -86,7 +86,9 @@ MainWindow::MainWindow(QWidget *parent) :
   connect(node_panel_, &NodePanel::SelectionChanged, table_panel_, &NodeTablePanel::SetNodes);
   connect(param_panel_, &ParamPanel::RequestSelectNode, node_panel_, &NodePanel::Select);
   connect(sequence_viewer_panel_, &SequenceViewerPanel::TimeChanged, param_panel_, &ParamPanel::SetTimestamp);
+  connect(sequence_viewer_panel_, &SequenceViewerPanel::TimeChanged, table_panel_, &NodeTablePanel::SetTimestamp);
   connect(param_panel_, &ParamPanel::TimeChanged, sequence_viewer_panel_, &SequenceViewerPanel::SetTimestamp);
+  connect(param_panel_, &ParamPanel::TimeChanged, table_panel_, &NodeTablePanel::SetTimestamp);
   connect(param_panel_, &ParamPanel::FoundGizmos, sequence_viewer_panel_, &SequenceViewerPanel::SetGizmos);
   connect(PanelManager::instance(), &PanelManager::FocusedPanelChanged, this, &MainWindow::FocusedPanelChanged);
 
@@ -518,6 +520,7 @@ TimelinePanel* MainWindow::AppendTimelinePanel()
 
   connect(panel, &PanelWidget::CloseRequested, this, &MainWindow::TimelineCloseRequested);
   connect(panel, &TimelinePanel::TimeChanged, param_panel_, &ParamPanel::SetTimestamp);
+  connect(panel, &TimelinePanel::TimeChanged, table_panel_, &NodeTablePanel::SetTimestamp);
   connect(panel, &TimelinePanel::TimeChanged, sequence_viewer_panel_, &SequenceViewerPanel::SetTimestamp);
   connect(panel, &TimelinePanel::SelectionChanged, node_panel_, &NodePanel::SelectBlocks);
   connect(param_panel_, &ParamPanel::TimeChanged, panel, &TimelinePanel::SetTimestamp);

From e8c8fedcdb6d0a9d8affae2f4a09681b8a843d35 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 18 Jun 2020 17:50:28 +1000
Subject: [PATCH 018/138] slider: stop ladder drag timer on release

---
 app/widget/slider/sliderladder.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/widget/slider/sliderladder.cpp b/app/widget/slider/sliderladder.cpp
index f21ab8852..bbfd50575 100644
--- a/app/widget/slider/sliderladder.cpp
+++ b/app/widget/slider/sliderladder.cpp
@@ -103,6 +103,8 @@ void SliderLadder::mouseReleaseEvent(QMouseEvent *event)
 {
   Q_UNUSED(event)
 
+  drag_timer_.stop();
+
   emit Released();
 }
 

From 115e62f1403b03a326fe98e099ae56cce528a5e5 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 18 Jun 2020 18:52:13 +1000
Subject: [PATCH 019/138] slider: further behavior improvements

Ladders appears offset on sliders with multipliers. Ladder also appears
on initial press (but still shows line edit if mouse wasn't moved)
---
 app/dialog/richtext/richtext.cpp              |  1 -
 app/widget/colorwheel/colorvalueswidget.cpp   |  1 -
 .../nodeparamviewwidgetbridge.cpp             |  4 +-
 app/widget/slider/sliderbase.cpp              | 96 ++++++++++++-------
 app/widget/slider/sliderbase.h                | 17 ++--
 app/widget/slider/sliderlabel.cpp             | 19 +---
 app/widget/slider/sliderlabel.h               | 16 ----
 app/widget/slider/sliderladder.cpp            |  4 +
 8 files changed, 73 insertions(+), 85 deletions(-)

diff --git a/app/dialog/richtext/richtext.cpp b/app/dialog/richtext/richtext.cpp
index 5b4303530..8807156b9 100644
--- a/app/dialog/richtext/richtext.cpp
+++ b/app/dialog/richtext/richtext.cpp
@@ -50,7 +50,6 @@ RichTextDialog::RichTextDialog(const QString &start, QWidget* parent) :
   toolbar_layout->addWidget(font_combo_);
   size_slider_ = new FloatSlider();
   size_slider_->SetMinimum(0.1);
-  size_slider_->SetLadderEnabled(true);
   size_slider_->SetLadderElementCount(1);
   size_slider_->setToolTip(tr("Font Size"));
   toolbar_layout->addWidget(size_slider_);
diff --git a/app/widget/colorwheel/colorvalueswidget.cpp b/app/widget/colorwheel/colorvalueswidget.cpp
index 1b7fd76fc..43b328949 100644
--- a/app/widget/colorwheel/colorvalueswidget.cpp
+++ b/app/widget/colorwheel/colorvalueswidget.cpp
@@ -203,7 +203,6 @@ FloatSlider *ColorValuesTab::CreateColorSlider()
   FloatSlider* fs = new FloatSlider();
   fs->SetDragMultiplier(0.01);
   fs->SetDecimalPlaces(5);
-  fs->SetLadderEnabled(true);
   fs->SetLadderElementCount(1);
   connect(fs, &FloatSlider::ValueChanged, this, &ColorValuesTab::SliderChanged);
   return fs;
diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
index dc2638ccd..4e4fabba3 100644
--- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
+++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
@@ -96,7 +96,7 @@ void NodeParamViewWidgetBridge::CreateWidgets()
     {
       IntegerSlider* slider = new IntegerSlider();
       slider->SetDefaultValue(input_->GetDefaultValue());
-      slider->SetLadderEnabled(true);
+      slider->SetLadderElementCount(2);
       widgets_.append(slider);
       connect(slider, &IntegerSlider::ValueChanged, this, &NodeParamViewWidgetBridge::WidgetCallback);
       break;
@@ -373,7 +373,7 @@ void NodeParamViewWidgetBridge::CreateSliders(int count)
   for (int i=0;i<count;i++) {
     FloatSlider* fs = new FloatSlider();
     fs->SetDefaultValue(input_->GetDefaultValueForTrack(i));
-    fs->SetLadderEnabled(true);
+    fs->SetLadderElementCount(2);
     widgets_.append(fs);
     connect(fs, &FloatSlider::ValueChanged, this, &NodeParamViewWidgetBridge::WidgetCallback);
   }
diff --git a/app/widget/slider/sliderbase.cpp b/app/widget/slider/sliderbase.cpp
index 67ff5b7de..727b2aa01 100644
--- a/app/widget/slider/sliderbase.cpp
+++ b/app/widget/slider/sliderbase.cpp
@@ -40,8 +40,8 @@ SliderBase::SliderBase(Mode mode, QWidget *parent) :
   require_valid_input_(true),
   tristate_(false),
   drag_ladder_(nullptr),
-  enable_ladder_(false),
-  ladder_element_count_(2)
+  ladder_element_count_(0),
+  dragged_(false)
 {
   setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
 
@@ -52,9 +52,8 @@ SliderBase::SliderBase(Mode mode, QWidget *parent) :
   editor_ = new FocusableLineEdit(this);
   addWidget(editor_);
 
-  connect(label_, &SliderLabel::LabelMoved, this, &SliderBase::LabelDragged);
-  connect(label_, &SliderLabel::LabelReleased, this, &SliderBase::LabelClicked);
-  connect(label_, &SliderLabel::focused, this, &SliderBase::LabelClicked);
+  connect(label_, &SliderLabel::LabelPressed, this, &SliderBase::LabelPressed);
+  connect(label_, &SliderLabel::focused, this, &SliderBase::ShowEditor);
   connect(label_, &SliderLabel::RequestReset, this, &SliderBase::ResetValue);
   connect(editor_, &FocusableLineEdit::Confirmed, this, &SliderBase::LineEditConfirmed);
   connect(editor_, &FocusableLineEdit::Cancelled, this, &SliderBase::LineEditCancelled);
@@ -201,6 +200,22 @@ QString SliderBase::GetFormat() const
   }
 }
 
+void SliderBase::RepositionLadder()
+{
+  QPoint label_global_pos = label_->mapToGlobal(label_->pos());
+  int text_width = QFontMetricsWidth(label_->fontMetrics(), label_->text());
+  QPoint ladder_pos(label_global_pos.x(),
+                    label_global_pos.y() + label_->height() / 2 - drag_ladder_->height() / 2);
+
+  if (ladder_element_count_ > 0) {
+    ladder_pos.setX(ladder_pos.x() + text_width + QFontMetricsWidth(label_->fontMetrics(), QStringLiteral("H")));
+  } else {
+    ladder_pos.setX(ladder_pos.x() + text_width / 2 - drag_ladder_->width() / 2);
+  }
+
+  drag_ladder_->move(ladder_pos);
+}
+
 void SliderBase::UpdateLabel(const QVariant &v)
 {
   if (tristate_) {
@@ -226,23 +241,21 @@ QVariant SliderBase::StringToValue(const QString &s, bool *ok)
   return s;
 }
 
-void SliderBase::LabelClicked()
+void SliderBase::ShowEditor()
 {
-  if (!drag_ladder_) {
-    // This was a simple click
-    // Load label's text into editor
-    editor_->setText(ValueToString(value_));
+  // This was a simple click
+  // Load label's text into editor
+  editor_->setText(ValueToString(value_));
 
-    // Show editor
-    setCurrentWidget(editor_);
+  // Show editor
+  setCurrentWidget(editor_);
 
-    // Select all text in the editor
-    editor_->setFocus();
-    editor_->selectAll();
-  }
+  // Select all text in the editor
+  editor_->setFocus();
+  editor_->selectAll();
 }
 
-void SliderBase::LabelDragged()
+void SliderBase::LabelPressed()
 {
   switch (mode_) {
   case kString:
@@ -250,24 +263,24 @@ void SliderBase::LabelDragged()
     break;
   case kInteger:
   case kFloat:
-    drag_ladder_ = new SliderLadder(drag_multiplier_, enable_ladder_ ? ladder_element_count_ : 0);
+  {
+    drag_ladder_ = new SliderLadder(drag_multiplier_, ladder_element_count_);
     drag_ladder_->SetValue(ValueToString(value_));
     drag_ladder_->show();
 
-    QPoint label_global_pos = label_->mapToGlobal(label_->pos());
-    drag_ladder_->move(label_global_pos.x() + QFontMetricsWidth(label_->fontMetrics(), label_->text()) / 2 - drag_ladder_->width() / 2,
-                       label_global_pos.y() + label_->height() / 2 - drag_ladder_->height() / 2);
+    RepositionLadder();
 
     connect(drag_ladder_, &SliderLadder::DraggedByValue, this, &SliderBase::LadderDragged);
     connect(drag_ladder_, &SliderLadder::Released, this, &SliderBase::LadderReleased);
-
-    label_->CancelDrag();
     break;
   }
+  }
 }
 
-void SliderBase::LadderDragged(double value, double multiplier)
+void SliderBase::LadderDragged(int value, double multiplier)
 {
+  dragged_ = true;
+
   switch (mode_) {
   case kString:
     // No dragging supported for strings
@@ -294,7 +307,10 @@ void SliderBase::LadderDragged(double value, double multiplier)
     }
 
     UpdateLabel(temp_dragged_value_);
+
     drag_ladder_->SetValue(ValueToString(temp_dragged_value_));
+    RepositionLadder();
+
     emit ValueChanged(temp_dragged_value_);
     break;
   }
@@ -307,20 +323,26 @@ void SliderBase::LadderReleased()
   drag_ladder_ = nullptr;
   dragged_diff_ = 0;
 
-  // This was a drag
-  switch (mode_) {
-  case kString:
-    // No-op
-    break;
-  case kInteger:
-    SetValue(temp_dragged_value_.toInt());
-    break;
-  case kFloat:
-    SetValue(temp_dragged_value_.toDouble());
-    break;
-  }
+  if (dragged_) {
+    // This was a drag
+    switch (mode_) {
+    case kString:
+      // No-op
+      break;
+    case kInteger:
+      SetValue(temp_dragged_value_.toInt());
+      break;
+    case kFloat:
+      SetValue(temp_dragged_value_.toDouble());
+      break;
+    }
 
-  emit ValueChanged(value_);
+    emit ValueChanged(value_);
+
+    dragged_ = false;
+  } else {
+    ShowEditor();
+  }
 }
 
 void SliderBase::LineEditConfirmed()
diff --git a/app/widget/slider/sliderbase.h b/app/widget/slider/sliderbase.h
index cbc9630a8..7e8062694 100644
--- a/app/widget/slider/sliderbase.h
+++ b/app/widget/slider/sliderbase.h
@@ -56,11 +56,6 @@ public:
   void SetFormat(const QString& s);
   void ClearFormat();
 
-  void SetLadderEnabled(bool e)
-  {
-    enable_ladder_ = e;
-  }
-
   void SetLadderElementCount(int b)
   {
     ladder_element_count_ = b;
@@ -97,6 +92,8 @@ private:
 
   QString GetFormat() const;
 
+  void RepositionLadder();
+
   SliderLabel* label_;
 
   FocusableLineEdit* editor_;
@@ -124,16 +121,16 @@ private:
 
   SliderLadder* drag_ladder_;
 
-  bool enable_ladder_;
-
   int ladder_element_count_;
 
+  bool dragged_;
+
 private slots:
-  void LabelClicked();
+  void ShowEditor();
 
-  void LabelDragged();
+  void LabelPressed();
 
-  void LadderDragged(double value, double multiplier);
+  void LadderDragged(int value, double multiplier);
 
   void LadderReleased();
 
diff --git a/app/widget/slider/sliderlabel.cpp b/app/widget/slider/sliderlabel.cpp
index 8fcf30592..319398a91 100644
--- a/app/widget/slider/sliderlabel.cpp
+++ b/app/widget/slider/sliderlabel.cpp
@@ -27,8 +27,7 @@
 OLIVE_NAMESPACE_ENTER
 
 SliderLabel::SliderLabel(QWidget *parent) :
-  QLabel(parent),
-  dragging_(false)
+  QLabel(parent)
 {
   QPalette p = palette();
 
@@ -55,26 +54,10 @@ void SliderLabel::mousePressEvent(QMouseEvent *e)
   if (e->modifiers() & Qt::AltModifier) {
     emit RequestReset();
   } else {
-    dragging_ = true;
     emit LabelPressed();
   }
 }
 
-void SliderLabel::mouseMoveEvent(QMouseEvent *)
-{
-  if (dragging_) {
-    emit LabelMoved();
-  }
-}
-
-void SliderLabel::mouseReleaseEvent(QMouseEvent *)
-{
-  if (dragging_) {
-    emit LabelReleased();
-    dragging_ = false;
-  }
-}
-
 void SliderLabel::focusInEvent(QFocusEvent *event)
 {
   QWidget::focusInEvent(event);
diff --git a/app/widget/slider/sliderlabel.h b/app/widget/slider/sliderlabel.h
index 6ac8f9e5a..68d0666e3 100644
--- a/app/widget/slider/sliderlabel.h
+++ b/app/widget/slider/sliderlabel.h
@@ -33,34 +33,18 @@ class SliderLabel : public QLabel
 public:
   SliderLabel(QWidget* parent);
 
-  void CancelDrag()
-  {
-    dragging_ = false;
-  }
-
 protected:
   virtual void mousePressEvent(QMouseEvent *ev) override;
 
-  virtual void mouseMoveEvent(QMouseEvent *ev) override;
-
-  virtual void mouseReleaseEvent(QMouseEvent *ev) override;
-
   virtual void focusInEvent(QFocusEvent *event) override;
 
 signals:
   void LabelPressed();
 
-  void LabelMoved();
-
-  void LabelReleased();
-
   void focused();
 
   void RequestReset();
 
-private:
-  bool dragging_;
-
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/slider/sliderladder.cpp b/app/widget/slider/sliderladder.cpp
index bbfd50575..2c8e6128e 100644
--- a/app/widget/slider/sliderladder.cpp
+++ b/app/widget/slider/sliderladder.cpp
@@ -131,6 +131,10 @@ void SliderLadder::TimerUpdate()
   QCursor::setPos(drag_start_);
 #endif
 
+  if (!x_mvmt && !y_mvmt) {
+    return;
+  }
+
   int y_threshold = fontMetrics().height() / 2;
 
   if (qAbs(y_mvmt) > qAbs(x_mvmt)

From 0280ade20d9ebb55b84944e5bcd5eb91d202d7a0 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 19 Jun 2020 02:23:06 +1000
Subject: [PATCH 020/138] project: improved main window layout loading

There were a lot of issues that arose from trying to make GUI changes
from another thread (even though we ran those functions in the right
thread). Now we store layout information until the end of the load and
make the changes then. This works much better from both a business logic
and user experience perspective.

Also prevents multiple sequences from taking focus during load and
starting a render job.
---
 app/core.cpp                                  | 69 ++++++-------
 app/project/item/sequence/sequence.cpp        |  2 +-
 app/project/project.cpp                       | 12 ++-
 app/project/project.h                         |  3 +-
 app/task/project/load/load.cpp                |  5 +-
 app/task/project/load/load.h                  | 10 +-
 app/window/mainwindow/CMakeLists.txt          |  2 +
 app/window/mainwindow/mainwindow.cpp          | 92 ++++--------------
 app/window/mainwindow/mainwindow.h            |  9 +-
 .../mainwindow/mainwindowlayoutinfo.cpp       | 96 +++++++++++++++++++
 app/window/mainwindow/mainwindowlayoutinfo.h  | 52 ++++++++++
 11 files changed, 231 insertions(+), 121 deletions(-)
 create mode 100644 app/window/mainwindow/mainwindowlayoutinfo.cpp
 create mode 100644 app/window/mainwindow/mainwindowlayoutinfo.h

diff --git a/app/core.cpp b/app/core.cpp
index d737a0563..55f0b2c49 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -151,6 +151,30 @@ int Core::execute(QCoreApplication* a)
   return exit_code;
 }
 
+void Core::DeclareTypesForQt()
+{
+  qRegisterMetaType<rational>();
+  qRegisterMetaType<OpenGLTexturePtr>();
+  qRegisterMetaType<OpenGLTextureCache::ReferencePtr>();
+  qRegisterMetaType<NodeValue>();
+  qRegisterMetaType<NodeValueTable>();
+  qRegisterMetaType<NodeValueDatabase>();
+  qRegisterMetaType<FramePtr>();
+  qRegisterMetaType<SampleBufferPtr>();
+  qRegisterMetaType<AudioParams>();
+  qRegisterMetaType<NodeKeyframe::Type>();
+  qRegisterMetaType<Decoder::RetrieveState>();
+  qRegisterMetaType<OLIVE_NAMESPACE::TimeRange>();
+  qRegisterMetaType<Color>();
+  qRegisterMetaType<OLIVE_NAMESPACE::ProjectPtr>();
+  qRegisterMetaType<OLIVE_NAMESPACE::AudioVisualWaveform>();
+  qRegisterMetaType<OLIVE_NAMESPACE::SampleJob>();
+  qRegisterMetaType<OLIVE_NAMESPACE::ShaderJob>();
+  qRegisterMetaType<OLIVE_NAMESPACE::GenerateJob>();
+  qRegisterMetaType<OLIVE_NAMESPACE::VideoParams>();
+  qRegisterMetaType<OLIVE_NAMESPACE::MainWindowLayoutInfo>();
+}
+
 void Core::Start()
 {
   // Reset config (Config sets to default on construction already, but we do it again here as a workaround that fixes
@@ -480,9 +504,11 @@ void Core::AddOpenProject(ProjectPtr p)
 void Core::AddOpenProjectFromTask(Task *task)
 {
   QList<ProjectPtr> projects = static_cast<ProjectLoadTask*>(task)->GetLoadedProjects();
+  QList<MainWindowLayoutInfo> layouts = static_cast<ProjectLoadTask*>(task)->GetLoadedLayouts();
 
-  foreach (ProjectPtr p, projects) {
-    AddOpenProject(p);
+  for (int i=0; i<projects.size(); i++) {
+    AddOpenProject(projects.at(i));
+    main_window_->LoadLayout(layouts.at(i));
   }
 }
 
@@ -629,29 +655,6 @@ void Core::OpenStartupProject()
   }
 }
 
-void Core::DeclareTypesForQt()
-{
-  qRegisterMetaType<rational>();
-  qRegisterMetaType<OpenGLTexturePtr>();
-  qRegisterMetaType<OpenGLTextureCache::ReferencePtr>();
-  qRegisterMetaType<NodeValue>();
-  qRegisterMetaType<NodeValueTable>();
-  qRegisterMetaType<NodeValueDatabase>();
-  qRegisterMetaType<FramePtr>();
-  qRegisterMetaType<SampleBufferPtr>();
-  qRegisterMetaType<AudioParams>();
-  qRegisterMetaType<NodeKeyframe::Type>();
-  qRegisterMetaType<Decoder::RetrieveState>();
-  qRegisterMetaType<OLIVE_NAMESPACE::TimeRange>();
-  qRegisterMetaType<Color>();
-  qRegisterMetaType<OLIVE_NAMESPACE::ProjectPtr>();
-  qRegisterMetaType<OLIVE_NAMESPACE::AudioVisualWaveform>();
-  qRegisterMetaType<OLIVE_NAMESPACE::SampleJob>();
-  qRegisterMetaType<OLIVE_NAMESPACE::ShaderJob>();
-  qRegisterMetaType<OLIVE_NAMESPACE::GenerateJob>();
-  qRegisterMetaType<OLIVE_NAMESPACE::VideoParams>();
-}
-
 void Core::StartGUI(bool full_screen)
 {
   // Set UI style
@@ -1011,21 +1014,11 @@ void Core::OpenProjectInternal(const QString &filename)
 
   ProjectLoadTask* plm = new ProjectLoadTask(filename);
 
-  if (gui_active_) {
+  TaskDialog* task_dialog = new TaskDialog(plm, tr("Load Project"), main_window());
 
-    TaskDialog* task_dialog = new TaskDialog(plm, tr("Load Project"), main_window());
+  connect(task_dialog, &TaskDialog::TaskSucceeded, this, &Core::AddOpenProjectFromTask);
 
-    connect(task_dialog, &TaskDialog::TaskSucceeded, this, &Core::AddOpenProjectFromTask);
-
-    task_dialog->open();
-
-  } else {
-
-    //connect(plm, &ProjectLoadManager::ProjectLoaded, this, &Core::AddOpenProject);
-
-
-
-  }
+  task_dialog->open();
 }
 
 int Core::CountFilesInFileList(const QFileInfoList &filenames)
diff --git a/app/project/item/sequence/sequence.cpp b/app/project/item/sequence/sequence.cpp
index b2c5a0c22..9e89a0aaa 100644
--- a/app/project/item/sequence/sequence.cpp
+++ b/app/project/item/sequence/sequence.cpp
@@ -149,7 +149,7 @@ void Sequence::Save(QXmlStreamWriter *writer) const
 
   writer->writeAttribute(QStringLiteral("name"), name());
 
-  writer->writeAttribute(QStringLiteral("ptr"), QString::number(reinterpret_cast<quintptr>(viewer_output_)));
+  writer->writeAttribute(QStringLiteral("ptr"), QString::number(reinterpret_cast<quintptr>(this)));
 
   writer->writeStartElement(QStringLiteral("video"));
 
diff --git a/app/project/project.cpp b/app/project/project.cpp
index 014489dd6..653202c02 100644
--- a/app/project/project.cpp
+++ b/app/project/project.cpp
@@ -37,7 +37,7 @@ Project::Project() :
   root_.set_project(this);
 }
 
-void Project::Load(QXmlStreamReader *reader, const QAtomicInt* cancelled)
+void Project::Load(QXmlStreamReader *reader, MainWindowLayoutInfo* layout, const QAtomicInt* cancelled)
 {
   XMLNodeData xml_node_data;
 
@@ -62,7 +62,12 @@ void Project::Load(QXmlStreamReader *reader, const QAtomicInt* cancelled)
 
     } else if (reader->name() == QStringLiteral("layout")) {
 
-      Core::instance()->main_window()->LoadLayout(reader, xml_node_data);
+      // Since the main window's functions have to occur in the GUI thread (and we're likely
+      // loading in a secondary thread), we load all necessary data into a separate struct so we
+      // can continue loading and queue it with the main window so it can handle the data
+      // appropriately in its own thread.
+
+      *layout = MainWindowLayoutInfo::fromXml(reader, xml_node_data);
 
     } else {
       reader->skipCurrentElement();
@@ -93,7 +98,8 @@ void Project::Save(QXmlStreamWriter *writer) const
   writer->writeEndElement(); // colormanagement
 
   // Save main window project layout
-  Core::instance()->main_window()->SaveLayout(writer);
+  MainWindowLayoutInfo main_window_info = Core::instance()->main_window()->SaveLayout();
+  main_window_info.toXml(writer);
 
   writer->writeEndElement(); // project
 }
diff --git a/app/project/project.h b/app/project/project.h
index f61fc50da..ff3f8ce35 100644
--- a/app/project/project.h
+++ b/app/project/project.h
@@ -26,6 +26,7 @@
 
 #include "render/colormanager.h"
 #include "project/item/folder/folder.h"
+#include "window/mainwindow/mainwindowlayoutinfo.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -46,7 +47,7 @@ class Project : public QObject
 public:
   Project();
 
-  void Load(QXmlStreamReader* reader, const QAtomicInt* cancelled);
+  void Load(QXmlStreamReader* reader, MainWindowLayoutInfo *layout, const QAtomicInt* cancelled);
 
   void Save(QXmlStreamWriter* writer) const;
 
diff --git a/app/task/project/load/load.cpp b/app/task/project/load/load.cpp
index 932a94c74..27dff9e11 100644
--- a/app/task/project/load/load.cpp
+++ b/app/task/project/load/load.cpp
@@ -51,13 +51,16 @@ bool ProjectLoadTask::Run()
 
             project->set_filename(filename_);
 
-            project->Load(&reader, &IsCancelled());
+            MainWindowLayoutInfo layout;
+
+            project->Load(&reader, &layout, &IsCancelled());
 
             // Ensure project is in main thread
             moveToThread(qApp->thread());
 
             if (!IsCancelled()) {
               projects_.append(project);
+              layout_info_.append(layout);
             }
           } else {
             reader.skipCurrentElement();
diff --git a/app/task/project/load/load.h b/app/task/project/load/load.h
index fa203abfe..398853028 100644
--- a/app/task/project/load/load.h
+++ b/app/task/project/load/load.h
@@ -23,6 +23,7 @@
 
 #include "project/project.h"
 #include "task/task.h"
+#include "window/mainwindow/mainwindowlayoutinfo.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -32,17 +33,24 @@ class ProjectLoadTask : public Task
 public:
   ProjectLoadTask(const QString& filename);
 
-  const QList<ProjectPtr>& GetLoadedProjects()
+  const QList<ProjectPtr>& GetLoadedProjects() const
   {
     return projects_;
   }
 
+  const QList<MainWindowLayoutInfo>& GetLoadedLayouts() const
+  {
+    return layout_info_;
+  }
+
 protected:
   virtual bool Run() override;
 
 private:
   QList<ProjectPtr> projects_;
 
+  QList<MainWindowLayoutInfo> layout_info_;
+
   QString filename_;
 
 };
diff --git a/app/window/mainwindow/CMakeLists.txt b/app/window/mainwindow/CMakeLists.txt
index 151883684..4b70b8f9e 100644
--- a/app/window/mainwindow/CMakeLists.txt
+++ b/app/window/mainwindow/CMakeLists.txt
@@ -22,5 +22,7 @@ set(OLIVE_SOURCES
   window/mainwindow/mainstatusbar.cpp
   window/mainwindow/mainwindow.h
   window/mainwindow/mainwindow.cpp
+  window/mainwindow/mainwindowlayoutinfo.h
+  window/mainwindow/mainwindowlayoutinfo.cpp
   PARENT_SCOPE
 )
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 09286c316..26b765b0d 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -111,43 +111,37 @@ MainWindow::~MainWindow()
 #endif
 }
 
-void MainWindow::LoadLayout(QXmlStreamReader *reader, XMLNodeData &xml_data)
+void MainWindow::LoadLayout(const MainWindowLayoutInfo &info)
 {
-  QMetaObject::invokeMethod(this,
-                            "LoadLayoutInternal",
-                            Qt::BlockingQueuedConnection,
-                            Q_ARG(QXmlStreamReader*, reader),
-                            Q_ARG(XMLNodeData*, &xml_data));
+  foreach (Folder* folder, info.open_folders()) {
+    FolderOpen(folder->project(), folder, true);
+  }
+
+  foreach (Sequence* sequence, info.open_sequences()) {
+    OpenSequence(sequence, false);
+  }
+
+  restoreState(info.state());
 }
 
-void MainWindow::SaveLayout(QXmlStreamWriter *writer) const
+MainWindowLayoutInfo MainWindow::SaveLayout() const
 {
-  writer->writeStartElement(QStringLiteral("layout"));
-
-  writer->writeStartElement(QStringLiteral("folders"));
+  MainWindowLayoutInfo info;
 
   foreach (ProjectPanel* panel, folder_panels_) {
-    writer->writeTextElement(QStringLiteral("folder"),
-                             QString::number(reinterpret_cast<quintptr>(panel->get_root_index().internalPointer())));
+    info.add_folder(static_cast<Folder*>(panel->get_root_index().internalPointer()));
   }
 
-  writer->writeEndElement(); // folders
-
-  writer->writeStartElement(QStringLiteral("timeline"));
-
   foreach (TimelinePanel* panel, timeline_panels_) {
-    writer->writeTextElement(QStringLiteral("sequence"),
-                             QString::number(reinterpret_cast<quintptr>(panel->GetConnectedViewer())));
+    info.add_sequence(static_cast<Sequence*>(panel->GetConnectedViewer()->parent()));
   }
 
-  writer->writeEndElement(); // timeline
+  info.set_state(saveState());
 
-  writer->writeTextElement(QStringLiteral("state"), QString(saveState().toBase64()));
-
-  writer->writeEndElement(); // layout
+  return info;
 }
 
-void MainWindow::OpenSequence(Sequence *sequence)
+void MainWindow::OpenSequence(Sequence *sequence, bool enable_focus)
 {
   // See if this sequence is already open, and switch to it if so
   foreach (TimelinePanel* tl, timeline_panels_) {
@@ -164,11 +158,14 @@ void MainWindow::OpenSequence(Sequence *sequence)
     panel = timeline_panels_.first();
   } else {
     panel = AppendTimelinePanel();
+    enable_focus = false;
   }
 
   panel->ConnectViewerNode(sequence->viewer_output());
 
-  TimelineFocused(sequence->viewer_output());
+  if (enable_focus) {
+    TimelineFocused(sequence->viewer_output());
+  }
 }
 
 void MainWindow::CloseSequence(Sequence *sequence)
@@ -467,53 +464,6 @@ void MainWindow::FloatingPanelCloseRequested()
   panel->deleteLater();
 }
 
-void MainWindow::LoadLayoutInternal(QXmlStreamReader *reader, XMLNodeData *xml_data)
-{
-  while (XMLReadNextStartElement(reader)) {
-    if (reader->name() == QStringLiteral("folders")) {
-
-      while (XMLReadNextStartElement(reader)) {
-        if (reader->name() == QStringLiteral("folder")) {
-          quintptr item_id = reader->readElementText().toULongLong();
-
-          Item* open_item = xml_data->item_ptrs.value(item_id);
-
-          if (open_item) {
-            FolderOpen(open_item->project(), open_item, true);
-          }
-        } else {
-          reader->skipCurrentElement();
-        }
-      }
-
-    } else if (reader->name() == QStringLiteral("timeline")) {
-
-      while (XMLReadNextStartElement(reader)) {
-        if (reader->name() == QStringLiteral("sequence")) {
-          quintptr item_id = reader->readElementText().toULongLong();
-
-          Sequence* open_seq = dynamic_cast<Sequence*>(xml_data->item_ptrs.value(item_id));
-
-          if (open_seq) {
-            OpenSequence(open_seq);
-          }
-        } else {
-          reader->skipCurrentElement();
-        }
-      }
-
-    } else if (reader->name() == QStringLiteral("state")) {
-
-      QByteArray state = QByteArray::fromBase64(reader->readElementText().toLatin1());
-
-      restoreState(state);
-
-    } else {
-      reader->skipCurrentElement();
-    }
-  }
-}
-
 TimelinePanel* MainWindow::AppendTimelinePanel()
 {
   TimelinePanel* panel = AppendPanelInternal<TimelinePanel>(timeline_panels_);
diff --git a/app/window/mainwindow/mainwindow.h b/app/window/mainwindow/mainwindow.h
index c9f349051..f06b8c0fe 100644
--- a/app/window/mainwindow/mainwindow.h
+++ b/app/window/mainwindow/mainwindow.h
@@ -23,6 +23,7 @@
 
 #include <QMainWindow>
 
+#include "mainwindowlayoutinfo.h"
 #include "panel/panelmanager.h"
 #include "panel/audiomonitor/audiomonitor.h"
 #include "panel/curve/curve.h"
@@ -55,11 +56,11 @@ public:
 
   virtual ~MainWindow() override;
 
-  void LoadLayout(QXmlStreamReader* reader, XMLNodeData& xml_data);
+  void LoadLayout(const MainWindowLayoutInfo &info);
 
-  void SaveLayout(QXmlStreamWriter* writer) const;
+  MainWindowLayoutInfo SaveLayout() const;
 
-  void OpenSequence(Sequence* sequence);
+  void OpenSequence(Sequence* sequence, bool enable_focus = true);
 
   void CloseSequence(Sequence* sequence);
 
@@ -167,8 +168,6 @@ private slots:
 
   void FloatingPanelCloseRequested();
 
-  void LoadLayoutInternal(QXmlStreamReader* reader, XMLNodeData *xml_data);
-
   void StatusBarDoubleClicked();
 
 #ifdef Q_OS_LINUX
diff --git a/app/window/mainwindow/mainwindowlayoutinfo.cpp b/app/window/mainwindow/mainwindowlayoutinfo.cpp
new file mode 100644
index 000000000..168978f79
--- /dev/null
+++ b/app/window/mainwindow/mainwindowlayoutinfo.cpp
@@ -0,0 +1,96 @@
+#include "mainwindowlayoutinfo.h"
+
+OLIVE_NAMESPACE_ENTER
+
+void MainWindowLayoutInfo::toXml(QXmlStreamWriter *writer) const
+{
+  writer->writeStartElement(QStringLiteral("layout"));
+
+  writer->writeStartElement(QStringLiteral("folders"));
+
+  foreach (Folder* folder, open_folders_) {
+    writer->writeTextElement(QStringLiteral("folder"),
+                             QString::number(reinterpret_cast<quintptr>(folder)));
+  }
+
+  writer->writeEndElement(); // folders
+
+  writer->writeStartElement(QStringLiteral("timeline"));
+
+  foreach (Sequence* sequence, open_sequences_) {
+    writer->writeTextElement(QStringLiteral("sequence"),
+                             QString::number(reinterpret_cast<quintptr>(sequence)));
+  }
+
+  writer->writeEndElement(); // timeline
+
+  writer->writeTextElement(QStringLiteral("state"), QString(state_.toBase64()));
+
+  writer->writeEndElement(); // layout
+}
+
+MainWindowLayoutInfo MainWindowLayoutInfo::fromXml(QXmlStreamReader *reader, XMLNodeData &xml_data)
+{
+  MainWindowLayoutInfo info;
+
+  while (XMLReadNextStartElement(reader)) {
+    if (reader->name() == QStringLiteral("folders")) {
+
+      while (XMLReadNextStartElement(reader)) {
+        if (reader->name() == QStringLiteral("folder")) {
+          quintptr item_id = reader->readElementText().toULongLong();
+
+          Item* open_item = xml_data.item_ptrs.value(item_id);
+
+          if (open_item) {
+            info.open_folders_.append(static_cast<Folder*>(open_item));
+          }
+        } else {
+          reader->skipCurrentElement();
+        }
+      }
+
+    } else if (reader->name() == QStringLiteral("timeline")) {
+
+      while (XMLReadNextStartElement(reader)) {
+        if (reader->name() == QStringLiteral("sequence")) {
+          quintptr item_id = reader->readElementText().toULongLong();
+
+          Sequence* open_seq = dynamic_cast<Sequence*>(xml_data.item_ptrs.value(item_id));
+
+          if (open_seq) {
+            info.open_sequences_.append(open_seq);
+          }
+        } else {
+          reader->skipCurrentElement();
+        }
+      }
+
+    } else if (reader->name() == QStringLiteral("state")) {
+
+      info.state_ = QByteArray::fromBase64(reader->readElementText().toLatin1());
+
+    } else {
+      reader->skipCurrentElement();
+    }
+  }
+
+  return info;
+}
+
+void MainWindowLayoutInfo::add_folder(olive::Folder *f)
+{
+  open_folders_.append(f);
+}
+
+void MainWindowLayoutInfo::add_sequence(Sequence *s)
+{
+  open_sequences_.append(s);
+}
+
+void MainWindowLayoutInfo::set_state(const QByteArray &layout)
+{
+  state_ = layout;
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/window/mainwindow/mainwindowlayoutinfo.h b/app/window/mainwindow/mainwindowlayoutinfo.h
new file mode 100644
index 000000000..5f76cbc2b
--- /dev/null
+++ b/app/window/mainwindow/mainwindowlayoutinfo.h
@@ -0,0 +1,52 @@
+#ifndef MAINWINDOWLAYOUTINFO_H
+#define MAINWINDOWLAYOUTINFO_H
+
+#include "project/item/folder/folder.h"
+#include "project/item/sequence/sequence.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class MainWindowLayoutInfo
+{
+public:
+  MainWindowLayoutInfo() = default;
+
+  void toXml(QXmlStreamWriter* writer) const;
+
+  static MainWindowLayoutInfo fromXml(QXmlStreamReader* reader, XMLNodeData &xml_data);
+
+  void add_folder(Folder* f);
+
+  void add_sequence(Sequence* s);
+
+  void set_state(const QByteArray& layout);
+
+  const QList<Folder*>& open_folders() const
+  {
+    return open_folders_;
+  }
+
+  const QList<Sequence*>& open_sequences() const
+  {
+    return open_sequences_;
+  }
+
+  const QByteArray& state() const
+  {
+    return state_;
+  }
+
+private:
+  QByteArray state_;
+
+  QList<Folder*> open_folders_;
+
+  QList<Sequence*> open_sequences_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+Q_DECLARE_METATYPE(OLIVE_NAMESPACE::MainWindowLayoutInfo)
+
+#endif // MAINWINDOWLAYOUTINFO_H

From f8a8af9ec3426521a72265d803d40f8260a9614f Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 19 Jun 2020 02:26:55 +1000
Subject: [PATCH 021/138] project: focus sequence if there is only one

---
 app/window/mainwindow/mainwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 26b765b0d..98538cc77 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -118,7 +118,7 @@ void MainWindow::LoadLayout(const MainWindowLayoutInfo &info)
   }
 
   foreach (Sequence* sequence, info.open_sequences()) {
-    OpenSequence(sequence, false);
+    OpenSequence(sequence, info.open_sequences().size() == 1);
   }
 
   restoreState(info.state());

From fd8116a9de638c6fd6a4f3d263dca2997e03f018 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 19 Jun 2020 02:36:09 +1000
Subject: [PATCH 022/138] slider: use ctrl to switch axes

---
 app/widget/slider/sliderladder.cpp | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/app/widget/slider/sliderladder.cpp b/app/widget/slider/sliderladder.cpp
index 2c8e6128e..5a9c4d235 100644
--- a/app/widget/slider/sliderladder.cpp
+++ b/app/widget/slider/sliderladder.cpp
@@ -135,14 +135,11 @@ void SliderLadder::TimerUpdate()
     return;
   }
 
-  int y_threshold = fontMetrics().height() / 2;
-
-  if (qAbs(y_mvmt) > qAbs(x_mvmt)
-      || qApp->keyboardModifiers() & Qt::ControlModifier) {
+  if (qApp->keyboardModifiers() & Qt::ControlModifier) {
     // Movement is vertical
     y_mobility_ += y_mvmt;
 
-    if (qAbs(y_mobility_) > y_threshold) {
+    if (qAbs(y_mobility_) > fontMetrics().height()) {
       int new_active_element;
 
       if (y_mvmt < 0) {
@@ -165,15 +162,9 @@ void SliderLadder::TimerUpdate()
       y_mobility_ = 0;
     }
   } else {
-    // Movement is horizontal
-    emit DraggedByValue(x_mvmt , elements_.at(active_element_)->GetMultiplier());
+    y_mobility_ = 0;
 
-    // Reduce Y mobility
-    if (y_mobility_ > 0) {
-      y_mobility_--;
-    } else if (y_mobility_ < 0) {
-      y_mobility_++;
-    }
+    emit DraggedByValue(x_mvmt + y_mvmt, elements_.at(active_element_)->GetMultiplier());
   }
 }
 

From ab74c1579ef70dd3d1ec054f2b2397fe30d2c10f Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 19 Jun 2020 02:44:26 +1000
Subject: [PATCH 023/138] mathnode: temporarily disable identity matrix
 detection

This code was faulty and needs extra functionality elsewhere to
actually work correctly.
---
 app/node/math/math/mathbase.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/node/math/math/mathbase.cpp b/app/node/math/math/mathbase.cpp
index 50ae6c2d8..b5ee9d76d 100644
--- a/app/node/math/math/mathbase.cpp
+++ b/app/node/math/math/mathbase.cpp
@@ -285,8 +285,13 @@ NodeValueTable MathNodeBase::ValueInternal(NodeValueDatabase &value, Operation o
       }
     } else if (pairing == kPairTextureMatrix) {
       // Only allow matrix multiplication
-      if (operation != kOpMultiply
-          || number_val.data().value<QMatrix4x4>().isIdentity()) {
+      bool matrix_is_identity = false;
+
+      // FIXME: The matrix in the shader is transformed around footage+sequence resolution so we
+      //        need to do that here to determine if the matrix is truly identity. But to do that,
+      //        we need access to the texture parameters which is currently not possible.
+
+      if (operation != kOpMultiply || matrix_is_identity) {
         operation_is_noop = true;
       } else {
         // It's likely an alpha channel will result from this operation

From b2a3cede2cdc8aa2fe973cd31471d2aab8904a59 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 19 Jun 2020 17:06:14 +1000
Subject: [PATCH 024/138] renderer: re-use the same opengl instance for all
 background rendering

Previously the OpenGL instance was tied to each render/cache task,
creating and destroying it each time one started and stopped. This was
completely unnecessary since the instance holds no state and can be
shared by all of the render tasks without having to expensively start
a new one.
---
 app/core.cpp                                | 10 +++++---
 app/render/backend/opengl/openglbackend.cpp | 23 +-----------------
 app/render/backend/opengl/openglbackend.h   |  5 ----
 app/render/backend/opengl/openglproxy.cpp   | 26 +++++++++++++++++++++
 app/render/backend/opengl/openglproxy.h     | 11 +++++++++
 app/render/backend/opengl/openglworker.cpp  | 13 +++++------
 app/render/backend/opengl/openglworker.h    |  5 +---
 7 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/app/core.cpp b/app/core.cpp
index 55f0b2c49..e8f34fcf4 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -181,6 +181,9 @@ void Core::Start()
   //               the fact that some of the config paths set by default rely on the app name having been set (in main())
   Config::Current().SetDefaults();
 
+  // Load application config
+  Config::Load();
+
   // Declare custom types for Qt signal/slot system
   DeclareTypesForQt();
 
@@ -193,9 +196,8 @@ void Core::Start()
   // Initialize task manager
   TaskManager::CreateInstance();
 
-  // Load application config
-  Config::Load();
-
+  // Initialize OpenGL service
+  OpenGLProxy::CreateInstance();
 
   //
   // Start application
@@ -223,6 +225,8 @@ void Core::Stop()
     }
   }
 
+  OpenGLProxy::DestroyInstance();
+
   MenuShared::DestroyInstance();
 
   TaskManager::DestroyInstance();
diff --git a/app/render/backend/opengl/openglbackend.cpp b/app/render/backend/opengl/openglbackend.cpp
index a66fa8928..60e81f914 100644
--- a/app/render/backend/opengl/openglbackend.cpp
+++ b/app/render/backend/opengl/openglbackend.cpp
@@ -27,38 +27,17 @@ OLIVE_NAMESPACE_ENTER
 OpenGLBackend::OpenGLBackend(QObject* parent) :
   RenderBackend(parent)
 {
-  proxy_ = new OpenGLProxy();
 
-  QThread* proxy_thread = new QThread();
-  proxy_thread->start(QThread::IdlePriority);
-  proxy_->moveToThread(proxy_thread);
-
-  if (!proxy_->Init()) {
-    ClearProxy();
-  }
 }
 
 OpenGLBackend::~OpenGLBackend()
 {
   Close();
-
-  ClearProxy();
 }
 
 RenderWorker *OpenGLBackend::CreateNewWorker()
 {
-  return new OpenGLWorker(this, proxy_);
-}
-
-void OpenGLBackend::ClearProxy()
-{
-  if (proxy_) {
-    proxy_->thread()->quit();
-    proxy_->thread()->wait();
-    proxy_->thread()->deleteLater();
-    proxy_->deleteLater();
-    proxy_ = nullptr;
-  }
+  return new OpenGLWorker(this);
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/backend/opengl/openglbackend.h b/app/render/backend/opengl/openglbackend.h
index a1df6dcab..7d88611f3 100644
--- a/app/render/backend/opengl/openglbackend.h
+++ b/app/render/backend/opengl/openglbackend.h
@@ -36,11 +36,6 @@ public:
 protected:
   virtual RenderWorker* CreateNewWorker() override;
 
-private:
-  void ClearProxy();
-
-  OpenGLProxy* proxy_;
-
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/backend/opengl/openglproxy.cpp b/app/render/backend/opengl/openglproxy.cpp
index aff4dac42..c96e52d7a 100644
--- a/app/render/backend/opengl/openglproxy.cpp
+++ b/app/render/backend/opengl/openglproxy.cpp
@@ -33,6 +33,8 @@
 
 OLIVE_NAMESPACE_ENTER
 
+OpenGLProxy* OpenGLProxy::instance_ = nullptr;
+
 OpenGLProxy::OpenGLProxy(QObject *parent) :
   QObject(parent),
   ctx_(nullptr),
@@ -48,6 +50,30 @@ OpenGLProxy::~OpenGLProxy()
   surface_.destroy();
 }
 
+void OpenGLProxy::CreateInstance()
+{
+  instance_ = new OpenGLProxy();
+
+  QThread* proxy_thread = new QThread();
+  proxy_thread->start(QThread::IdlePriority);
+  instance_->moveToThread(proxy_thread);
+
+  if (!instance_->Init()) {
+    DestroyInstance();
+  }
+}
+
+void OpenGLProxy::DestroyInstance()
+{
+  if (instance_) {
+    instance_->thread()->quit();
+    instance_->thread()->wait();
+    instance_->thread()->deleteLater();
+    instance_->deleteLater();
+    instance_ = nullptr;
+  }
+}
+
 bool OpenGLProxy::Init()
 {
   // Create context object
diff --git a/app/render/backend/opengl/openglproxy.h b/app/render/backend/opengl/openglproxy.h
index 7c6878626..ff59f76b9 100644
--- a/app/render/backend/opengl/openglproxy.h
+++ b/app/render/backend/opengl/openglproxy.h
@@ -41,6 +41,15 @@ public:
 
   virtual ~OpenGLProxy() override;
 
+  static void CreateInstance();
+
+  static void DestroyInstance();
+
+  static OpenGLProxy* instance()
+  {
+    return instance_;
+  }
+
   /**
    * @brief Initialize OpenGL instance in whatever thread this object is a part of
    *
@@ -101,6 +110,8 @@ private:
 
   OpenGLTextureCache texture_cache_;
 
+  static OpenGLProxy* instance_;
+
 private slots:
   void FinishInit();
 
diff --git a/app/render/backend/opengl/openglworker.cpp b/app/render/backend/opengl/openglworker.cpp
index b3e10b71c..ec518ffc7 100644
--- a/app/render/backend/opengl/openglworker.cpp
+++ b/app/render/backend/opengl/openglworker.cpp
@@ -22,15 +22,14 @@
 
 OLIVE_NAMESPACE_ENTER
 
-OpenGLWorker::OpenGLWorker(RenderBackend *parent, OpenGLProxy* proxy) :
-  RenderWorker(parent),
-  proxy_(proxy)
+OpenGLWorker::OpenGLWorker(RenderBackend *parent) :
+  RenderWorker(parent)
 {
 }
 
 void OpenGLWorker::TextureToFrame(const QVariant &texture, FramePtr frame, const QMatrix4x4& mat) const
 {
-  QMetaObject::invokeMethod(proxy_,
+  QMetaObject::invokeMethod(OpenGLProxy::instance(),
                             "TextureToBuffer",
                             Qt::BlockingQueuedConnection,
                             Q_ARG(const QVariant&, texture),
@@ -42,7 +41,7 @@ QVariant OpenGLWorker::FootageFrameToTexture(StreamPtr stream, FramePtr frame) c
 {
   QVariant value;
 
-  QMetaObject::invokeMethod(proxy_,
+  QMetaObject::invokeMethod(OpenGLProxy::instance(),
                             "FrameToValue",
                             Qt::BlockingQueuedConnection,
                             Q_RETURN_ARG(QVariant, value),
@@ -58,7 +57,7 @@ QVariant OpenGLWorker::CachedFrameToTexture(FramePtr frame) const
 {
   QVariant value;
 
-  QMetaObject::invokeMethod(proxy_,
+  QMetaObject::invokeMethod(OpenGLProxy::instance(),
                             "PreCachedFrameToValue",
                             Qt::BlockingQueuedConnection,
                             Q_RETURN_ARG(QVariant, value),
@@ -71,7 +70,7 @@ QVariant OpenGLWorker::ProcessShader(const Node *node, const TimeRange &range, c
 {
   QVariant value;
 
-  QMetaObject::invokeMethod(proxy_,
+  QMetaObject::invokeMethod(OpenGLProxy::instance(),
                             "RunNodeAccelerated",
                             Qt::BlockingQueuedConnection,
                             Q_RETURN_ARG(QVariant, value),
diff --git a/app/render/backend/opengl/openglworker.h b/app/render/backend/opengl/openglworker.h
index 23b5e787f..75eed65f8 100644
--- a/app/render/backend/opengl/openglworker.h
+++ b/app/render/backend/opengl/openglworker.h
@@ -29,7 +29,7 @@ OLIVE_NAMESPACE_ENTER
 class OpenGLWorker : public RenderWorker
 {
 public:
-  OpenGLWorker(RenderBackend* parent, OpenGLProxy* proxy);
+  OpenGLWorker(RenderBackend* parent);
 
 protected:
   virtual void TextureToFrame(const QVariant& texture, FramePtr frame, const QMatrix4x4 &mat) const override;
@@ -42,9 +42,6 @@ protected:
 
   virtual bool TextureHasAlpha(const QVariant& v) const override;
 
-private:
-  OpenGLProxy* proxy_;
-
 };
 
 OLIVE_NAMESPACE_EXIT

From 65ccac1dfede05d784f016dc6b340749dc4d9b74 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 19 Jun 2020 20:25:05 +1000
Subject: [PATCH 025/138] renderer: fixed bug that would render frames even
 after hash matching

Also enables the -Wshadow GCC warning to warn against the code bug that
caused this issue (and has caused other issues like it in the past).
---
 app/CMakeLists.txt                           |  1 +
 app/node/input.cpp                           | 14 +++++++-----
 app/node/output/track/tracklist.cpp          |  6 ++---
 app/render/backend/opengl/openglproxy.cpp    | 24 ++++++++++----------
 app/render/backend/renderbackend.cpp         |  6 ++---
 app/task/render/render.cpp                   | 21 +++++++++--------
 app/widget/audiomonitor/audiomonitor.cpp     |  4 ++--
 app/widget/audiomonitor/audiomonitor.h       |  2 +-
 app/widget/menu/menu.cpp                     |  6 ++---
 app/widget/menu/menu.h                       |  2 +-
 app/widget/timelinewidget/timelinewidget.cpp |  6 ++---
 11 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 6050fabfe..6f0395705 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -107,6 +107,7 @@ else()
     -Wall
     -Wextra
     -Wno-unused-parameter
+    -Wshadow
   )
 endif()
 
diff --git a/app/node/input.cpp b/app/node/input.cpp
index 3ec99b36f..d17656194 100644
--- a/app/node/input.cpp
+++ b/app/node/input.cpp
@@ -81,13 +81,15 @@ QString NodeInput::name()
 
 void NodeInput::Load(QXmlStreamReader *reader, XMLNodeData &xml_node_data, const QAtomicInt *cancelled)
 {
-  XMLAttributeLoop(reader, attr) {
-    if (cancelled && *cancelled) {
-      return;
-    }
+  {
+    XMLAttributeLoop(reader, attr) {
+      if (cancelled && *cancelled) {
+        return;
+      }
 
-    if (attr.name() == QStringLiteral("keyframing")) {
-      set_is_keyframing(attr.value() == QStringLiteral("1"));
+      if (attr.name() == QStringLiteral("keyframing")) {
+        set_is_keyframing(attr.value() == QStringLiteral("1"));
+      }
     }
   }
 
diff --git a/app/node/output/track/tracklist.cpp b/app/node/output/track/tracklist.cpp
index 67a19c91b..abe36e1e7 100644
--- a/app/node/output/track/tracklist.cpp
+++ b/app/node/output/track/tracklist.cpp
@@ -151,9 +151,9 @@ void TrackList::RemoveTrack()
 
 void TrackList::TrackConnected(NodeEdgePtr edge)
 {
-  int track_index = track_input_->IndexOfSubParameter(edge->input());
+  int input_index = track_input_->IndexOfSubParameter(edge->input());
 
-  Q_ASSERT(track_index >= 0);
+  Q_ASSERT(input_index >= 0);
 
   Node* connected_node = edge->output()->parentNode();
 
@@ -163,7 +163,7 @@ void TrackList::TrackConnected(NodeEdgePtr edge)
     {
       // Find "real" index
       TrackOutput* next = nullptr;
-      for (int i=track_index+1; i<track_input_->GetSize(); i++) {
+      for (int i=input_index+1; i<track_input_->GetSize(); i++) {
         Node* that_track = track_input_->At(i)->get_connected_node();
 
         if (that_track && that_track->IsTrack()) {
diff --git a/app/render/backend/opengl/openglproxy.cpp b/app/render/backend/opengl/openglproxy.cpp
index c96e52d7a..08aa8864c 100644
--- a/app/render/backend/opengl/openglproxy.cpp
+++ b/app/render/backend/opengl/openglproxy.cpp
@@ -276,21 +276,21 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
 
   shader->bind();
 
-  NodeValueMap::const_iterator i;
-  for (i=job.GetValues().constBegin(); i!=job.GetValues().constEnd(); i++) {
+  NodeValueMap::const_iterator it;
+  for (it=job.GetValues().constBegin(); it!=job.GetValues().constEnd(); it++) {
     // See if the shader has takes this parameter as an input
-    int variable_location = shader->uniformLocation(i.key()->id());
+    int variable_location = shader->uniformLocation(it.key()->id());
 
     if (variable_location == -1) {
       continue;
     }
 
     // This variable is used in the shader, let's set it
-    const QVariant& value = i.value().data();
+    const QVariant& value = it.value().data();
 
-    const NodeParam::DataType& data_type = (i.value().type() != NodeParam::kNone)
-        ? i.value().type()
-        : i.key()->data_type();
+    const NodeParam::DataType& data_type = (it.value().type() != NodeParam::kNone)
+        ? it.value().type()
+        : it.key()->data_type();
 
     switch (data_type) {
     case NodeInput::kInt:
@@ -300,7 +300,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
       shader->setUniformValue(variable_location, value.toFloat());
       break;
     case NodeInput::kVec2:
-      if (i.key()->IsArray()) {
+      if (it.key()->IsArray()) {
         QVector<NodeValue> nv = value.value< QVector<NodeValue> >();
         QVector<QVector2D> a(nv.size());
 
@@ -310,7 +310,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
 
         shader->setUniformValueArray(variable_location, a.constData(), a.size());
 
-        int count_location = shader->uniformLocation(QStringLiteral("%1_count").arg(i.key()->id()));
+        int count_location = shader->uniformLocation(QStringLiteral("%1_count").arg(it.key()->id()));
         if (count_location > -1) {
           shader->setUniformValue(count_location, a.size());
         }
@@ -354,7 +354,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
       shader->setUniformValue(variable_location, textures_to_bind.size());
 
       // If this texture binding is the iterative input, set it here
-      if (i.key() == job.GetIterativeInput()) {
+      if (it.key() == job.GetIterativeInput()) {
         iterative_input = textures_to_bind.size();
       }
 
@@ -362,7 +362,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
       textures_to_bind.append(tex_id);
 
       // Set enable flag if shader wants it
-      int enable_param_location = shader->uniformLocation(QStringLiteral("%1_enabled").arg(i.key()->id()));
+      int enable_param_location = shader->uniformLocation(QStringLiteral("%1_enabled").arg(it.key()->id()));
       if (enable_param_location > -1) {
         shader->setUniformValue(enable_param_location,
                                 tex_id > 0);
@@ -370,7 +370,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
 
       if (tex_id > 0) {
         // Set texture resolution if shader wants it
-        int res_param_location = shader->uniformLocation(QStringLiteral("%1_resolution").arg(i.key()->id()));
+        int res_param_location = shader->uniformLocation(QStringLiteral("%1_resolution").arg(it.key()->id()));
         if (res_param_location > -1) {
           shader->setUniformValue(res_param_location,
                                   static_cast<GLfloat>(texture->texture()->width() * texture->texture()->divider()),
diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index df96c9efc..b9f90e5e4 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -115,13 +115,13 @@ void RenderBackend::ClearVideoQueue()
 
 QFuture<QVector<QByteArray> > RenderBackend::Hash(const QVector<rational> &times)
 {
-  return QtConcurrent::run(&pool_, [this](const QVector<rational> &times){
-    QVector<QByteArray> hashes(times.size());
+  return QtConcurrent::run(&pool_, [this](const QVector<rational> &t){
+    QVector<QByteArray> hashes(t.size());
 
     for (int i=0;i<hashes.size();i++) {
       hashes[i] = HashNode(copied_viewer_node_->texture_input()->get_connected_node(),
                            video_params_,
-                           times.at(i));
+                           t.at(i));
     }
 
     return hashes;
diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp
index 133a6bf1d..f0da1ff54 100644
--- a/app/task/render/render.cpp
+++ b/app/task/render/render.cpp
@@ -93,12 +93,10 @@ void RenderTask::Render(const TimeRangeList& video_range,
   if (!video_range.isEmpty()) {
     QList<QByteArray> existing_hashes;
 
-    foreach (const TimeRange& r, video_range) {
-      total_length += r.length().toDouble();
-    }
-
     times = viewer_->video_frame_cache()->GetFrameListFromTimeRange(video_range);
 
+    total_length += video_frame_sz * times.size();
+
     QFuture<QVector<QByteArray> > hash_future = backend_.Hash(times);
     hashes = hash_future.result();
 
@@ -125,7 +123,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
              || !download_futures.empty()
              || !audio_lookup_table.empty())) {
 
-    if (!frame_queue.empty()) {
+    if (!IsCancelled() && !frame_queue.empty()) {
       // Pop another frame off the frame queue
       const HashTimePair& p = frame_queue.front();
 
@@ -138,11 +136,14 @@ void RenderTask::Render(const TimeRangeList& video_range,
         bool hash_exists = false;
 
         if (use_disk_cache) {
-          bool hash_exists = (std::find(existing_hashes.begin(), existing_hashes.end(), p.hash) != existing_hashes.end());
+          // Check if this hash is in our "existing hashes" list
+          hash_exists = (std::find(existing_hashes.begin(), existing_hashes.end(), p.hash) != existing_hashes.end());
 
+          // If not, check if it's in the filesystem
           if (!hash_exists) {
             hash_exists = QFileInfo::exists(viewer_->video_frame_cache()->CachePathName(p.hash));
 
+            // If so, add it to the list so we don't have to check the filesystem again later
             if (hash_exists) {
               existing_hashes.push_back(p.hash);
             }
@@ -167,7 +168,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
       frame_queue.pop_front();
     }
 
-    if (!audio_queue.empty()) {
+    if (!IsCancelled() && !audio_queue.empty()) {
       audio_lookup_table.push_back({audio_queue.front(), backend_.RenderAudio(audio_queue.front())});
       audio_queue.pop_front();
     }
@@ -194,9 +195,9 @@ void RenderTask::Render(const TimeRangeList& video_range,
         // Place it in the cache
         std::list<rational> times_with_hash;
 
-        for (int k=0;k<hashes.size();k++) {
-          if (hashes.at(k) == j->hash) {
-            times_with_hash.push_back(times.at(k));
+        for (int hash_index=0;hash_index<hashes.size();hash_index++) {
+          if (hashes.at(hash_index) == j->hash) {
+            times_with_hash.push_back(times.at(hash_index));
           }
         }
 
diff --git a/app/widget/audiomonitor/audiomonitor.cpp b/app/widget/audiomonitor/audiomonitor.cpp
index 46a05a26e..86b53a8df 100644
--- a/app/widget/audiomonitor/audiomonitor.cpp
+++ b/app/widget/audiomonitor/audiomonitor.cpp
@@ -90,11 +90,11 @@ void AudioMonitor::Stop()
   }
 }
 
-void AudioMonitor::OutputPushed(const QByteArray &data)
+void AudioMonitor::OutputPushed(const QByteArray &d)
 {
   QVector<double> v(params_.channel_count(), 0);
 
-  BytesToSampleSummary(data, v);
+  BytesToSampleSummary(d, v);
 
   PushValue(v);
 
diff --git a/app/widget/audiomonitor/audiomonitor.h b/app/widget/audiomonitor/audiomonitor.h
index d2f55f287..2b290ff14 100644
--- a/app/widget/audiomonitor/audiomonitor.h
+++ b/app/widget/audiomonitor/audiomonitor.h
@@ -45,7 +45,7 @@ public slots:
 
   void Stop();
 
-  void OutputPushed(const QByteArray& data);
+  void OutputPushed(const QByteArray& d);
 
 protected:
   //virtual void paintEvent(QPaintEvent* event) override;
diff --git a/app/widget/menu/menu.cpp b/app/widget/menu/menu.cpp
index b744c3d32..5d1f7321c 100644
--- a/app/widget/menu/menu.cpp
+++ b/app/widget/menu/menu.cpp
@@ -50,13 +50,13 @@ Menu::Menu(const QString &s, QWidget *parent) :
   Init();
 }
 
-QAction *Menu::AddActionWithData(const QString &text, const QVariant &data, const QVariant &compare)
+QAction *Menu::AddActionWithData(const QString &text, const QVariant &d, const QVariant &compare)
 {
   QAction* a = addAction(text);
 
-  a->setData(data);
+  a->setData(d);
   a->setCheckable(true);
-  a->setChecked(data == compare);
+  a->setChecked(d == compare);
 
   return a;
 }
diff --git a/app/widget/menu/menu.h b/app/widget/menu/menu.h
index edafaf85d..777143efc 100644
--- a/app/widget/menu/menu.h
+++ b/app/widget/menu/menu.h
@@ -132,7 +132,7 @@ public:
   }
 
   QAction* AddActionWithData(const QString& text,
-                             const QVariant& data,
+                             const QVariant& d,
                              const QVariant& compare);
 
   QAction *InsertAlphabetically(const QString& s);
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index 908d7e3a2..b89ffe00d 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -1584,9 +1584,9 @@ bool TimelineWidget::SnapPoint(QList<rational> start_times, rational* movement,
 
   // Find all points at this movement
   QList<rational> snap_times;
-  foreach (const SnapData& data, potential_snaps) {
-    if (data.movement == *movement) {
-      snap_times.append(data.time);
+  foreach (const SnapData& d, potential_snaps) {
+    if (d.movement == *movement) {
+      snap_times.append(d.time);
     }
   }
 

From a94caa57378f8209e4b25225490231a79df6e1bc Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 19 Jun 2020 20:25:49 +1000
Subject: [PATCH 026/138] export: fixed bug that broke audio on export

---
 app/render/playbackcache.cpp |  1 +
 app/task/export/export.cpp   | 14 +++-----------
 app/task/export/export.h     |  2 --
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/app/render/playbackcache.cpp b/app/render/playbackcache.cpp
index b94ed08e0..9bce6a504 100644
--- a/app/render/playbackcache.cpp
+++ b/app/render/playbackcache.cpp
@@ -71,6 +71,7 @@ void PlaybackCache::SetLength(const rational &r)
   } else if (r > length_) {
     // If new length is greater, simply extend the invalidated range for now
     invalidated_.InsertTimeRange(range_diff);
+    jobs_.append({range_diff, QDateTime::currentMSecsSinceEpoch()});
   } else {
     // If new length is smaller, removed hashes
     invalidated_.RemoveTimeRange(range_diff);
diff --git a/app/task/export/export.cpp b/app/task/export/export.cpp
index 25b65aa27..5cc667a9e 100644
--- a/app/task/export/export.cpp
+++ b/app/task/export/export.cpp
@@ -96,21 +96,13 @@ bool ExportTask::Run()
 
   if (params_.audio_enabled()) {
     audio_range.append(range);
+    audio_data_.SetLength(range.length());
   }
 
   Render(video_range, audio_range, mat, false);
 
   bool success = true;
 
-  foreach (QFuture<bool> f, write_frame_futures_) {
-    f.waitForFinished();
-
-    if (!f.result()) {
-      SetError(tr("Failed to write AVFrame"));
-      success = false;
-    }
-  }
-
   if (params_.audio_enabled()) {
     // Write audio data now
     encoder_->WriteAudio(audio_params(), audio_data_.GetCacheFilename());
@@ -165,7 +157,7 @@ void ExportTask::FrameDownloaded(const QByteArray &hash, const std::list<rationa
 
     // Unfortunately this can't be done in another thread since the frames need to be sent
     // one after the other chronologically.
-    encoder_->WriteFrame(time_map_.value(real_time), real_time);
+    encoder_->WriteFrame(time_map_.take(real_time), real_time);
 
     frame_time_++;
 
@@ -180,7 +172,7 @@ void ExportTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples
     adjusted_range -= params_.custom_range().in();
   }
 
-  audio_data_.WritePCM(adjusted_range, samples, job_time());
+  audio_data_.WritePCM(adjusted_range, samples, QDateTime::currentMSecsSinceEpoch());
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/task/export/export.h b/app/task/export/export.h
index dcbae30f0..5c92adea3 100644
--- a/app/task/export/export.h
+++ b/app/task/export/export.h
@@ -49,8 +49,6 @@ private:
 
   QHash<rational, FramePtr> time_map_;
 
-  QList< QFuture<bool> > write_frame_futures_;
-
   ColorManager* color_manager_;
 
   ExportParams params_;

From 5f6e5916bcda5ecab29c40297ae8fc3250472799 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 20 Jun 2020 01:56:41 +1000
Subject: [PATCH 027/138] curvewidget: allow zooming only one axis and allow
 hiding keyframe tracks

---
 app/widget/curvewidget/curveview.cpp         | 43 ++++++++++++++++++--
 app/widget/curvewidget/curveview.h           |  4 ++
 app/widget/curvewidget/curvewidget.cpp       | 19 +++++++--
 app/widget/curvewidget/curvewidget.h         |  3 ++
 app/widget/keyframeview/keyframeviewbase.cpp | 26 ++++++++++++
 app/widget/keyframeview/keyframeviewbase.h   |  4 ++
 6 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/app/widget/curvewidget/curveview.cpp b/app/widget/curvewidget/curveview.cpp
index a78f97e13..52a7e8eab 100644
--- a/app/widget/curvewidget/curveview.cpp
+++ b/app/widget/curvewidget/curveview.cpp
@@ -61,6 +61,16 @@ void CurveView::Clear()
 void CurveView::SetTrackCount(int count)
 {
   track_count_ = count;
+
+  track_visible_.resize(track_count_);
+  track_visible_.fill(true);
+}
+
+void CurveView::SetTrackVisible(int track, bool visible)
+{
+  track_visible_[track] = visible;
+
+  SetKeyframeTrackVisible(track, visible);
 }
 
 void CurveView::drawBackground(QPainter *painter, const QRectF &rect)
@@ -116,6 +126,10 @@ void CurveView::drawBackground(QPainter *painter, const QRectF &rect)
   // Draw keyframe lines
 
   for (int j=0;j<track_count_;j++) {
+    if (!track_visible_.at(j)) {
+      continue;
+    }
+
     painter->setPen(QPen(GetKeyframeColor(j), qMax(1, fontMetrics().height() / 4)));
     QList<NodeKeyframe*> keys = GetKeyframesSortedByTime(j);
 
@@ -239,12 +253,33 @@ void CurveView::wheelEvent(QWheelEvent *event)
 {
   if (WheelEventIsAZoomEvent(event)) {
     if (!event->angleDelta().isNull()) {
+      bool only_vertical = false;
+      bool only_horizontal = false;
+
+      if (event->modifiers() & Qt::ShiftModifier) {
+        if (event->modifiers() & Qt::AltModifier) {
+          only_horizontal = true;
+        } else {
+          only_vertical = true;
+        }
+      }
+
       if (event->angleDelta().x() + event->angleDelta().y() > 0) {
-        emit ScaleChanged(GetScale() * 1.1);
-        SetYScale(GetYScale() * 1.1);
+        if (!only_vertical) {
+          emit ScaleChanged(GetScale() * 1.1);
+        }
+
+        if (!only_horizontal) {
+          SetYScale(GetYScale() * 1.1);
+        }
       } else {
-        emit ScaleChanged(GetScale() * 0.9);
-        SetYScale(GetYScale() * 0.9);
+        if (!only_vertical) {
+          emit ScaleChanged(GetScale() * 0.9);
+        }
+
+        if (!only_horizontal) {
+          SetYScale(GetYScale() *0.9);
+        }
       }
     }
   } else {
diff --git a/app/widget/curvewidget/curveview.h b/app/widget/curvewidget/curveview.h
index 2c767acd6..67c2e25c3 100644
--- a/app/widget/curvewidget/curveview.h
+++ b/app/widget/curvewidget/curveview.h
@@ -39,6 +39,8 @@ public:
 
   void SetTrackCount(int count);
 
+  void SetTrackVisible(int track, bool visible);
+
 public slots:
   void AddKeyframe(NodeKeyframePtr key);
 
@@ -76,6 +78,8 @@ private:
 
   QList<BezierControlPointItem*> bezier_control_points_;
 
+  QVector<bool> track_visible_;
+
   int track_count_;
 
 private slots:
diff --git a/app/widget/curvewidget/curvewidget.cpp b/app/widget/curvewidget/curvewidget.cpp
index 4cd9dba3e..2453618f9 100644
--- a/app/widget/curvewidget/curvewidget.cpp
+++ b/app/widget/curvewidget/curvewidget.cpp
@@ -117,12 +117,17 @@ void CurveWidget::SetInput(NodeInput *input)
 {
   if (bridge_) {
     foreach (QWidget* bridge_widget, bridge_->widgets()) {
-      delete bridge_widget;
+      bridge_widget->deleteLater();
     }
-    delete bridge_;
+    bridge_->deleteLater();
     bridge_ = nullptr;
   }
 
+  foreach (QCheckBox* box, checkboxes_) {
+    box->deleteLater();
+  }
+  checkboxes_.clear();
+
   if (input_) {
     disconnect(input_, &NodeInput::KeyframeAdded, view_, &CurveView::AddKeyframe);
     disconnect(input_, &NodeInput::KeyframeRemoved, view_, &CurveView::RemoveKeyframe);
@@ -142,7 +147,15 @@ void CurveWidget::SetInput(NodeInput *input)
 
     for (int i=0;i<bridge_->widgets().size();i++) {
       // Insert between two stretches to center the widget
-      widget_bridge_layout_->insertWidget(2 + i, bridge_->widgets().at(i));
+      QCheckBox* checkbox = new QCheckBox();
+      checkbox->setChecked(true);
+      widget_bridge_layout_->insertWidget(2 + i*2, checkbox);
+      checkboxes_.append(checkbox);
+      connect(checkbox, &QCheckBox::clicked, this, [this](bool e){
+        view_->SetTrackVisible(checkboxes_.indexOf(static_cast<QCheckBox*>(sender())), e);
+      });
+
+      widget_bridge_layout_->insertWidget(2 + i*2 + 1, bridge_->widgets().at(i));
     }
 
     connect(input_, &NodeInput::KeyframeAdded, view_, &CurveView::AddKeyframe);
diff --git a/app/widget/curvewidget/curvewidget.h b/app/widget/curvewidget/curvewidget.h
index 21e0400d0..a1c2035c0 100644
--- a/app/widget/curvewidget/curvewidget.h
+++ b/app/widget/curvewidget/curvewidget.h
@@ -21,6 +21,7 @@
 #ifndef CURVEWIDGET_H
 #define CURVEWIDGET_H
 
+#include <QCheckBox>
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QWidget>
@@ -87,6 +88,8 @@ private:
 
   NodeParamViewKeyframeControl* key_control_;
 
+  QList<QCheckBox*> checkboxes_;
+
 private slots:
   void SelectionChanged();
 
diff --git a/app/widget/keyframeview/keyframeviewbase.cpp b/app/widget/keyframeview/keyframeviewbase.cpp
index 0bf903b39..257a12e09 100644
--- a/app/widget/keyframeview/keyframeviewbase.cpp
+++ b/app/widget/keyframeview/keyframeviewbase.cpp
@@ -106,6 +106,11 @@ KeyframeViewItem *KeyframeViewBase::AddKeyframeInternal(NodeKeyframePtr key)
   item->SetScale(GetScale());
   item_map_.insert(key.get(), item);
   scene()->addItem(item);
+
+  if (hidden_tracks_.contains(key->track())) {
+    item->setVisible(false);
+  }
+
   return item;
 }
 
@@ -306,6 +311,27 @@ void KeyframeViewBase::SetYAxisEnabled(bool e)
   y_axis_enabled_ = e;
 }
 
+void KeyframeViewBase::SetKeyframeTrackVisible(int track, bool visible)
+{
+  if (!visible == hidden_tracks_.contains(track)) {
+    return;
+  }
+
+  QMap<NodeKeyframe*, KeyframeViewItem*>::const_iterator i;
+
+  for (i=item_map_.constBegin(); i!=item_map_.constEnd(); i++) {
+    if (i.key()->track() == track) {
+      i.value()->setVisible(visible);
+    }
+  }
+
+  if (visible) {
+    hidden_tracks_.removeOne(track);
+  } else {
+    hidden_tracks_.append(track);
+  }
+}
+
 rational KeyframeViewBase::CalculateNewTimeFromScreen(const rational &old_time, double cursor_diff)
 {
   return rational::fromDouble(old_time.toDouble() + cursor_diff);
diff --git a/app/widget/keyframeview/keyframeviewbase.h b/app/widget/keyframeview/keyframeviewbase.h
index 04e7d6096..705e845c6 100644
--- a/app/widget/keyframeview/keyframeviewbase.h
+++ b/app/widget/keyframeview/keyframeviewbase.h
@@ -64,6 +64,8 @@ protected:
 
   void SetYAxisEnabled(bool e);
 
+  void SetKeyframeTrackVisible(int track, bool visible);
+
 private:
   rational CalculateNewTimeFromScreen(const rational& old_time, double cursor_diff);
 
@@ -100,6 +102,8 @@ private:
 
   bool currently_autoselecting_;
 
+  QList<int> hidden_tracks_;
+
 private slots:
   void ShowContextMenu();
 

From e97b5a9a1438fba0cceaaa2f2746a60b1a5bf468 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 21 Jun 2020 13:12:07 +1000
Subject: [PATCH 028/138] nodeparamview: set time on node set

Fixes bug where keyframes would land on 0 unless the time is set a
second time.
---
 app/widget/nodeparamview/nodeparamview.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/widget/nodeparamview/nodeparamview.cpp b/app/widget/nodeparamview/nodeparamview.cpp
index eaae8d0eb..bc7f1e07d 100644
--- a/app/widget/nodeparamview/nodeparamview.cpp
+++ b/app/widget/nodeparamview/nodeparamview.cpp
@@ -177,18 +177,21 @@ void NodeParamView::SetNodes(QList<Node *> nodes)
     if (viewer) {
       SetTimebase(viewer->video_params().time_base());
 
+      rational time = Timecode::timestamp_to_time(this->GetTimestamp(), timebase());
+
       // Set viewer as a time target
       keyframe_view_->SetTimeTarget(viewer);
 
       foreach (NodeParamViewItem* item, items_) {
         item->SetTimeTarget(viewer);
+        item->SetTime(time);
       }
 
       emit TimeTargetChanged(viewer);
     }
 
     // Forces the scroll to update to this time
-    keyframe_view_->SetTime(ruler()->GetTime());
+    keyframe_view_->SetTime(GetTimestamp());
   }
 }
 
@@ -239,7 +242,7 @@ void NodeParamView::DeleteSelected()
 
 void NodeParamView::UpdateItemTime(const int64_t &timestamp)
 {
-  rational time = Timecode::timestamp_to_time(timestamp, keyframe_view_->timebase());
+  rational time = Timecode::timestamp_to_time(timestamp, timebase());
 
   foreach (NodeParamViewItem* item, items_) {
     item->SetTime(time);

From 1725f01459b77250ef7100b27d4c7f9ea70024a3 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 22 Jun 2020 00:38:00 +1000
Subject: [PATCH 029/138] paramview: changed to static viewer-bound and fixed
 various scrolling issues

---
 app/panel/param/param.cpp                     |  2 -
 app/panel/param/param.h                       |  2 -
 app/widget/keyframeview/keyframeview.cpp      |  9 ++-
 app/widget/keyframeview/keyframeview.h        | 10 +++
 app/widget/keyframeview/keyframeviewbase.cpp  | 18 +++--
 app/widget/nodeparamview/nodeparamview.cpp    | 78 +++++++++----------
 app/widget/nodeparamview/nodeparamview.h      | 15 ++--
 app/widget/timebased/timebased.h              |  4 +-
 .../timelinewidget/view/timelineview.cpp      |  1 -
 .../timelinewidget/view/timelineviewbase.cpp  |  7 --
 .../timelinewidget/view/timelineviewbase.h    |  4 -
 app/window/mainwindow/mainwindow.cpp          |  1 +
 12 files changed, 81 insertions(+), 70 deletions(-)

diff --git a/app/panel/param/param.cpp b/app/panel/param/param.cpp
index 649998cdf..47d81df49 100644
--- a/app/panel/param/param.cpp
+++ b/app/panel/param/param.cpp
@@ -29,7 +29,6 @@ ParamPanel::ParamPanel(QWidget* parent) :
 {
   NodeParamView* view = new NodeParamView();
   connect(view, &NodeParamView::InputDoubleClicked, this, &ParamPanel::CreateCurvePanel);
-  connect(view, &NodeParamView::TimeTargetChanged, this, &ParamPanel::TimeTargetChanged);
   connect(view, &NodeParamView::RequestSelectNode, this, &ParamPanel::RequestSelectNode);
   connect(view, &NodeParamView::OpenedNode, this, &ParamPanel::OpeningNode);
   connect(view, &NodeParamView::ClosedNode, this, &ParamPanel::ClosingNode);
@@ -104,7 +103,6 @@ void ParamPanel::CreateCurvePanel(NodeInput *input)
 
   connect(view, &NodeParamView::TimebaseChanged, panel, &CurvePanel::SetTimebase);
   connect(view, &NodeParamView::TimeChanged, panel, &CurvePanel::SetTimestamp);
-  connect(view, &NodeParamView::TimeTargetChanged, panel, &CurvePanel::SetTimeTarget);
   connect(panel, &CurvePanel::TimeChanged, view, &NodeParamView::SetTimestamp);
   connect(panel, &CurvePanel::TimeChanged, view, &NodeParamView::TimeChanged);
   connect(panel, &CurvePanel::CloseRequested, this, &ParamPanel::ClosingCurvePanel);
diff --git a/app/panel/param/param.h b/app/panel/param/param.h
index 0227e45ba..e75350d6b 100644
--- a/app/panel/param/param.h
+++ b/app/panel/param/param.h
@@ -41,8 +41,6 @@ public slots:
   virtual void DeleteSelected() override;
 
 signals:
-  void TimeTargetChanged(Node* node);
-
   void RequestSelectNode(const QList<Node*>& target);
 
   void FoundGizmos(Node* node);
diff --git a/app/widget/keyframeview/keyframeview.cpp b/app/widget/keyframeview/keyframeview.cpp
index cfbac331f..2d6b880e9 100644
--- a/app/widget/keyframeview/keyframeview.cpp
+++ b/app/widget/keyframeview/keyframeview.cpp
@@ -23,7 +23,8 @@
 OLIVE_NAMESPACE_ENTER
 
 KeyframeView::KeyframeView(QWidget *parent) :
-  KeyframeViewBase(parent)
+  KeyframeViewBase(parent),
+  max_scroll_(0)
 {
   setAlignment(Qt::AlignLeft | Qt::AlignTop);
 }
@@ -35,6 +36,12 @@ void KeyframeView::wheelEvent(QWheelEvent *event)
   }
 }
 
+void KeyframeView::SceneRectUpdateEvent(QRectF &rect)
+{
+  rect.setY(0);
+  rect.setHeight(max_scroll_);
+}
+
 void KeyframeView::AddKeyframe(NodeKeyframePtr key, int y)
 {
   QPoint global_pt(0, y);
diff --git a/app/widget/keyframeview/keyframeview.h b/app/widget/keyframeview/keyframeview.h
index 505ea4f58..90361c8e5 100644
--- a/app/widget/keyframeview/keyframeview.h
+++ b/app/widget/keyframeview/keyframeview.h
@@ -31,12 +31,22 @@ class KeyframeView : public KeyframeViewBase
 public:
   KeyframeView(QWidget* parent = nullptr);
 
+  void SetMaxScroll(int i)
+  {
+    max_scroll_ = i;
+  }
+
 protected:
   virtual void wheelEvent(QWheelEvent* event) override;
 
+  virtual void SceneRectUpdateEvent(QRectF& rect) override;
+
 public slots:
   void AddKeyframe(NodeKeyframePtr key, int y);
 
+private:
+  int max_scroll_;
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/keyframeview/keyframeviewbase.cpp b/app/widget/keyframeview/keyframeviewbase.cpp
index 257a12e09..e6c4ad480 100644
--- a/app/widget/keyframeview/keyframeviewbase.cpp
+++ b/app/widget/keyframeview/keyframeviewbase.cpp
@@ -101,14 +101,18 @@ void KeyframeViewBase::RemoveKeyframe(NodeKeyframePtr key)
 
 KeyframeViewItem *KeyframeViewBase::AddKeyframeInternal(NodeKeyframePtr key)
 {
-  KeyframeViewItem* item = new KeyframeViewItem(key);
-  item->SetTimeTarget(GetTimeTarget());
-  item->SetScale(GetScale());
-  item_map_.insert(key.get(), item);
-  scene()->addItem(item);
+  KeyframeViewItem* item = item_map_.value(key.get());
 
-  if (hidden_tracks_.contains(key->track())) {
-    item->setVisible(false);
+  if (!item) {
+    item = new KeyframeViewItem(key);
+    item->SetTimeTarget(GetTimeTarget());
+    item->SetScale(GetScale());
+    item_map_.insert(key.get(), item);
+    scene()->addItem(item);
+
+    if (hidden_tracks_.contains(key->track())) {
+      item->setVisible(false);
+    }
   }
 
   return item;
diff --git a/app/widget/nodeparamview/nodeparamview.cpp b/app/widget/nodeparamview/nodeparamview.cpp
index bc7f1e07d..eab4bd815 100644
--- a/app/widget/nodeparamview/nodeparamview.cpp
+++ b/app/widget/nodeparamview/nodeparamview.cpp
@@ -43,18 +43,19 @@ NodeParamView::NodeParamView(QWidget *parent) :
 
   // Set up scroll area for params
   QScrollArea* scroll_area = new QScrollArea();
+  scroll_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
   scroll_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   scroll_area->setWidgetResizable(true);
   splitter->addWidget(scroll_area);
 
   // Param widget
-  QWidget* param_widget_area = new QWidget();
-  scroll_area->setWidget(param_widget_area);
+  param_widget_area_ = new QWidget();
+  scroll_area->setWidget(param_widget_area_);
 
   // Set up scroll area layout
-  param_layout_ = new QVBoxLayout(param_widget_area);
+  param_layout_ = new QVBoxLayout(param_widget_area_);
   param_layout_->setSpacing(0);
-  param_layout_->setMargin(0);
+  param_layout_->setContentsMargins(0, ruler()->height(), 0, 0);
 
   // Add a stretch to allow empty space at the bottom of the layout
   param_layout_->addStretch();
@@ -73,7 +74,6 @@ NodeParamView::NodeParamView(QWidget *parent) :
   keyframe_view_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   ConnectTimelineView(keyframe_view_);
   connect(keyframe_view_, &KeyframeView::RequestCenterScrollOnPlayhead, this, &NodeParamView::CenterScrollOnPlayhead);
-  bottom_item_ = keyframe_view_->scene()->addRect(0, 0, 1, 1);
   keyframe_area_layout->addWidget(keyframe_view_);
 
   // Connect ruler and keyframe view together
@@ -122,19 +122,15 @@ NodeParamView::NodeParamView(QWidget *parent) :
 
 void NodeParamView::SetNodes(QList<Node *> nodes)
 {
-  ConnectViewerNode(nullptr);
-
   // If we already have item widgets, delete them all now
   foreach (NodeParamViewItem* item, items_) {
     emit ClosedNode(item->GetNode());
     emit FoundGizmos(nullptr);
-    delete item;
+    item->deleteLater();
   }
   items_.clear();
-  emit TimeTargetChanged(nullptr);
 
   // Reset keyframe view
-  SetTimebase(rational());
   keyframe_view_->Clear();
 
   // Set the internal list to the one we've received
@@ -158,10 +154,6 @@ void NodeParamView::SetNodes(QList<Node *> nodes)
 
       items_.append(item);
 
-      QMetaObject::invokeMethod(item,
-                                "SignalAllKeyframes",
-                                Qt::QueuedConnection);
-
       emit OpenedNode(node);
 
       if (!found_gizmos && node->HasGizmos()) {
@@ -170,28 +162,7 @@ void NodeParamView::SetNodes(QList<Node *> nodes)
       }
     }
 
-    ViewerOutput* viewer = nodes_.first()->FindOutputNode<ViewerOutput>();
-
-    ConnectViewerNode(viewer);
-
-    if (viewer) {
-      SetTimebase(viewer->video_params().time_base());
-
-      rational time = Timecode::timestamp_to_time(this->GetTimestamp(), timebase());
-
-      // Set viewer as a time target
-      keyframe_view_->SetTimeTarget(viewer);
-
-      foreach (NodeParamViewItem* item, items_) {
-        item->SetTimeTarget(viewer);
-        item->SetTime(time);
-      }
-
-      emit TimeTargetChanged(viewer);
-    }
-
-    // Forces the scroll to update to this time
-    keyframe_view_->SetTime(GetTimestamp());
+    QMetaObject::invokeMethod(this, "PlaceKeyframesOnView", Qt::QueuedConnection);
   }
 }
 
@@ -214,6 +185,8 @@ void NodeParamView::TimebaseChangedEvent(const rational &timebase)
   TimeBasedWidget::TimebaseChangedEvent(timebase);
 
   keyframe_view_->SetTimebase(timebase);
+
+  UpdateItemTime(GetTimestamp());
 }
 
 void NodeParamView::TimeChangedEvent(const int64_t &timestamp)
@@ -225,6 +198,28 @@ void NodeParamView::TimeChangedEvent(const int64_t &timestamp)
   UpdateItemTime(timestamp);
 }
 
+void NodeParamView::ConnectedNodeChanged(ViewerOutput *n)
+{
+  // Set viewer as a time target
+  keyframe_view_->SetTimeTarget(n);
+
+  foreach (NodeParamViewItem* item, items_) {
+    item->SetTimeTarget(n);
+  }
+}
+
+void NodeParamView::ConnectNodeInternal(ViewerOutput *n)
+{
+  SetTimebase(n->video_params().time_base());
+}
+
+void NodeParamView::DisconnectNodeInternal(ViewerOutput *n)
+{
+  Q_UNUSED(n)
+
+  SetTimebase(rational());
+}
+
 const QList<Node *> &NodeParamView::nodes()
 {
   return nodes_;
@@ -254,11 +249,16 @@ void NodeParamView::ItemRequestedTimeChanged(const rational &time)
   SetTimeAndSignal(Timecode::time_to_timestamp(time, keyframe_view_->timebase()));
 }
 
-void NodeParamView::ForceKeyframeViewToScroll(int min, int max)
+void NodeParamView::ForceKeyframeViewToScroll()
 {
-  Q_UNUSED(min)
+  keyframe_view_->SetMaxScroll(param_widget_area_->height() - ruler()->height());
+}
 
-  bottom_item_->setY(keyframe_view_->viewport()->height() + max);
+void NodeParamView::PlaceKeyframesOnView()
+{
+  foreach (NodeParamViewItem* item, items_) {
+    QMetaObject::invokeMethod(item, "SignalAllKeyframes", Qt::QueuedConnection);
+  }
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodeparamview/nodeparamview.h b/app/widget/nodeparamview/nodeparamview.h
index fd6fe4220..71d4edcfd 100644
--- a/app/widget/nodeparamview/nodeparamview.h
+++ b/app/widget/nodeparamview/nodeparamview.h
@@ -47,8 +47,6 @@ public:
 signals:
   void InputDoubleClicked(NodeInput* input);
 
-  void TimeTargetChanged(Node* target);
-
   void RequestSelectNode(const QList<Node*>& target);
 
   void OpenedNode(Node* n);
@@ -64,6 +62,11 @@ protected:
   virtual void TimebaseChangedEvent(const rational&) override;
   virtual void TimeChangedEvent(const int64_t &) override;
 
+  virtual void ConnectedNodeChanged(ViewerOutput* n) override;
+
+  virtual void ConnectNodeInternal(ViewerOutput* n) override;
+  virtual void DisconnectNodeInternal(ViewerOutput* n) override;
+
 private:
   void UpdateItemTime(const int64_t &timestamp);
 
@@ -77,14 +80,16 @@ private:
 
   QScrollBar* vertical_scrollbar_;
 
-  QGraphicsRectItem* bottom_item_;
-
   int last_scroll_val_;
 
+  QWidget* param_widget_area_;
+
 private slots:
   void ItemRequestedTimeChanged(const rational& time);
 
-  void ForceKeyframeViewToScroll(int min, int max);
+  void ForceKeyframeViewToScroll();
+
+  void PlaceKeyframesOnView();
 
 };
 
diff --git a/app/widget/timebased/timebased.h b/app/widget/timebased/timebased.h
index 49012af1c..bf5b8ac40 100644
--- a/app/widget/timebased/timebased.h
+++ b/app/widget/timebased/timebased.h
@@ -52,6 +52,8 @@ public:
 
   void SetScaleAndCenterOnPlayhead(const double& scale);
 
+  TimeRuler* ruler() const;
+
 public slots:
   void SetTimestamp(int64_t timestamp);
 
@@ -89,8 +91,6 @@ public slots:
 
   void GoToOut();
 
-  TimeRuler* ruler() const;
-
 protected slots:
   void SetTimeAndSignal(const int64_t& t);
 
diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp
index 2d3cc4511..d3ae73c56 100644
--- a/app/widget/timelinewidget/view/timelineview.cpp
+++ b/app/widget/timelinewidget/view/timelineview.cpp
@@ -45,7 +45,6 @@ TimelineView::TimelineView(Qt::Alignment vertical_alignment, QWidget *parent) :
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
   setBackgroundRole(QPalette::Window);
   setContextMenuPolicy(Qt::CustomContextMenu);
-  SetLimitYAxis(true);
   viewport()->setMouseTracking(true);
 
   connect(scene(), &QGraphicsScene::selectionChanged, this, &TimelineView::SelectionChanged);
diff --git a/app/widget/timelinewidget/view/timelineviewbase.cpp b/app/widget/timelinewidget/view/timelineviewbase.cpp
index c945f80db..c044f425e 100644
--- a/app/widget/timelinewidget/view/timelineviewbase.cpp
+++ b/app/widget/timelinewidget/view/timelineviewbase.cpp
@@ -39,7 +39,6 @@ TimelineViewBase::TimelineViewBase(QWidget *parent) :
   playhead_scene_left_(-1),
   playhead_scene_right_(-1),
   dragging_playhead_(false),
-  limit_y_axis_(false),
   snapped_(false),
   snap_service_(nullptr)
 {
@@ -271,10 +270,4 @@ bool TimelineViewBase::WheelEventIsAZoomEvent(QWheelEvent *event)
   return (static_cast<bool>(event->modifiers() & Qt::ControlModifier) == !Config::Current()["ScrollZooms"].toBool());
 }
 
-void TimelineViewBase::SetLimitYAxis(bool)
-{
-  limit_y_axis_ = true;
-  UpdateSceneRect();
-}
-
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/timelinewidget/view/timelineviewbase.h b/app/widget/timelinewidget/view/timelineviewbase.h
index e664f5178..cb667dd41 100644
--- a/app/widget/timelinewidget/view/timelineviewbase.h
+++ b/app/widget/timelinewidget/view/timelineviewbase.h
@@ -73,8 +73,6 @@ protected:
 
   bool WheelEventIsAZoomEvent(QWheelEvent* event);
 
-  void SetLimitYAxis(bool e);
-
   rational GetPlayheadTime() const;
 
   bool PlayheadPress(QMouseEvent* event);
@@ -97,8 +95,6 @@ private:
 
   QGraphicsScene scene_;
 
-  bool limit_y_axis_;
-
   bool snapped_;
   QList<rational> snap_time_;
 
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 98538cc77..38f364cb2 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -518,6 +518,7 @@ void MainWindow::RemoveProjectPanel(ProjectPanel *panel)
 void MainWindow::TimelineFocused(ViewerOutput* viewer)
 {
   sequence_viewer_panel_->ConnectViewerNode(viewer);
+  param_panel_->ConnectViewerNode(viewer);
 
   Sequence* seq = nullptr;
 

From 6ebcb7162e4b05e79dc7230ce9587c6d64b412c0 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 22 Jun 2020 00:39:38 +1000
Subject: [PATCH 030/138] audiovisualwaveform: clamp audio values so they stay
 inbounds

---
 app/audio/audiovisualwaveform.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/audio/audiovisualwaveform.cpp b/app/audio/audiovisualwaveform.cpp
index 3beeb2cbb..08c6c27b0 100644
--- a/app/audio/audiovisualwaveform.cpp
+++ b/app/audio/audiovisualwaveform.cpp
@@ -231,10 +231,13 @@ void AudioVisualWaveform::DrawSample(QPainter *painter, const QVector<SamplePerC
   int channel_half_height = channel_height / 2;
 
   for (int i=0;i<sample.size();i++) {
+    qfloat16 max = qMin(sample.at(i).max, static_cast<qfloat16>(1.0f));
+    qfloat16 min = qMax(sample.at(i).min, static_cast<qfloat16>(-1.0));
+
     if (Config::Current()[QStringLiteral("RectifiedWaveforms")].toBool()) {
       int channel_bottom = y + channel_height * (i + 1);
 
-      int diff = qRound((sample.at(i).max - sample.at(i).min) * channel_half_height);
+      int diff = qRound((max - min) * channel_half_height);
 
       painter->drawLine(x,
                         channel_bottom - diff,
@@ -244,9 +247,9 @@ void AudioVisualWaveform::DrawSample(QPainter *painter, const QVector<SamplePerC
       int channel_mid = y + channel_height * i + channel_half_height;
 
       painter->drawLine(x,
-                        channel_mid + qRound(sample.at(i).min * static_cast<float>(channel_half_height)),
+                        channel_mid + qRound(min * static_cast<float>(channel_half_height)),
                         x,
-                        channel_mid + qRound(sample.at(i).max * static_cast<float>(channel_half_height)));
+                        channel_mid + qRound(max * static_cast<float>(channel_half_height)));
     }
   }
 }

From 1ec0d06e9fe1206d0e8366956933fd97ae009968 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 22 Jun 2020 00:40:19 +1000
Subject: [PATCH 031/138] timebasedpanel: check if node is the same

Minor optimization.
---
 app/panel/timebased/timebased.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/panel/timebased/timebased.cpp b/app/panel/timebased/timebased.cpp
index 37a0959fa..5e95e944d 100644
--- a/app/panel/timebased/timebased.cpp
+++ b/app/panel/timebased/timebased.cpp
@@ -125,6 +125,10 @@ TimeRuler *TimeBasedPanel::ruler() const
 
 void TimeBasedPanel::ConnectViewerNode(ViewerOutput *node)
 {
+  if (widget_->GetConnectedNode() == node) {
+    return;
+  }
+
   if (widget_->GetConnectedNode()) {
     disconnect(widget_->GetConnectedNode(), &ViewerOutput::MediaNameChanged, this, &TimeBasedPanel::SetSubtitle);
   }

From 2207a915a6a239928326551ab43b8d5e04878244 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 23 Jun 2020 05:15:48 +1000
Subject: [PATCH 032/138] viewernode: check if timebase/size have actually
 changed before signalling

Minor optimization.
---
 app/node/output/viewer/viewer.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp
index 8078ade32..45fd6b23d 100644
--- a/app/node/output/viewer/viewer.cpp
+++ b/app/node/output/viewer/viewer.cpp
@@ -129,12 +129,20 @@ void ViewerOutput::InvalidateCache(const TimeRange &range, NodeInput *from, Node
 
 void ViewerOutput::set_video_params(const VideoParams &video)
 {
+  bool size_changed = video_params_.width() != video.width() || video_params_.height() != video.height();
+  bool timebase_changed = video_params_.time_base() != video.time_base();
+
   video_params_ = video;
 
-  video_frame_cache_.SetTimebase(video_params_.time_base());
+  if (size_changed) {
+    emit SizeChanged(video_params_.width(), video_params_.height());
+  }
+
+  if (timebase_changed) {
+    video_frame_cache_.SetTimebase(video_params_.time_base());
+    emit TimebaseChanged(video_params_.time_base());
+  }
 
-  emit SizeChanged(video_params_.width(), video_params_.height());
-  emit TimebaseChanged(video_params_.time_base());
   emit ParamsChanged();
 }
 

From e681b87988493978419bb0311685e1c098cd9948 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 23 Jun 2020 05:22:58 +1000
Subject: [PATCH 033/138] curve/param/panels: leave curve panel open and have
 option for timebasedwidget to auto-set timebase

---
 app/panel/curve/curve.cpp                    |  5 --
 app/panel/curve/curve.h                      |  2 -
 app/panel/param/param.cpp                    | 77 +++++++++-----------
 app/panel/param/param.h                      |  9 ++-
 app/widget/curvewidget/curvewidget.cpp       | 11 +--
 app/widget/curvewidget/curvewidget.h         |  2 +
 app/widget/nodeparamview/nodeparamview.cpp   | 12 ---
 app/widget/nodeparamview/nodeparamview.h     |  3 -
 app/widget/timebased/timebased.cpp           | 25 ++++++-
 app/widget/timebased/timebased.h             |  8 ++
 app/widget/timelinewidget/timelinewidget.cpp |  4 +-
 app/widget/viewer/viewer.cpp                 | 12 ---
 12 files changed, 81 insertions(+), 89 deletions(-)

diff --git a/app/panel/curve/curve.cpp b/app/panel/curve/curve.cpp
index 2c9fc0e4b..b6179d258 100644
--- a/app/panel/curve/curve.cpp
+++ b/app/panel/curve/curve.cpp
@@ -49,11 +49,6 @@ void CurvePanel::SetInput(NodeInput *input)
   Retranslate();
 }
 
-void CurvePanel::SetTimeTarget(Node *target)
-{
-  static_cast<CurveWidget*>(GetTimeBasedWidget())->SetTimeTarget(target);
-}
-
 void CurvePanel::IncreaseTrackHeight()
 {
   CurveWidget* c = static_cast<CurveWidget*>(GetTimeBasedWidget());
diff --git a/app/panel/curve/curve.h b/app/panel/curve/curve.h
index 4b25b2b22..982a4d0b4 100644
--- a/app/panel/curve/curve.h
+++ b/app/panel/curve/curve.h
@@ -39,8 +39,6 @@ public:
 public slots:
   void SetInput(NodeInput* input);
 
-  void SetTimeTarget(Node* target);
-
   virtual void IncreaseTrackHeight() override;
 
   virtual void DecreaseTrackHeight() override;
diff --git a/app/panel/param/param.cpp b/app/panel/param/param.cpp
index 47d81df49..1bd3355d7 100644
--- a/app/panel/param/param.cpp
+++ b/app/panel/param/param.cpp
@@ -30,8 +30,6 @@ ParamPanel::ParamPanel(QWidget* parent) :
   NodeParamView* view = new NodeParamView();
   connect(view, &NodeParamView::InputDoubleClicked, this, &ParamPanel::CreateCurvePanel);
   connect(view, &NodeParamView::RequestSelectNode, this, &ParamPanel::RequestSelectNode);
-  connect(view, &NodeParamView::OpenedNode, this, &ParamPanel::OpeningNode);
-  connect(view, &NodeParamView::ClosedNode, this, &ParamPanel::ClosingNode);
   connect(view, &NodeParamView::FoundGizmos, this, &ParamPanel::FoundGizmos);
   SetTimeBasedWidget(view);
 
@@ -50,13 +48,7 @@ void ParamPanel::SetTimestamp(const int64_t &timestamp)
   TimeBasedPanel::SetTimestamp(timestamp);
 
   // Ensure all CurvePanels are updated with this time too
-  QHash<NodeInput*, CurvePanel*>::const_iterator i;
-
-  for (i=open_curve_panels_.begin(); i!=open_curve_panels_.end(); i++) {
-    if (i.value() && i.value() != sender()) {
-      i.value()->SetTimestamp(timestamp);
-    }
-  }
+  ParamViewTimeChanged(timestamp);
 }
 
 void ParamPanel::DeleteSelected()
@@ -97,50 +89,51 @@ void ParamPanel::CreateCurvePanel(NodeInput *input)
   panel = Core::instance()->main_window()->AppendCurvePanel();
 
   panel->SetInput(input);
-  panel->SetTimebase(view->timebase());
+  panel->ConnectViewerNode(view->GetConnectedNode());
   panel->SetTimestamp(view->GetTimestamp());
-  panel->SetTimeTarget(view->GetTimeTarget());
 
-  connect(view, &NodeParamView::TimebaseChanged, panel, &CurvePanel::SetTimebase);
-  connect(view, &NodeParamView::TimeChanged, panel, &CurvePanel::SetTimestamp);
-  connect(panel, &CurvePanel::TimeChanged, view, &NodeParamView::SetTimestamp);
-  connect(panel, &CurvePanel::TimeChanged, view, &NodeParamView::TimeChanged);
+  connect(view, &NodeParamView::TimeChanged, this, &ParamPanel::ParamViewTimeChanged);
+  connect(panel, &CurvePanel::TimeChanged, this, &ParamPanel::CurvePanelTimeChanged);
   connect(panel, &CurvePanel::CloseRequested, this, &ParamPanel::ClosingCurvePanel);
 
   open_curve_panels_.insert(input, panel);
 }
 
-void ParamPanel::OpeningNode(Node *n)
-{
-  QList<NodeInput*> inputs = n->GetInputsIncludingArrays();
-
-  foreach (NodeInput* i, inputs) {
-    if (open_curve_panels_.contains(i)) {
-      // We had a CurvePanel open for this input that was closed in ClosingNode(), re-open it
-      CreateCurvePanel(i);
-    }
-  }
-}
-
-void ParamPanel::ClosingNode(Node *n)
-{
-  QList<NodeInput*> inputs = n->GetInputsIncludingArrays();
-
-  foreach (NodeInput* i, inputs) {
-    CurvePanel* panel = open_curve_panels_.value(i);
-
-    // Close the panel (this also destroys it), but keep a reference in the hash
-    if (panel) {
-      panel->close();
-      open_curve_panels_.insert(i, nullptr);
-    }
-  }
-}
-
 void ParamPanel::ClosingCurvePanel()
 {
   CurvePanel* panel = static_cast<CurvePanel*>(sender());
   open_curve_panels_.remove(panel->GetInput());
 }
 
+void ParamPanel::ParamViewTimeChanged(const int64_t &time)
+{
+  // Ensure all CurvePanels are updated with this time too
+  QHash<NodeInput*, CurvePanel*>::const_iterator i;
+
+  for (i=open_curve_panels_.begin(); i!=open_curve_panels_.end(); i++) {
+    // If connected viewers are the same, set the timestamp
+    if (i.value()->GetConnectedViewer() == GetConnectedViewer()) {
+      i.value()->SetTimestamp(time);
+    }
+  }
+}
+
+void ParamPanel::CurvePanelTimeChanged(const int64_t &time)
+{
+  GetTimeBasedWidget()->SetTimestamp(time);
+  emit GetTimeBasedWidget()->TimeChanged(time);
+
+  CurvePanel* src = static_cast<CurvePanel*>(sender());
+
+  // Ensure all CurvePanels are updated with this time too
+  QHash<NodeInput*, CurvePanel*>::const_iterator i;
+
+  for (i=open_curve_panels_.begin(); i!=open_curve_panels_.end(); i++) {
+    // If connected viewers are the same and the panel isn't the source, set the timestamp
+    if (i.value() != src && i.value()->GetConnectedViewer() == src->GetConnectedViewer()) {
+      i.value()->SetTimestamp(time);
+    }
+  }
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/panel/param/param.h b/app/panel/param/param.h
index e75350d6b..12bc1715e 100644
--- a/app/panel/param/param.h
+++ b/app/panel/param/param.h
@@ -51,15 +51,16 @@ protected:
 private slots:
   void CreateCurvePanel(NodeInput* input);
 
-  void OpeningNode(Node* n);
-
-  void ClosingNode(Node* n);
-
   void ClosingCurvePanel();
 
 private:
   QHash<NodeInput*, CurvePanel*> open_curve_panels_;
 
+private slots:
+  void ParamViewTimeChanged(const int64_t& time);
+
+  void CurvePanelTimeChanged(const int64_t& time);
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/curvewidget/curvewidget.cpp b/app/widget/curvewidget/curvewidget.cpp
index 2453618f9..aa294deb2 100644
--- a/app/widget/curvewidget/curvewidget.cpp
+++ b/app/widget/curvewidget/curvewidget.cpp
@@ -218,8 +218,6 @@ void CurveWidget::ScaleChangedEvent(const double &scale)
 
 void CurveWidget::TimeTargetChangedEvent(Node *target)
 {
-  ConnectViewerNode(nullptr);
-
   key_control_->SetTimeTarget(target);
 
   view_->SetTimeTarget(target);
@@ -227,12 +225,11 @@ void CurveWidget::TimeTargetChangedEvent(Node *target)
   if (bridge_) {
     bridge_->SetTimeTarget(target);
   }
+}
 
-  // FIXME: If a non-viewer node is ever set here, it will fail to update the length
-  ViewerOutput* viewer = dynamic_cast<ViewerOutput*>(target);
-  if (viewer) {
-    ConnectViewerNode(viewer);
-  }
+void CurveWidget::ConnectedNodeChanged(ViewerOutput *n)
+{
+  SetTimeTarget(n);
 }
 
 void CurveWidget::UpdateInputLabel()
diff --git a/app/widget/curvewidget/curvewidget.h b/app/widget/curvewidget/curvewidget.h
index a1c2035c0..7c33b49c7 100644
--- a/app/widget/curvewidget/curvewidget.h
+++ b/app/widget/curvewidget/curvewidget.h
@@ -59,6 +59,8 @@ protected:
 
   virtual void TimeTargetChangedEvent(Node* target) override;
 
+  virtual void ConnectedNodeChanged(ViewerOutput* n) override;
+
 private:
   void UpdateInputLabel();
 
diff --git a/app/widget/nodeparamview/nodeparamview.cpp b/app/widget/nodeparamview/nodeparamview.cpp
index eab4bd815..03ce22f18 100644
--- a/app/widget/nodeparamview/nodeparamview.cpp
+++ b/app/widget/nodeparamview/nodeparamview.cpp
@@ -208,18 +208,6 @@ void NodeParamView::ConnectedNodeChanged(ViewerOutput *n)
   }
 }
 
-void NodeParamView::ConnectNodeInternal(ViewerOutput *n)
-{
-  SetTimebase(n->video_params().time_base());
-}
-
-void NodeParamView::DisconnectNodeInternal(ViewerOutput *n)
-{
-  Q_UNUSED(n)
-
-  SetTimebase(rational());
-}
-
 const QList<Node *> &NodeParamView::nodes()
 {
   return nodes_;
diff --git a/app/widget/nodeparamview/nodeparamview.h b/app/widget/nodeparamview/nodeparamview.h
index 71d4edcfd..9fe697d97 100644
--- a/app/widget/nodeparamview/nodeparamview.h
+++ b/app/widget/nodeparamview/nodeparamview.h
@@ -64,9 +64,6 @@ protected:
 
   virtual void ConnectedNodeChanged(ViewerOutput* n) override;
 
-  virtual void ConnectNodeInternal(ViewerOutput* n) override;
-  virtual void DisconnectNodeInternal(ViewerOutput* n) override;
-
 private:
   void UpdateItemTime(const int64_t &timestamp);
 
diff --git a/app/widget/timebased/timebased.cpp b/app/widget/timebased/timebased.cpp
index 6c83257d2..b2e15b03b 100644
--- a/app/widget/timebased/timebased.cpp
+++ b/app/widget/timebased/timebased.cpp
@@ -36,7 +36,8 @@ TimeBasedWidget::TimeBasedWidget(bool ruler_text_visible, bool ruler_cache_statu
   viewer_node_(nullptr),
   auto_max_scrollbar_(false),
   points_(nullptr),
-  toggle_show_all_(false)
+  toggle_show_all_(false),
+  auto_set_timebase_(true)
 {
   ruler_ = new TimeRuler(ruler_text_visible, ruler_cache_status_visible, this);
   connect(ruler_, &TimeRuler::TimeChanged, this, &TimeBasedWidget::SetTimeAndSignal);
@@ -79,6 +80,11 @@ void TimeBasedWidget::ConnectViewerNode(ViewerOutput *node)
     DisconnectNodeInternal(viewer_node_);
 
     disconnect(viewer_node_, &ViewerOutput::LengthChanged, this, &TimeBasedWidget::UpdateMaximumScroll);
+    disconnect(viewer_node_, &ViewerOutput::TimebaseChanged, this, &TimeBasedWidget::SetTimebase);
+
+    if (auto_set_timebase_) {
+      SetTimebase(rational());
+    }
 
     points_ = nullptr;
     ruler()->ConnectTimelinePoints(nullptr);
@@ -95,6 +101,18 @@ void TimeBasedWidget::ConnectViewerNode(ViewerOutput *node)
       ruler()->ConnectTimelinePoints(points_);
     }
 
+    if (auto_set_timebase_) {
+      if (!viewer_node_->video_params().time_base().isNull()) {
+        SetTimebase(viewer_node_->video_params().time_base());
+      } else if (viewer_node_->audio_params().sample_rate() > 0) {
+        SetTimebase(viewer_node_->audio_params().time_base());
+      } else {
+        SetTimebase(rational());
+      }
+
+      connect(viewer_node_, &ViewerOutput::TimebaseChanged, this, &TimeBasedWidget::SetTimebase);
+    }
+
     ConnectNodeInternal(viewer_node_);
   }
 
@@ -332,6 +350,11 @@ void TimeBasedWidget::CenterScrollOnPlayhead()
   scrollbar_->setValue(qRound(TimeToScene(Timecode::timestamp_to_time(ruler_->GetTime(), timebase()))) - scrollbar_->width()/2);
 }
 
+void TimeBasedWidget::SetAutoSetTimebase(bool e)
+{
+  auto_set_timebase_ = e;
+}
+
 void TimeBasedWidget::SetPoint(Timeline::MovementMode m, const rational& time)
 {
   if (!points_) {
diff --git a/app/widget/timebased/timebased.h b/app/widget/timebased/timebased.h
index bf5b8ac40..008514d26 100644
--- a/app/widget/timebased/timebased.h
+++ b/app/widget/timebased/timebased.h
@@ -127,6 +127,12 @@ protected slots:
    */
   void CenterScrollOnPlayhead();
 
+  /**
+   * @brief By default, TimeBasedWidget will set the timebase to the viewer node's video timebase.
+   * Set this to false if you want to set your own timebase.
+   */
+  void SetAutoSetTimebase(bool e);
+
 signals:
   void TimeChanged(const int64_t&);
 
@@ -170,6 +176,8 @@ private:
   double toggle_show_all_old_scale_;
   int toggle_show_all_old_scroll_;
 
+  bool auto_set_timebase_;
+
 private slots:
   void UpdateMaximumScroll();
 
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index b89ffe00d..504293a75 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -147,8 +147,10 @@ TimelineWidget::TimelineWidget(QWidget *parent) :
   view_splitter->setSizes({INT_MAX, INT_MAX});
 
   // FIXME: Magic number
-  SetMaximumScale(TimelineViewBase::kMaximumScale);
   SetScale(90.0);
+
+  SetMaximumScale(TimelineViewBase::kMaximumScale);
+  SetAutoSetTimebase(false);
 }
 
 TimelineWidget::~TimelineWidget()
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 6280ad88f..77ffb8102 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -168,15 +168,6 @@ void ViewerWidget::TimeChangedEvent(const int64_t &i)
 
 void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
 {
-  if (!n->video_params().time_base().isNull()) {
-    SetTimebase(n->video_params().time_base());
-  } else if (n->audio_params().sample_rate() > 0) {
-    SetTimebase(n->audio_params().time_base());
-  } else {
-    SetTimebase(rational());
-  }
-
-  connect(n, &ViewerOutput::TimebaseChanged, this, &ViewerWidget::SetTimebase);
   connect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SizeChangedSlot);
   connect(n, &ViewerOutput::LengthChanged, this, &ViewerWidget::LengthChangedSlot);
   connect(n, &ViewerOutput::ParamsChanged, this, &ViewerWidget::UpdateRendererParameters);
@@ -231,9 +222,6 @@ void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
   }
   cache_wait_timer_.stop();
 
-  SetTimebase(rational());
-
-  disconnect(n, &ViewerOutput::TimebaseChanged, this, &ViewerWidget::SetTimebase);
   disconnect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SizeChangedSlot);
   disconnect(n, &ViewerOutput::LengthChanged, this, &ViewerWidget::LengthChangedSlot);
   disconnect(n, &ViewerOutput::ParamsChanged, this, &ViewerWidget::UpdateRendererParameters);

From 8bf653925f3de184bf4a25ba5a503a0bdfb2422c Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 23 Jun 2020 05:25:34 +1000
Subject: [PATCH 034/138] curve/timeline: improved user interface behavior

* Implements "auto-fit" setting for curve view and sets it on open.
* Improves scroll zooming on all TimelineViewBase derivatives.
* Improves code sharing for better maintenance.
---
 app/widget/curvewidget/curveview.cpp          | 86 ++++++++++++-------
 app/widget/curvewidget/curveview.h            |  6 ++
 app/widget/curvewidget/curvewidget.cpp        |  2 +
 app/widget/keyframeview/keyframeviewbase.cpp  | 44 +++-------
 app/widget/keyframeview/keyframeviewbase.h    | 16 +---
 app/widget/nodeparamview/nodeparamview.cpp    |  4 +
 app/widget/timebased/timebased.cpp            |  4 +-
 .../timelinewidget/timelinescaledobject.cpp   | 17 ++++
 .../timelinewidget/timelinescaledobject.h     |  6 ++
 .../timelinewidget/view/timelineviewbase.cpp  | 76 +++++++++++++++-
 .../timelinewidget/view/timelineviewbase.h    | 19 ++++
 11 files changed, 198 insertions(+), 82 deletions(-)

diff --git a/app/widget/curvewidget/curveview.cpp b/app/widget/curvewidget/curveview.cpp
index 52a7e8eab..e5fc65cdd 100644
--- a/app/widget/curvewidget/curveview.cpp
+++ b/app/widget/curvewidget/curveview.cpp
@@ -20,6 +20,7 @@
 
 #include "curveview.h"
 
+#include <QScrollBar>
 #include <QMouseEvent>
 #include <QtMath>
 
@@ -251,42 +252,22 @@ void CurveView::VerticalScaleChangedEvent(double scale)
 
 void CurveView::wheelEvent(QWheelEvent *event)
 {
-  if (WheelEventIsAZoomEvent(event)) {
-    if (!event->angleDelta().isNull()) {
-      bool only_vertical = false;
-      bool only_horizontal = false;
-
-      if (event->modifiers() & Qt::ShiftModifier) {
-        if (event->modifiers() & Qt::AltModifier) {
-          only_horizontal = true;
-        } else {
-          only_vertical = true;
-        }
-      }
-
-      if (event->angleDelta().x() + event->angleDelta().y() > 0) {
-        if (!only_vertical) {
-          emit ScaleChanged(GetScale() * 1.1);
-        }
-
-        if (!only_horizontal) {
-          SetYScale(GetYScale() * 1.1);
-        }
-      } else {
-        if (!only_vertical) {
-          emit ScaleChanged(GetScale() * 0.9);
-        }
-
-        if (!only_horizontal) {
-          SetYScale(GetYScale() *0.9);
-        }
-      }
-    }
-  } else {
+  if (!HandleZoomFromScroll(event)) {
     KeyframeViewBase::wheelEvent(event);
   }
 }
 
+void CurveView::ContextMenuEvent(Menu &m)
+{
+  m.addSeparator();
+
+  // View settings
+  QAction* zoom_fit_action = m.addAction(tr("Zoom to Fit"));
+  connect(zoom_fit_action, &QAction::triggered, this, &CurveView::ZoomToFit);
+
+  //QAction* reset_zoom_action = m.addAction(tr("Reset Zoom"));
+}
+
 QList<NodeKeyframe *> CurveView::GetKeyframesSortedByTime(int track)
 {
   QList<NodeKeyframe *> sorted;
@@ -320,7 +301,12 @@ QList<NodeKeyframe *> CurveView::GetKeyframesSortedByTime(int track)
 
 qreal CurveView::GetItemYFromKeyframeValue(NodeKeyframe *key)
 {
-  return -key->value().toDouble() * GetYScale();
+  return GetItemYFromKeyframeValue(key->value().toDouble());
+}
+
+qreal CurveView::GetItemYFromKeyframeValue(double value)
+{
+  return -value * GetYScale();
 }
 
 void CurveView::SetItemYFromKeyframeValue(NodeKeyframe *key, KeyframeViewItem *item)
@@ -402,6 +388,40 @@ void CurveView::BezierControlPointDestroyed()
   bezier_control_points_.removeOne(item);
 }
 
+void CurveView::ZoomToFit()
+{
+  if (item_map().isEmpty()) {
+    // Prevent scaling to DBL_MIN/DBL_MAX
+    return;
+  }
+
+  QMap<NodeKeyframe *, KeyframeViewItem *>::const_iterator i;
+
+  rational min_time = RATIONAL_MAX;
+  rational max_time = RATIONAL_MIN;
+
+  double min_val = DBL_MAX;
+  double max_val = DBL_MIN;
+
+  for (i=item_map().constBegin(); i!=item_map().constEnd(); i++) {
+    min_time = qMin(i.key()->time(), min_time);
+    max_time = qMax(i.key()->time(), max_time);
+
+    min_val = qMin(i.key()->value().toDouble(), min_val);
+    max_val = qMax(i.key()->value().toDouble(), max_val);
+  }
+
+  double time_range = max_time.toDouble() - min_time.toDouble();
+  double new_x_scale = CalculateScaleFromDimensions(this->width(), time_range);
+  double new_y_scale = CalculateScaleFromDimensions(this->height(), max_val - min_val);
+
+  emit ScaleChanged(new_x_scale);
+  SetYScale(new_y_scale);
+
+  horizontalScrollBar()->setValue(TimeToScene(min_time) - CalculatePaddingFromDimensionScale(this->width()));
+  verticalScrollBar()->setValue(GetItemYFromKeyframeValue(max_val) - CalculatePaddingFromDimensionScale(this->height()));
+}
+
 void CurveView::AddKeyframe(NodeKeyframePtr key)
 {
   KeyframeViewItem* item = AddKeyframeInternal(key);
diff --git a/app/widget/curvewidget/curveview.h b/app/widget/curvewidget/curveview.h
index 67c2e25c3..e051f4f04 100644
--- a/app/widget/curvewidget/curveview.h
+++ b/app/widget/curvewidget/curveview.h
@@ -30,6 +30,7 @@ OLIVE_NAMESPACE_ENTER
 
 class CurveView : public KeyframeViewBase
 {
+  Q_OBJECT
 public:
   CurveView(QWidget* parent = nullptr);
 
@@ -44,6 +45,8 @@ public:
 public slots:
   void AddKeyframe(NodeKeyframePtr key);
 
+  void ZoomToFit();
+
 protected:
   virtual void drawBackground(QPainter* painter, const QRectF& rect) override;
 
@@ -55,10 +58,13 @@ protected:
 
   virtual void wheelEvent(QWheelEvent* event) override;
 
+  virtual void ContextMenuEvent(Menu &m) override;
+
 private:
   QList<NodeKeyframe*> GetKeyframesSortedByTime(int track);
 
   qreal GetItemYFromKeyframeValue(NodeKeyframe* key);
+  qreal GetItemYFromKeyframeValue(double value);
 
   void SetItemYFromKeyframeValue(NodeKeyframe* key, KeyframeViewItem* item);
 
diff --git a/app/widget/curvewidget/curvewidget.cpp b/app/widget/curvewidget/curvewidget.cpp
index aa294deb2..da32088ec 100644
--- a/app/widget/curvewidget/curvewidget.cpp
+++ b/app/widget/curvewidget/curvewidget.cpp
@@ -169,6 +169,8 @@ void CurveWidget::SetInput(NodeInput *input)
   }
 
   UpdateInputLabel();
+
+  QMetaObject::invokeMethod(view_, "ZoomToFit", Qt::QueuedConnection);
 }
 
 const double &CurveWidget::GetVerticalScale()
diff --git a/app/widget/keyframeview/keyframeviewbase.cpp b/app/widget/keyframeview/keyframeviewbase.cpp
index e6c4ad480..c97a85372 100644
--- a/app/widget/keyframeview/keyframeviewbase.cpp
+++ b/app/widget/keyframeview/keyframeviewbase.cpp
@@ -35,8 +35,6 @@ OLIVE_NAMESPACE_ENTER
 KeyframeViewBase::KeyframeViewBase(QWidget *parent) :
   TimelineViewBase(parent),
   dragging_bezier_point_(nullptr),
-  y_axis_enabled_(false),
-  y_scale_(1.0),
   currently_autoselecting_(false)
 {
   SetDefaultDragMode(RubberBandDrag);
@@ -57,22 +55,6 @@ void KeyframeViewBase::Clear()
   item_map_.clear();
 }
 
-const double &KeyframeViewBase::GetYScale() const
-{
-  return y_scale_;
-}
-
-void KeyframeViewBase::SetYScale(const double &y_scale)
-{
-  y_scale_ = y_scale;
-
-  if (y_axis_enabled_) {
-    VerticalScaleChangedEvent(y_scale_);
-
-    viewport()->update();
-  }
-}
-
 void KeyframeViewBase::DeleteSelected()
 {
   QUndoCommand* command = new QUndoCommand();
@@ -194,7 +176,7 @@ void KeyframeViewBase::mouseMoveEvent(QMouseEvent *event)
 
           keypair.key->key()->set_time(node_time);
 
-          if (y_axis_enabled_) {
+          if (IsYAxisEnabled()) {
             keypair.key->key()->set_value(keypair.value - mouse_diff_scaled.y());
           }
 
@@ -257,7 +239,7 @@ void KeyframeViewBase::mouseReleaseEvent(QMouseEvent *event)
                                                 command);
 
             // Commit value if we're setting a value
-            if (y_axis_enabled_) {
+            if (IsYAxisEnabled()) {
               item->key()->set_value(keypair.value);
               new NodeParamSetKeyframeValueCommand(item->key(),
                                                    keypair.value - mouse_diff_scaled.y(),
@@ -288,10 +270,6 @@ void KeyframeViewBase::ScaleChangedEvent(const double &scale)
   }
 }
 
-void KeyframeViewBase::VerticalScaleChangedEvent(double)
-{
-}
-
 const QMap<NodeKeyframe *, KeyframeViewItem *> &KeyframeViewBase::item_map() const
 {
   return item_map_;
@@ -310,11 +288,6 @@ void KeyframeViewBase::TimeTargetChangedEvent(Node *target)
   }
 }
 
-void KeyframeViewBase::SetYAxisEnabled(bool e)
-{
-  y_axis_enabled_ = e;
-}
-
 void KeyframeViewBase::SetKeyframeTrackVisible(int track, bool visible)
 {
   if (!visible == hidden_tracks_.contains(track)) {
@@ -336,6 +309,11 @@ void KeyframeViewBase::SetKeyframeTrackVisible(int track, bool visible)
   }
 }
 
+void KeyframeViewBase::ContextMenuEvent(Menu& m)
+{
+  Q_UNUSED(m)
+}
+
 rational KeyframeViewBase::CalculateNewTimeFromScreen(const rational &old_time, double cursor_diff)
 {
   return rational::fromDouble(old_time.toDouble() + cursor_diff);
@@ -433,7 +411,7 @@ void KeyframeViewBase::ProcessBezierDrag(QPointF mouse_diff_scaled, bool include
 QPointF KeyframeViewBase::GetScaledCursorPos(const QPoint &cursor_pos)
 {
   return QPointF(static_cast<double>(cursor_pos.x()) / GetScale(),
-                 static_cast<double>(cursor_pos.y()) / y_scale_);
+                 static_cast<double>(cursor_pos.y()) / GetYScale());
 }
 
 void KeyframeViewBase::ShowContextMenu()
@@ -480,7 +458,11 @@ void KeyframeViewBase::ShowContextMenu()
         break;
       }
     }
+  }
 
+  ContextMenuEvent(m);
+
+  if (!items.isEmpty()) {
     m.addSeparator();
 
     QAction* properties_action = m.addAction(tr("P&roperties"));
@@ -532,7 +514,7 @@ void KeyframeViewBase::ShowKeyframePropertiesDialog()
 
 void KeyframeViewBase::AutoSelectKeyTimeNeighbors()
 {
-  if (currently_autoselecting_ || y_axis_enabled_) {
+  if (currently_autoselecting_ || IsYAxisEnabled()) {
     return;
   }
 
diff --git a/app/widget/keyframeview/keyframeviewbase.h b/app/widget/keyframeview/keyframeviewbase.h
index 705e845c6..743ef996f 100644
--- a/app/widget/keyframeview/keyframeviewbase.h
+++ b/app/widget/keyframeview/keyframeviewbase.h
@@ -23,9 +23,10 @@
 
 #include "keyframeviewitem.h"
 #include "node/keyframe.h"
-#include "widget/timetarget/timetarget.h"
 #include "widget/curvewidget/beziercontrolpointitem.h"
+#include "widget/menu/menu.h"
 #include "widget/timelinewidget/view/timelineviewbase.h"
+#include "widget/timetarget/timetarget.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -37,9 +38,6 @@ public:
 
   virtual void Clear();
 
-  const double& GetYScale() const;
-  void SetYScale(const double& y_scale);
-
   void DeleteSelected();
 
 public slots:
@@ -54,18 +52,16 @@ protected:
 
   virtual void ScaleChangedEvent(const double& scale) override;
 
-  virtual void VerticalScaleChangedEvent(double scale);
-
   const QMap<NodeKeyframe*, KeyframeViewItem*>& item_map() const;
 
   virtual void KeyframeAboutToBeRemoved(NodeKeyframe* key);
 
   virtual void TimeTargetChangedEvent(Node*) override;
 
-  void SetYAxisEnabled(bool e);
-
   void SetKeyframeTrackVisible(int track, bool visible);
 
+  virtual void ContextMenuEvent(Menu &m);
+
 private:
   rational CalculateNewTimeFromScreen(const rational& old_time, double cursor_diff);
 
@@ -96,10 +92,6 @@ private:
 
   QVector<KeyframeItemAndTime> selected_keys_;
 
-  bool y_axis_enabled_;
-
-  double y_scale_;
-
   bool currently_autoselecting_;
 
   QList<int> hidden_tracks_;
diff --git a/app/widget/nodeparamview/nodeparamview.cpp b/app/widget/nodeparamview/nodeparamview.cpp
index 03ce22f18..24f32e7d6 100644
--- a/app/widget/nodeparamview/nodeparamview.cpp
+++ b/app/widget/nodeparamview/nodeparamview.cpp
@@ -55,6 +55,8 @@ NodeParamView::NodeParamView(QWidget *parent) :
   // Set up scroll area layout
   param_layout_ = new QVBoxLayout(param_widget_area_);
   param_layout_->setSpacing(0);
+
+  // KeyframeView is offset by a ruler, so to stay synchronized with it, we should be too
   param_layout_->setContentsMargins(0, ruler()->height(), 0, 0);
 
   // Add a stretch to allow empty space at the bottom of the layout
@@ -162,6 +164,8 @@ void NodeParamView::SetNodes(QList<Node *> nodes)
       }
     }
 
+    UpdateItemTime(GetTimestamp());
+
     QMetaObject::invokeMethod(this, "PlaceKeyframesOnView", Qt::QueuedConnection);
   }
 }
diff --git a/app/widget/timebased/timebased.cpp b/app/widget/timebased/timebased.cpp
index b2e15b03b..5c83206c6 100644
--- a/app/widget/timebased/timebased.cpp
+++ b/app/widget/timebased/timebased.cpp
@@ -482,12 +482,12 @@ void TimeBasedWidget::ToggleShowAll()
       w = timeline_views_.first()->width();
     }
 
-    w = w / 10 * 9;
+
 
     toggle_show_all_old_scale_ = GetScale();
     toggle_show_all_old_scroll_ = scrollbar_->value();
 
-    SetScale(w / GetConnectedNode()->GetLength().toDouble());
+    SetScaleFromDimensions(w, GetConnectedNode()->GetLength().toDouble());
     scrollbar_->setValue(0);
 
     // Must explicitly do this because SetScale() will automatically set this to false
diff --git a/app/widget/timelinewidget/timelinescaledobject.cpp b/app/widget/timelinewidget/timelinescaledobject.cpp
index 979ecf048..d12a998f8 100644
--- a/app/widget/timelinewidget/timelinescaledobject.cpp
+++ b/app/widget/timelinewidget/timelinescaledobject.cpp
@@ -27,6 +27,8 @@
 
 OLIVE_NAMESPACE_ENTER
 
+const int TimelineScaledObject::kCalculateDimensionsPadding = 10;
+
 TimelineScaledObject::TimelineScaledObject() :
   scale_(1.0),
   min_scale_(0),
@@ -112,6 +114,21 @@ void TimelineScaledObject::SetScale(const double& scale)
   ScaleChangedEvent(scale_);
 }
 
+void TimelineScaledObject::SetScaleFromDimensions(double viewport_width, double content_width)
+{
+  SetScale(CalculateScaleFromDimensions(viewport_width, content_width));
+}
+
+double TimelineScaledObject::CalculateScaleFromDimensions(double viewport_sz, double content_sz)
+{
+  return static_cast<double>(viewport_sz / kCalculateDimensionsPadding * (kCalculateDimensionsPadding-1)) / static_cast<double>(content_sz);
+}
+
+double TimelineScaledObject::CalculatePaddingFromDimensionScale(double viewport_sz)
+{
+  return (viewport_sz / (kCalculateDimensionsPadding * 2));
+}
+
 TimelineScaledWidget::TimelineScaledWidget(QWidget *parent) :
   QWidget(parent)
 {
diff --git a/app/widget/timelinewidget/timelinescaledobject.h b/app/widget/timelinewidget/timelinescaledobject.h
index c55cff296..c4aec301c 100644
--- a/app/widget/timelinewidget/timelinescaledobject.h
+++ b/app/widget/timelinewidget/timelinescaledobject.h
@@ -44,6 +44,10 @@ public:
 
   void SetScale(const double& scale);
 
+  void SetScaleFromDimensions(double viewport_width, double content_width);
+  static double CalculateScaleFromDimensions(double viewport_sz, double content_sz);
+  static double CalculatePaddingFromDimensionScale(double viewport_sz);
+
 protected:
   double TimeToScene(const rational& time);
   rational SceneToTime(const double &x, bool round = false);
@@ -67,6 +71,8 @@ private:
 
   double max_scale_;
 
+  static const int kCalculateDimensionsPadding;
+
 };
 
 class TimelineScaledWidget : public QWidget, public TimelineScaledObject
diff --git a/app/widget/timelinewidget/view/timelineviewbase.cpp b/app/widget/timelinewidget/view/timelineviewbase.cpp
index c044f425e..a5acb99e1 100644
--- a/app/widget/timelinewidget/view/timelineviewbase.cpp
+++ b/app/widget/timelinewidget/view/timelineviewbase.cpp
@@ -40,7 +40,9 @@ TimelineViewBase::TimelineViewBase(QWidget *parent) :
   playhead_scene_right_(-1),
   dragging_playhead_(false),
   snapped_(false),
-  snap_service_(nullptr)
+  snap_service_(nullptr),
+  y_axis_enabled_(false),
+  y_scale_(1.0)
 {
   setScene(&scene_);
 
@@ -80,6 +82,26 @@ void TimelineViewBase::SetSnapService(SnapService *service)
   snap_service_ = service;
 }
 
+const double &TimelineViewBase::GetYScale() const
+{
+  return y_scale_;
+}
+
+void TimelineViewBase::VerticalScaleChangedEvent(double)
+{
+}
+
+void TimelineViewBase::SetYScale(const double &y_scale)
+{
+  y_scale_ = y_scale;
+
+  if (y_axis_enabled_) {
+    VerticalScaleChangedEvent(y_scale_);
+
+    viewport()->update();
+  }
+}
+
 void TimelineViewBase::SetTime(const int64_t time)
 {
   playhead_ = time;
@@ -252,10 +274,56 @@ bool TimelineViewBase::HandleZoomFromScroll(QWheelEvent *event)
   if (WheelEventIsAZoomEvent(event)) {
     // If CTRL is held (or a preference is set to swap CTRL behavior), we zoom instead of scrolling
     if (!event->angleDelta().isNull()) {
-      if (event->angleDelta().x() + event->angleDelta().y() > 0) {
-        emit ScaleChanged(GetScale() * 1.1);
+      bool only_vertical = false;
+      bool only_horizontal = false;
+
+      // Ctrl+Shift limits to only one axis
+      // Alt switches between horizontal only (alt held) or vertical only (alt not held)
+      if (y_axis_enabled_) {
+        if (event->modifiers() & Qt::ShiftModifier) {
+          if (event->modifiers() & Qt::AltModifier) {
+            only_horizontal = true;
+          } else {
+            only_vertical = true;
+          }
+        }
       } else {
-        emit ScaleChanged(GetScale() * 0.9);
+        only_horizontal = true;
+      }
+
+      double scale_multiplier;
+
+      if (event->angleDelta().x() + event->angleDelta().y() > 0) {
+        scale_multiplier = 1.1;
+      } else {
+        scale_multiplier = 0.9;
+      }
+
+      QPointF cursor_pos;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+      cursor_pos = event->position();
+#else
+      cursor_pos = event->posF();
+#endif
+
+      if (!only_vertical) {
+        double new_x_scale = GetScale() * scale_multiplier;
+
+        int new_x_scroll = qRound(horizontalScrollBar()->value() / GetScale() * new_x_scale + (cursor_pos.x() - cursor_pos.x() / new_x_scale * GetScale()));
+
+        emit ScaleChanged(new_x_scale);
+
+        horizontalScrollBar()->setValue(new_x_scroll);
+      }
+
+      if (!only_horizontal) {
+        double new_y_scale = GetYScale() * scale_multiplier;
+
+        int new_y_scroll = qRound(verticalScrollBar()->value() / GetYScale() * new_y_scale + (cursor_pos.y() - cursor_pos.y() / new_y_scale * GetYScale()));
+
+        SetYScale(new_y_scale);
+
+        verticalScrollBar()->setValue(new_y_scroll);
       }
     }
 
diff --git a/app/widget/timelinewidget/view/timelineviewbase.h b/app/widget/timelinewidget/view/timelineviewbase.h
index cb667dd41..d24af659e 100644
--- a/app/widget/timelinewidget/view/timelineviewbase.h
+++ b/app/widget/timelinewidget/view/timelineviewbase.h
@@ -48,6 +48,9 @@ public:
 
   void SetSnapService(SnapService* service);
 
+  const double& GetYScale() const;
+  void SetYScale(const double& y_scale);
+
 public slots:
   void SetTime(const int64_t time);
 
@@ -69,6 +72,8 @@ protected:
 
   virtual void SceneRectUpdateEvent(QRectF&){}
 
+  virtual void VerticalScaleChangedEvent(double scale);
+
   bool HandleZoomFromScroll(QWheelEvent* event);
 
   bool WheelEventIsAZoomEvent(QWheelEvent* event);
@@ -81,6 +86,16 @@ protected:
 
   virtual void TimebaseChangedEvent(const rational &) override;
 
+  bool IsYAxisEnabled() const
+  {
+    return y_axis_enabled_;
+  }
+
+  void SetYAxisEnabled(bool e)
+  {
+    y_axis_enabled_ = e;
+  }
+
 private:
   qreal GetPlayheadX();
 
@@ -102,6 +117,10 @@ private:
 
   SnapService* snap_service_;
 
+  bool y_axis_enabled_;
+
+  double y_scale_;
+
 private slots:
   /**
    * @brief Slot called whenever the view resizes or the scene contents change to enforce minimum scene sizes

From d31c373bd0e92e225e445c8059a823cb68bde846 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 24 Jun 2020 01:29:57 +1000
Subject: [PATCH 035/138] curveview: transform times to target for zoom fit

---
 app/widget/curvewidget/curveview.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/widget/curvewidget/curveview.cpp b/app/widget/curvewidget/curveview.cpp
index e5fc65cdd..c57072e88 100644
--- a/app/widget/curvewidget/curveview.cpp
+++ b/app/widget/curvewidget/curveview.cpp
@@ -404,8 +404,13 @@ void CurveView::ZoomToFit()
   double max_val = DBL_MIN;
 
   for (i=item_map().constBegin(); i!=item_map().constEnd(); i++) {
-    min_time = qMin(i.key()->time(), min_time);
-    max_time = qMax(i.key()->time(), max_time);
+    rational transformed_time = GetAdjustedTime(i.key()->parent()->parentNode(),
+                                                GetTimeTarget(),
+                                                i.key()->time(),
+                                                NodeParam::kOutput);
+
+    min_time = qMin(transformed_time, min_time);
+    max_time = qMax(transformed_time, max_time);
 
     min_val = qMin(i.key()->value().toDouble(), min_val);
     max_val = qMax(i.key()->value().toDouble(), max_val);

From b0a5d4f4c3fb8b891e0004aeb8770157e248cece Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 24 Jun 2020 01:36:04 +1000
Subject: [PATCH 036/138] parampanel: set input after timestamp

Default TimeBasedWidget behavior is to jump to the playhead, but we want
the CurveView to zoom fit on open instead. So we set the input after the
timestamp to make this behavior possible.
---
 app/panel/param/param.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/panel/param/param.cpp b/app/panel/param/param.cpp
index 1bd3355d7..e6731e9b0 100644
--- a/app/panel/param/param.cpp
+++ b/app/panel/param/param.cpp
@@ -88,9 +88,9 @@ void ParamPanel::CreateCurvePanel(NodeInput *input)
 
   panel = Core::instance()->main_window()->AppendCurvePanel();
 
-  panel->SetInput(input);
   panel->ConnectViewerNode(view->GetConnectedNode());
   panel->SetTimestamp(view->GetTimestamp());
+  panel->SetInput(input);
 
   connect(view, &NodeParamView::TimeChanged, this, &ParamPanel::ParamViewTimeChanged);
   connect(panel, &CurvePanel::TimeChanged, this, &ParamPanel::CurvePanelTimeChanged);

From e064d3798848c89c641a11114ccc5856eecca5aa Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 24 Jun 2020 02:14:51 +1000
Subject: [PATCH 037/138] mainwindow: check for connected items before saving

Fixes segfault when saving an empty project/a project with no sequence
open.
---
 app/window/mainwindow/mainwindow.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 38f364cb2..1c5f2b111 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -129,11 +129,15 @@ MainWindowLayoutInfo MainWindow::SaveLayout() const
   MainWindowLayoutInfo info;
 
   foreach (ProjectPanel* panel, folder_panels_) {
-    info.add_folder(static_cast<Folder*>(panel->get_root_index().internalPointer()));
+    if (panel->project()) {
+      info.add_folder(static_cast<Folder*>(panel->get_root_index().internalPointer()));
+    }
   }
 
   foreach (TimelinePanel* panel, timeline_panels_) {
-    info.add_sequence(static_cast<Sequence*>(panel->GetConnectedViewer()->parent()));
+    if (panel->GetConnectedViewer()) {
+      info.add_sequence(static_cast<Sequence*>(panel->GetConnectedViewer()->parent()));
+    }
   }
 
   info.set_state(saveState());

From 7523db099b623d104b7ba8a6ab658028c1ff2a8e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 26 Jun 2020 00:21:12 +1000
Subject: [PATCH 038/138] cmake: use improved FindOpenEXR module

---
 app/CMakeLists.txt      |   2 +-
 cmake/FindOpenEXR.cmake | 230 +++++++++++++++++++++++++---------------
 2 files changed, 144 insertions(+), 88 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 6050fabfe..03b8f6e23 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -125,7 +125,7 @@ target_include_directories(
   ${FFMPEG_INCLUDE_DIRS}
   ${OCIO_INCLUDE_DIRS}
   ${OIIO_INCLUDE_DIRS}
-  ${OPENEXR_INCLUDE_DIRS}
+  ${OPENEXR_INCLUDE_DIR}
 )
 
 # Set link libraries
diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
index b7ea7cbb8..86f1cd472 100644
--- a/cmake/FindOpenEXR.cmake
+++ b/cmake/FindOpenEXR.cmake
@@ -1,99 +1,155 @@
+# Module to find OpenEXR.
 #
-# Copyright 2016 Pixar
+# This module will set
+#   OPENEXR_FOUND          true, if found
+#   OPENEXR_INCLUDES       directory where headers are found
+#   OPENEXR_LIBRARIES      libraries for OpenEXR + IlmBase
+#   ILMBASE_LIBRARIES      libraries just IlmBase
+#   OPENEXR_VERSION        OpenEXR version (accurate for >= 2.0.0,
+#                              otherwise will just guess 1.6.1)
 #
-# Licensed under the Apache License, Version 2.0 (the "Apache License")
-# with the following modification; you may not use this file except in
-# compliance with the Apache License and the following modification to it:
-# Section 6. Trademarks. is deleted and replaced with:
-#
-# 6. Trademarks. This License does not grant permission to use the trade
-#    names, trademarks, service marks, or product names of the Licensor
-#    and its affiliates, except as required to comply with Section 4(c) of
-#    the License and to reproduce the content of the NOTICE file.
-#
-# You may obtain a copy of the Apache License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the Apache License with the above modification is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the Apache License for the specific
-# language governing permissions and limitations under the Apache License.
 #
 
-find_path(OPENEXR_INCLUDE_DIR
-    OpenEXR/half.h
-HINTS
-    "${OPENEXR_LOCATION}"
-    "$ENV{OPENEXR_LOCATION}"
-PATH_SUFFIXES
-    include/
-DOC
-    "OpenEXR headers path"
-)
+# Other standard issue macros
+include (FindPackageHandleStandardArgs)
+include (SelectLibraryConfigurations)
 
-if(OPENEXR_INCLUDE_DIR)
-  set(openexr_config_file "${OPENEXR_INCLUDE_DIR}/OpenEXR/OpenEXRConfig.h")
-  if(EXISTS ${openexr_config_file})
-      file(STRINGS
-           ${openexr_config_file}
-           TMP
-           REGEX "#define OPENEXR_VERSION_STRING.*$")
-      string(REGEX MATCHALL "[0-9.]+" OPENEXR_VERSION "${TMP}")
+find_package (ZLIB REQUIRED)
 
-      file(STRINGS
-           ${openexr_config_file}
-           TMP
-           REGEX "#define OPENEXR_VERSION_MAJOR.*$")
-      string(REGEX MATCHALL "[0-9]" OPENEXR_MAJOR_VERSION "${TMP}")
+# Link with pthreads if required
+find_package (Threads)
+if (CMAKE_USE_PTHREADS_INIT)
+    set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
+endif ()
 
-      file(STRINGS
-           ${openexr_config_file}
-           TMP
-           REGEX "#define OPENEXR_VERSION_MINOR.*$")
-      string(REGEX MATCHALL "[0-9]" OPENEXR_MINOR_VERSION "${TMP}")
-  endif()
-endif()
+# Attempt to find OpenEXR with pkgconfig
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+    if (NOT Ilmbase_ROOT AND NOT ILMBASE_ROOT
+        AND NOT DEFINED ENV{Ilmbase_ROOT} AND NOT DEFINED ENV{ILMBASE_ROOT})
+        pkg_check_modules(_ILMBASE QUIET IlmBase>=2.0.0)
+    endif ()
+    if (NOT OpenEXR_ROOT AND NOT OPENEXR_ROOT
+        AND NOT DEFINED ENV{OpenEXR_ROOT} AND NOT DEFINED ENV{OPENEXR_ROOT})
+        pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
+    endif ()
+endif (PKG_CONFIG_FOUND)
 
-foreach(OPENEXR_LIB
-    Half
-    Iex
-    Imath
-    IlmImf
-    IlmThread
+# List of likely places to find the headers -- note priority override of
+# ${OPENEXR_ROOT}/include.
+# ILMBASE is needed in case ilmbase an openexr are installed in separate
+# directories, like NixOS does
+set (GENERIC_INCLUDE_PATHS
+    ${OPENEXR_ROOT}/include
+    $ENV{OPENEXR_ROOT}/include
+    ${ILMBASE_ROOT}/include
+    $ENV{ILMBASE_ROOT}/include
+    ${_ILMBASE_INCLUDEDIR}
+    ${_OPENEXR_INCLUDEDIR}
+    /usr/local/include
+    /usr/include
+    /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
+    /sw/include
+    /opt/local/include )
+
+# Find the include file locations.
+find_path (ILMBASE_INCLUDE_PATH OpenEXR/IlmBaseConfig.h
+           HINTS ${ILMBASE_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}
+                 ${GENERIC_INCLUDE_PATHS} )
+find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h
+           HINTS ${OPENEXR_INCLUDE_DIR}
+                 ${GENERIC_INCLUDE_PATHS} )
+
+# Try to figure out version number
+if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
+    set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
+    string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
+    string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
+elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
+    # Must be at least 2.0
+    file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
+    string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
+    file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_MAJOR .*$")
+    string (REGEX MATCHALL "[0-9]+" OPENEXR_VERSION_MAJOR ${TMP})
+    file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_MINOR .*$")
+    string (REGEX MATCHALL "[0-9]+" OPENEXR_VERSION_MINOR ${TMP})
+else ()
+    # Assume an old one, predates 2.x that had versions
+    set (OPENEXR_VERSION 1.6.1)
+    set (OPENEXR_MAJOR 1)
+    set (OPENEXR_MINOR 6)
+endif ()
+
+
+# List of likely places to find the libraries -- note priority override of
+# ${OPENEXR_ROOT}/lib.
+set (GENERIC_LIBRARY_PATHS
+    ${OPENEXR_ROOT}/lib
+    ${ILMBASE_ROOT}/lib
+    ${OPENEXR_INCLUDE_PATH}/../lib
+    ${ILMBASE_INCLUDE_PATH}/../lib
+    ${_ILMBASE_LIBDIR}
+    ${_OPENEXR_LIBDIR}
+    /usr/local/lib
+    /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+    /usr/lib
+    /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+    /sw/lib
+    /opt/local/lib
+    $ENV{PROGRAM_FILES}/OpenEXR/lib/static )
+
+# message (STATUS "Generic lib paths: ${GENERIC_LIBRARY_PATHS}")
+
+# Handle request for static libs by altering CMAKE_FIND_LIBRARY_SUFFIXES.
+# We will restore it at the end of this file.
+set (_openexr_orig_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
+if (OpenEXR_USE_STATIC_LIBS)
+    if (WIN32)
+        set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
+    else ()
+        set (CMAKE_FIND_LIBRARY_SUFFIXES .a)
+    endif ()
+endif ()
+
+# Look for the libraries themselves, for all the components.
+# This is complicated because the OpenEXR libraries may or may not be
+# built with version numbers embedded.
+set (_openexr_components IlmThread IlmImf Imath Iex Half)
+foreach (COMPONENT ${_openexr_components})
+    string (TOUPPER ${COMPONENT} UPPERCOMPONENT)
+    # First try with the version embedded
+    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY
+                  NAMES ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}
+                        ${COMPONENT}
+                        ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d
+                        ${COMPONENT}_d
+                  HINTS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
+                        ${GENERIC_LIBRARY_PATHS} )
+endforeach ()
+
+find_package_handle_standard_args (OpenEXR
+    REQUIRED_VARS ILMBASE_INCLUDE_PATH OPENEXR_INCLUDE_PATH
+                  OPENEXR_IMATH_LIBRARY OPENEXR_ILMIMF_LIBRARY
+                  OPENEXR_IEX_LIBRARY OPENEXR_HALF_LIBRARY
+    VERSION_VAR   OPENEXR_VERSION
     )
 
-    # OpenEXR libraries may be suffixed with the version number, so we search
-    # using both versioned and unversioned names.
-    find_library(OPENEXR_${OPENEXR_LIB}_LIBRARY
-        NAMES
-            ${OPENEXR_LIB}-${OPENEXR_MAJOR_VERSION}_${OPENEXR_MINOR_VERSION}
-            ${OPENEXR_LIB}
-        HINTS
-            "${OPENEXR_LOCATION}"
-            "$ENV{OPENEXR_LOCATION}"
-        PATH_SUFFIXES
-            lib/
-        DOC
-            "OPENEXR's ${OPENEXR_LIB} library path"
-    )
+if (OPENEXR_FOUND)
+    set (ILMBASE_FOUND TRUE)
+    set (ILMBASE_INCLUDES ${ILMBASE_INCLUDE_PATH})
+    set (OPENEXR_INCLUDES ${OPENEXR_INCLUDE_PATH})
+    set (ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_PATH})
+    set (OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_PATH})
+    set (ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_PTHREADS} CACHE STRING "The libraries needed to use IlmBase")
+    set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${ILMBASE_LIBRARIES} ${ZLIB_LIBRARIES} CACHE STRING "The libraries needed to use OpenEXR")
+endif ()
 
-    if(OPENEXR_${OPENEXR_LIB}_LIBRARY)
-        list(APPEND OPENEXR_LIBRARIES ${OPENEXR_${OPENEXR_LIB}_LIBRARY})
-    endif()
-endforeach(OPENEXR_LIB)
-
-# So #include <half.h> works
-list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR})
-list(APPEND OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR}/OpenEXR)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OpenEXR
-    REQUIRED_VARS
-        OPENEXR_INCLUDE_DIRS
-        OPENEXR_LIBRARIES
-    VERSION_VAR
-        OPENEXR_VERSION
-)
+mark_as_advanced(
+    OPENEXR_ILMIMF_LIBRARY
+    OPENEXR_IMATH_LIBRARY
+    OPENEXR_IEX_LIBRARY
+    OPENEXR_HALF_LIBRARY
+    OPENEXR_VERSION)
 
+# Restore the original CMAKE_FIND_LIBRARY_SUFFIXES
+set (CMAKE_FIND_LIBRARY_SUFFIXES ${_openexr_orig_suffixes})

From c324de804c961986ce0f5d09070f5b483c1cbd5a Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 26 Jun 2020 00:21:34 +1000
Subject: [PATCH 039/138] audiomanager: create and delete future watchers when
 necessary

---
 app/audio/audiomanager.cpp | 38 +++++++++++++++++++++++++++++---------
 app/audio/audiomanager.h   |  4 ++--
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/app/audio/audiomanager.cpp b/app/audio/audiomanager.cpp
index 4a8ac8435..f5a1a866d 100644
--- a/app/audio/audiomanager.cpp
+++ b/app/audio/audiomanager.cpp
@@ -48,18 +48,31 @@ AudioManager *AudioManager::instance()
 
 void AudioManager::RefreshDevices()
 {
-  output_watcher_.setFuture(QtConcurrent::run(QAudioDeviceInfo::availableDevices, QAudio::AudioOutput));
-  input_watcher_.setFuture(QtConcurrent::run(QAudioDeviceInfo::availableDevices, QAudio::AudioInput));
+  if (!is_refreshing_outputs_) {
+    QFutureWatcher< QList<QAudioDeviceInfo> >* output_watcher = new QFutureWatcher< QList<QAudioDeviceInfo> >();
+    connect(output_watcher, &QFutureWatcher< QList<QAudioDeviceInfo> >::finished, this, &AudioManager::OutputDevicesRefreshed);
+    output_watcher->setFuture(QtConcurrent::run(QAudioDeviceInfo::availableDevices, QAudio::AudioOutput));
+
+    is_refreshing_outputs_ = true;
+  }
+
+  if (!is_refreshing_inputs_) {
+    QFutureWatcher< QList<QAudioDeviceInfo> >* input_watcher = new QFutureWatcher< QList<QAudioDeviceInfo> >();
+    connect(input_watcher, &QFutureWatcher< QList<QAudioDeviceInfo> >::finished, this, &AudioManager::InputDevicesRefreshed);
+    input_watcher->setFuture(QtConcurrent::run(QAudioDeviceInfo::availableDevices, QAudio::AudioInput));
+
+    is_refreshing_inputs_ = true;
+  }
 }
 
 bool AudioManager::IsRefreshingOutputs()
 {
-  return output_watcher_.isRunning();
+  return is_refreshing_outputs_;
 }
 
 bool AudioManager::IsRefreshingInputs()
 {
-  return input_watcher_.isRunning();
+  return is_refreshing_inputs_;
 }
 
 void AudioManager::PushToOutput(const QByteArray &samples)
@@ -200,6 +213,8 @@ void AudioManager::ReverseBuffer(char *buffer, int buffer_size, int sample_size)
 }
 
 AudioManager::AudioManager() :
+  is_refreshing_inputs_(false),
+  is_refreshing_outputs_(false),
   output_is_set_(false),
   input_(nullptr),
   input_file_(nullptr)
@@ -210,9 +225,6 @@ AudioManager::AudioManager() :
   output_manager_.moveToThread(&output_thread_);
 
   connect(&output_manager_, &AudioOutputManager::OutputNotified, this, &AudioManager::OutputNotified);
-
-  connect(&output_watcher_, &QFutureWatcher< QList<QAudioDeviceInfo> >::finished, this, &AudioManager::OutputDevicesRefreshed);
-  connect(&input_watcher_, &QFutureWatcher< QList<QAudioDeviceInfo> >::finished, this, &AudioManager::InputDevicesRefreshed);
 }
 
 AudioManager::~AudioManager()
@@ -224,7 +236,11 @@ AudioManager::~AudioManager()
 
 void AudioManager::OutputDevicesRefreshed()
 {
-  output_devices_ = output_watcher_.result();
+  QFutureWatcher< QList<QAudioDeviceInfo> >* watcher = static_cast<QFutureWatcher< QList<QAudioDeviceInfo> >*>(sender());
+
+  output_devices_ = watcher->result();
+  watcher->deleteLater();
+  is_refreshing_outputs_ = false;
 
   QString preferred_audio_output = Config::Current()["PreferredAudioOutput"].toString();
 
@@ -247,7 +263,11 @@ void AudioManager::OutputDevicesRefreshed()
 
 void AudioManager::InputDevicesRefreshed()
 {
-  input_devices_ = input_watcher_.result();
+  QFutureWatcher< QList<QAudioDeviceInfo> >* watcher = static_cast<QFutureWatcher< QList<QAudioDeviceInfo> >*>(sender());
+
+  input_devices_ = watcher->result();
+  watcher->deleteLater();
+  is_refreshing_inputs_ = false;
 
   QString preferred_audio_input = Config::Current()["PreferredAudioInput"].toString();
 
diff --git a/app/audio/audiomanager.h b/app/audio/audiomanager.h
index 07a5fb9a1..f0c6c7db0 100644
--- a/app/audio/audiomanager.h
+++ b/app/audio/audiomanager.h
@@ -102,8 +102,8 @@ private:
   QList<QAudioDeviceInfo> input_devices_;
   QList<QAudioDeviceInfo> output_devices_;
 
-  QFutureWatcher< QList<QAudioDeviceInfo> > input_watcher_;
-  QFutureWatcher< QList<QAudioDeviceInfo> > output_watcher_;
+  bool is_refreshing_inputs_;
+  bool is_refreshing_outputs_;
 
   static AudioManager* instance_;
 

From b04fa02ab4e3281548f092c67d32c9edd08618e6 Mon Sep 17 00:00:00 2001
From: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date: Wed, 1 Jul 2020 14:18:12 +0100
Subject: [PATCH 040/138] Explicitly include limits header to fix build issue
 on Linux.

---
 app/widget/curvewidget/curveview.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/widget/curvewidget/curveview.cpp b/app/widget/curvewidget/curveview.cpp
index c57072e88..9ab395c4c 100644
--- a/app/widget/curvewidget/curveview.cpp
+++ b/app/widget/curvewidget/curveview.cpp
@@ -23,6 +23,7 @@
 #include <QScrollBar>
 #include <QMouseEvent>
 #include <QtMath>
+#include <limits>
 
 #include "common/qtutils.h"
 
@@ -400,8 +401,8 @@ void CurveView::ZoomToFit()
   rational min_time = RATIONAL_MAX;
   rational max_time = RATIONAL_MIN;
 
-  double min_val = DBL_MAX;
-  double max_val = DBL_MIN;
+  double min_val = std::numeric_limits<double>::max();
+  double max_val = std::numeric_limits<double>::min();
 
   for (i=item_map().constBegin(); i!=item_map().constEnd(); i++) {
     rational transformed_time = GetAdjustedTime(i.key()->parent()->parentNode(),

From 098b40c98ea4777b487faad9ef07b151b764d363 Mon Sep 17 00:00:00 2001
From: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date: Thu, 2 Jul 2020 15:36:13 +0100
Subject: [PATCH 041/138] Use cfloat instead of limits

---
 app/widget/curvewidget/curveview.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/widget/curvewidget/curveview.cpp b/app/widget/curvewidget/curveview.cpp
index 9ab395c4c..e8b6884ef 100644
--- a/app/widget/curvewidget/curveview.cpp
+++ b/app/widget/curvewidget/curveview.cpp
@@ -23,7 +23,7 @@
 #include <QScrollBar>
 #include <QMouseEvent>
 #include <QtMath>
-#include <limits>
+#include <cfloat>
 
 #include "common/qtutils.h"
 
@@ -401,8 +401,8 @@ void CurveView::ZoomToFit()
   rational min_time = RATIONAL_MAX;
   rational max_time = RATIONAL_MIN;
 
-  double min_val = std::numeric_limits<double>::max();
-  double max_val = std::numeric_limits<double>::min();
+  double min_val = DBL_MAX;
+  double max_val = DBL_MIN;
 
   for (i=item_map().constBegin(); i!=item_map().constEnd(); i++) {
     rational transformed_time = GetAdjustedTime(i.key()->parent()->parentNode(),

From 936d0770777bcdf30abd86f6e3cdf975aee40a5d Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 6 Jul 2020 14:03:22 +1000
Subject: [PATCH 042/138] project: use relative filenames if absolute don't
 exist

---
 app/common/xmlutils.h                |  3 +++
 app/project/item/footage/footage.cpp | 22 ++++++++++++++++++++++
 app/project/project.cpp              | 11 +++++++++++
 3 files changed, 36 insertions(+)

diff --git a/app/common/xmlutils.h b/app/common/xmlutils.h
index d8c012559..ec406dbca 100644
--- a/app/common/xmlutils.h
+++ b/app/common/xmlutils.h
@@ -64,6 +64,9 @@ struct XMLNodeData {
   QList<BlockLink> block_links;
   QHash<quintptr, Item*> item_ptrs;
 
+  QString real_project_url;
+  QString saved_project_url;
+
 };
 
 void XMLConnectNodes(const XMLNodeData& xml_node_data, QUndoCommand* command = nullptr);
diff --git a/app/project/item/footage/footage.cpp b/app/project/item/footage/footage.cpp
index 4acb16569..d2e62f46e 100644
--- a/app/project/item/footage/footage.cpp
+++ b/app/project/item/footage/footage.cpp
@@ -21,6 +21,7 @@
 #include "footage.h"
 
 #include <QCoreApplication>
+#include <QDir>
 
 #include "codec/decoder.h"
 #include "common/xmlutils.h"
@@ -52,6 +53,27 @@ void Footage::Load(QXmlStreamReader *reader, XMLNodeData &xml_node_data, const Q
     }
   }
 
+  // Validate filename
+  if (!QFileInfo::exists(filename_)) {
+    // Absolute filename does not exist, use some heuristics to try relocating the file
+
+    if (xml_node_data.real_project_url != xml_node_data.saved_project_url) {
+      // Project path has changed, check if the file we're looking for is the same relative to the
+      // new project path
+      QDir saved_dir(QFileInfo(xml_node_data.saved_project_url).dir());
+      QDir true_dir(QFileInfo(xml_node_data.real_project_url).dir());
+
+      QString relative_filename = saved_dir.relativeFilePath(filename_);
+      QString transformed_abs_filename = true_dir.filePath(relative_filename);
+
+      if (QFileInfo::exists(transformed_abs_filename)) {
+        // Use this file instead
+        qInfo() << "Footage" << filename_ << "doesn't exist, using relative file" << transformed_abs_filename;
+        set_filename(transformed_abs_filename);
+      }
+    }
+  }
+
   Decoder::ProbeMedia(this, cancelled);
 
   while (XMLReadNextStartElement(reader)) {
diff --git a/app/project/project.cpp b/app/project/project.cpp
index 653202c02..5b14774d9 100644
--- a/app/project/project.cpp
+++ b/app/project/project.cpp
@@ -41,6 +41,9 @@ void Project::Load(QXmlStreamReader *reader, MainWindowLayoutInfo* layout, const
 {
   XMLNodeData xml_node_data;
 
+  // Set project filename (hacky)
+  xml_node_data.real_project_url = static_cast<QFile*>(reader->device())->fileName();
+
   while (XMLReadNextStartElement(reader)) {
     if (reader->name() == QStringLiteral("folder")) {
 
@@ -69,8 +72,16 @@ void Project::Load(QXmlStreamReader *reader, MainWindowLayoutInfo* layout, const
 
       *layout = MainWindowLayoutInfo::fromXml(reader, xml_node_data);
 
+    } else if (reader->name() == QStringLiteral("url")) {
+
+      // This should be read in before most other elements
+      xml_node_data.saved_project_url = reader->readElementText();
+
     } else {
+
+      // Skip this
       reader->skipCurrentElement();
+
     }
   }
 

From a45f514f683c5a911c87da53200fe128027f25e5 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 6 Jul 2020 14:22:17 +1000
Subject: [PATCH 043/138] renderer: share render backend for auto-cache tasks

Since auto-cache events start and stop fairly frequently (and are somewhat
heavy to create/destroy), we can save a lot of cycles over time by sharing
the same backend between them all.
---
 app/node/node.cpp                    | 19 +++++++++++
 app/node/node.h                      |  5 +++
 app/render/backend/renderbackend.cpp | 50 +++++++++++++++-------------
 app/render/backend/renderbackend.h   | 15 +++++++++
 app/task/cache/cache.cpp             | 24 +++++++++----
 app/task/cache/cache.h               |  3 ++
 app/task/render/render.cpp           | 47 ++++++++++++++++----------
 app/task/render/render.h             | 23 ++++++-------
 8 files changed, 128 insertions(+), 58 deletions(-)

diff --git a/app/node/node.cpp b/app/node/node.cpp
index 78613fa9b..840406ed8 100644
--- a/app/node/node.cpp
+++ b/app/node/node.cpp
@@ -537,6 +537,25 @@ bool Node::OutputsTo(const QString &id, bool recursively) const
   return false;
 }
 
+bool Node::OutputsTo(NodeInput *input, bool recursively) const
+{
+  QList<NodeOutput*> outputs = GetOutputs();
+
+  foreach (NodeOutput* output, outputs) {
+    foreach (NodeEdgePtr edge, output->edges()) {
+      NodeInput* connected = edge->input();
+
+      if (connected == input) {
+        return true;
+      } else if (recursively && connected->parentNode()->OutputsTo(input, recursively)) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
 bool Node::InputsFrom(Node *n, bool recursively) const
 {
   QList<NodeInput*> inputs = GetInputsIncludingArrays();
diff --git a/app/node/node.h b/app/node/node.h
index 91209581a..11a69704f 100644
--- a/app/node/node.h
+++ b/app/node/node.h
@@ -220,6 +220,11 @@ public:
    */
   bool OutputsTo(const QString& id, bool recursively) const;
 
+  /**
+   * @brief Same as OutputsTo(Node*), but for a specific node input rather than just a node.
+   */
+  bool OutputsTo(NodeInput* input, bool recursively) const;
+
   /**
    * @brief Returns whether this node ever receives an input from a particular node instance
    */
diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index b9f90e5e4..e62c94a57 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -195,27 +195,37 @@ std::list<TimeRange> RenderBackend::SplitRangeIntoChunks(const TimeRange &r)
 
 void RenderBackend::NodeGraphChanged(NodeInput *source)
 {
-  if (!graph_update_queue_.isEmpty()) {
-    // First, check if anything in our queue is a dependency of this input. If so, we should remove
-    // it and just update this input.
+  // We need to determine:
+  // - If we don't have this input, assume that it's coming soon and ignore it
+  // - If we do, is this input a child of another input we're already copying?
+  // - Or are any of the queued inputs children of this one?
 
-    // First we need to find our copy of the input being queued
-    Node* our_copy_node = copy_map_.value(source->parentNode());
+  // First we need to find our copy of the input being queued
+  Node* our_copy_node = copy_map_.value(source->parentNode());
 
-    if (our_copy_node) {
-      NodeInput* our_copy = our_copy_node->GetInputWithID(source->id());
-      QList<Node*> our_copy_deps = our_copy->GetDependencies(our_copy);
+  // If we don't have this node yet, assume it's coming in a later copy in which case it'll be
+  // copied then
+  if (!our_copy_node) {
+    // Assert that there are updates coming
+    Q_ASSERT(!graph_update_queue_.isEmpty());
+    return;
+  }
 
-      for (int i=0;i<graph_update_queue_.size();i++) {
-        NodeInput* check_input = graph_update_queue_.at(i);
-        Node* check_input_our_copy = copy_map_.value(check_input->parentNode());
+  // If we're here, we must have this node. Determine if we're already copying a "parent" of this
+  for (int i=0; i<graph_update_queue_.size(); i++) {
+    NodeInput* queued_input = graph_update_queue_.at(i);
 
-        // If this input isn't connected anymore, it obviously won't come up as a dependency
-        if (our_copy_deps.contains(check_input_our_copy)) {
-          graph_update_queue_.removeAt(i);
-          i--;
-        }
-      }
+    // Check if this dependency graph is already queued
+    if (source->parentNode()->OutputsTo(queued_input, true)) {
+      // In which case, no further copy is necessary
+      return;
+    }
+
+    // Check if this input supersedes an already queued input
+    if (queued_input->parentNode()->OutputsTo(source, true)) {
+      // In which case, we don't need to queue it and can queue our own
+      graph_update_queue_.removeAt(i);
+      i--;
     }
   }
 
@@ -329,15 +339,9 @@ void RenderBackend::RunNextJob()
 
 void RenderBackend::ProcessUpdateQueue()
 {
-  /*
   while (!graph_update_queue_.isEmpty()) {
     CopyNodeInputValue(graph_update_queue_.takeFirst());
   }
-  */
-
-  // FIXME: SLOW DEBUGGING CODE
-  CopyNodeInputValue(viewer_node_->texture_input());
-  CopyNodeInputValue(viewer_node_->samples_input());
 }
 
 QByteArray RenderBackend::HashNode(const Node *n, const VideoParams &params, const rational &time)
diff --git a/app/render/backend/renderbackend.h b/app/render/backend/renderbackend.h
index 8f9339691..59efca316 100644
--- a/app/render/backend/renderbackend.h
+++ b/app/render/backend/renderbackend.h
@@ -43,6 +43,11 @@ public:
 
   void Close();
 
+  ViewerOutput* GetViewerNode() const
+  {
+    return viewer_node_;
+  }
+
   void SetViewerNode(ViewerOutput* viewer_node);
 
   void SetUpdateWithGraph(bool e)
@@ -81,6 +86,16 @@ public:
    */
   RenderTicketPtr RenderAudio(const TimeRange& r);
 
+  const VideoParams& GetVideoParams() const
+  {
+    return video_params_;
+  }
+
+  const AudioParams& GetAudioParams() const
+  {
+    return audio_params_;
+  }
+
   void SetVideoParams(const VideoParams& params);
 
   void SetAudioParams(const AudioParams& params);
diff --git a/app/task/cache/cache.cpp b/app/task/cache/cache.cpp
index 563dec1b3..411a6d96a 100644
--- a/app/task/cache/cache.cpp
+++ b/app/task/cache/cache.cpp
@@ -27,16 +27,18 @@
 
 OLIVE_NAMESPACE_ENTER
 
+CacheTask::CacheTask(RenderBackend *backend, bool in_out_only) :
+  RenderTask(backend),
+  in_out_only_(in_out_only)
+{
+  Init();
+}
+
 CacheTask::CacheTask(ViewerOutput* viewer, const VideoParams& vparams, const AudioParams &aparams, bool in_out_only) :
   RenderTask(viewer, vparams, aparams),
   in_out_only_(in_out_only)
 {
-  SetTitle(tr("Caching \"%1\"").arg(viewer->media_name()));
-
-  backend()->EnablePreviewGeneration(job_time());
-
-  // Render fastest quality
-  backend()->SetRenderMode(RenderMode::kOffline);
+  Init();
 }
 
 bool CacheTask::Run()
@@ -83,4 +85,14 @@ void CacheTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples)
   }
 }
 
+void CacheTask::Init()
+{
+  SetTitle(tr("Caching \"%1\"").arg(viewer()->media_name()));
+
+  backend()->EnablePreviewGeneration(job_time());
+
+  // Render fastest quality
+  backend()->SetRenderMode(RenderMode::kOffline);
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/task/cache/cache.h b/app/task/cache/cache.h
index bab3cffc8..c17344713 100644
--- a/app/task/cache/cache.h
+++ b/app/task/cache/cache.h
@@ -31,6 +31,7 @@ class CacheTask : public RenderTask
 {
   Q_OBJECT
 public:
+  CacheTask(RenderBackend* backend, bool in_out_only);
   CacheTask(ViewerOutput* viewer,
             const VideoParams &vparams,
             const AudioParams &aparams,
@@ -46,6 +47,8 @@ protected:
   virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) override;
 
 private:
+  void Init();
+
   bool in_out_only_;
 
   QThreadPool download_threads_;
diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp
index f0da1ff54..76b54ea98 100644
--- a/app/task/render/render.cpp
+++ b/app/task/render/render.cpp
@@ -24,18 +24,31 @@
 
 OLIVE_NAMESPACE_ENTER
 
-RenderTask::RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams) :
-  viewer_(viewer),
-  video_params_(vparams),
-  audio_params_(aparams)
+RenderTask::RenderTask(RenderBackend *backend) :
+  backend_(backend)
 {
   job_time_ = QDateTime::currentMSecsSinceEpoch();
 
-  // FIXME: This makes a full copy of the node graph every time it starts, there must be a better
-  //        way.
-  backend_.SetViewerNode(viewer_);
-  backend_.SetVideoParams(video_params_);
-  backend_.SetAudioParams(audio_params_);
+  backend_is_ours_ = false;
+}
+
+RenderTask::RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams)
+{
+  job_time_ = QDateTime::currentMSecsSinceEpoch();
+
+  backend_ = new OpenGLBackend();
+  backend_->SetViewerNode(viewer);
+  backend_->SetVideoParams(vparams);
+  backend_->SetAudioParams(aparams);
+
+  backend_is_ours_ = true;
+}
+
+RenderTask::~RenderTask()
+{
+  if (backend_is_ours_) {
+    backend_->deleteLater();
+  }
 }
 
 struct TimeHashFuturePair {
@@ -68,11 +81,11 @@ void RenderTask::Render(const TimeRangeList& video_range,
                         const QMatrix4x4& mat,
                         bool use_disk_cache)
 {
-  backend_.SetVideoDownloadMatrix(mat);
+  backend_->SetVideoDownloadMatrix(mat);
 
   double progress_counter = 0;
   double total_length = 0;
-  double video_frame_sz = video_params_.time_base().toDouble();
+  double video_frame_sz = video_params().time_base().toDouble();
 
   std::list<TimeRange> audio_queue;
   std::list<RangeSampleFuturePair> audio_lookup_table;
@@ -93,11 +106,11 @@ void RenderTask::Render(const TimeRangeList& video_range,
   if (!video_range.isEmpty()) {
     QList<QByteArray> existing_hashes;
 
-    times = viewer_->video_frame_cache()->GetFrameListFromTimeRange(video_range);
+    times = viewer()->video_frame_cache()->GetFrameListFromTimeRange(video_range);
 
     total_length += video_frame_sz * times.size();
 
-    QFuture<QVector<QByteArray> > hash_future = backend_.Hash(times);
+    QFuture<QVector<QByteArray> > hash_future = backend_->Hash(times);
     hashes = hash_future.result();
 
     for (int i=0;i<times.size();i++) {
@@ -141,7 +154,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
 
           // If not, check if it's in the filesystem
           if (!hash_exists) {
-            hash_exists = QFileInfo::exists(viewer_->video_frame_cache()->CachePathName(p.hash));
+            hash_exists = QFileInfo::exists(viewer()->video_frame_cache()->CachePathName(p.hash));
 
             // If so, add it to the list so we don't have to check the filesystem again later
             if (hash_exists) {
@@ -159,7 +172,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
 
         // If no existing disk cache was found, queue it now
         if (!hash_exists) {
-          render_lookup_table.push_back({p.hash, backend_.RenderFrame(p.time)});
+          render_lookup_table.push_back({p.hash, backend_->RenderFrame(p.time)});
           running_hashes.push_back(p.hash);
         }
       }
@@ -169,7 +182,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
     }
 
     if (!IsCancelled() && !audio_queue.empty()) {
-      audio_lookup_table.push_back({audio_queue.front(), backend_.RenderAudio(audio_queue.front())});
+      audio_lookup_table.push_back({audio_queue.front(), backend_->RenderAudio(audio_queue.front())});
       audio_queue.pop_front();
     }
 
@@ -233,7 +246,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
   }
 
   // `Close` will block until all jobs are done making a safe deletion
-  backend_.Close();
+  backend_->Close();
 }
 
 void RenderTask::SetAnchorPoint(const rational &r)
diff --git a/app/task/render/render.h b/app/task/render/render.h
index 9f9dd49e2..978a45982 100644
--- a/app/task/render/render.h
+++ b/app/task/render/render.h
@@ -32,8 +32,11 @@ OLIVE_NAMESPACE_ENTER
 class RenderTask : public Task
 {
 public:
+  RenderTask(RenderBackend* backend);
   RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams);
 
+  virtual ~RenderTask() override;
+
 protected:
   void Render(const TimeRangeList &video_range,
               const TimeRangeList &audio_range,
@@ -48,17 +51,17 @@ protected:
 
   ViewerOutput* viewer() const
   {
-    return viewer_;
+    return backend_->GetViewerNode();
   }
 
   VideoParams video_params() const
   {
-    return video_params_;
+    return backend_->GetVideoParams();
   }
 
   AudioParams audio_params() const
   {
-    return audio_params_;
+    return backend_->GetAudioParams();
   }
 
   void SetAnchorPoint(const rational& r);
@@ -68,21 +71,17 @@ protected:
     return job_time_;
   }
 
-  OpenGLBackend* backend()
+  RenderBackend* backend()
   {
-    return &backend_;
+    return backend_;
   }
 
 private:
-  ViewerOutput* viewer_;
-
-  VideoParams video_params_;
-
-  AudioParams audio_params_;
-
   rational anchor_point_;
 
-  OpenGLBackend backend_;
+  RenderBackend* backend_;
+
+  bool backend_is_ours_;
 
   qint64 job_time_;
 

From 919314cce8058ffc52e0e027b9f4b779dd7b4136 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 7 Jul 2020 13:16:25 +1000
Subject: [PATCH 044/138] renderer: improve thread safety

Since we share render backends between the viewer and cache tasks now, we
should ensure the render backend is thread safe.
---
 app/render/backend/renderbackend.cpp |  4 ++--
 app/render/backend/renderbackend.h   |  4 ++--
 app/task/cache/cache.cpp             |  2 +-
 app/task/export/export.cpp           | 16 ++++++++--------
 app/task/render/render.cpp           |  9 ++++-----
 app/task/render/render.h             |  1 -
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index e62c94a57..87b68d78b 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -139,7 +139,7 @@ RenderTicketPtr RenderBackend::RenderFrame(const rational &time)
 
   render_queue_.push_back(ticket);
 
-  RunNextJob();
+  QMetaObject::invokeMethod(this, "RunNextJob", Qt::QueuedConnection);
 
   return ticket;
 }
@@ -155,7 +155,7 @@ RenderTicketPtr RenderBackend::RenderAudio(const TimeRange &r)
 
   render_queue_.push_back(ticket);
 
-  RunNextJob();
+  QMetaObject::invokeMethod(this, "RunNextJob", Qt::QueuedConnection);
 
   return ticket;
 }
diff --git a/app/render/backend/renderbackend.h b/app/render/backend/renderbackend.h
index 59efca316..c31632aef 100644
--- a/app/render/backend/renderbackend.h
+++ b/app/render/backend/renderbackend.h
@@ -115,8 +115,6 @@ private:
   Node *CopyNodeConnections(Node *src_node);
   void CopyNodeMakeConnection(NodeInput *src_input, NodeInput *dst_input);
 
-  void RunNextJob();
-
   ViewerOutput* viewer_node_;
 
   // VIDEO MEMBERS
@@ -150,6 +148,8 @@ private:
 private slots:
   void WorkerFinished();
 
+  void RunNextJob();
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/task/cache/cache.cpp b/app/task/cache/cache.cpp
index 411a6d96a..bae2f6ab9 100644
--- a/app/task/cache/cache.cpp
+++ b/app/task/cache/cache.cpp
@@ -57,7 +57,7 @@ bool CacheTask::Run()
     }
   }
 
-  Render(video_range, audio_range, QMatrix4x4(), true);
+  Render(video_range, audio_range, true);
 
   download_threads_.waitForDone();
 
diff --git a/app/task/export/export.cpp b/app/task/export/export.cpp
index 5cc667a9e..fbd7f905e 100644
--- a/app/task/export/export.cpp
+++ b/app/task/export/export.cpp
@@ -64,17 +64,17 @@ bool ExportTask::Run()
 
   frame_time_ = Timecode::time_to_timestamp(range.in(), viewer()->video_params().time_base());
 
-  QMatrix4x4 mat;
-
   if (params_.video_enabled()) {
 
     // If a transformation matrix is applied to this video, create it here
     if (params_.video_scaling_method() != ExportParams::kStretch) {
-      mat = ExportParams::GenerateMatrix(params_.video_scaling_method(),
-                                         viewer()->video_params().width(),
-                                         viewer()->video_params().height(),
-                                         params_.video_params().width(),
-                                         params_.video_params().height());
+      QMatrix4x4 mat = ExportParams::GenerateMatrix(params_.video_scaling_method(),
+                                                    viewer()->video_params().width(),
+                                                    viewer()->video_params().height(),
+                                                    params_.video_params().width(),
+                                                    params_.video_params().height());
+
+      backend()->SetVideoDownloadMatrix(mat);
     }
 
     // Create color processor
@@ -99,7 +99,7 @@ bool ExportTask::Run()
     audio_data_.SetLength(range.length());
   }
 
-  Render(video_range, audio_range, mat, false);
+  Render(video_range, audio_range, false);
 
   bool success = true;
 
diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp
index 76b54ea98..31da11f17 100644
--- a/app/task/render/render.cpp
+++ b/app/task/render/render.cpp
@@ -78,11 +78,8 @@ struct HashDownloadFuturePair {
 
 void RenderTask::Render(const TimeRangeList& video_range,
                         const TimeRangeList &audio_range,
-                        const QMatrix4x4& mat,
                         bool use_disk_cache)
 {
-  backend_->SetVideoDownloadMatrix(mat);
-
   double progress_counter = 0;
   double total_length = 0;
   double video_frame_sz = video_params().time_base().toDouble();
@@ -245,8 +242,10 @@ void RenderTask::Render(const TimeRangeList& video_range,
     }
   }
 
-  // `Close` will block until all jobs are done making a safe deletion
-  backend_->Close();
+  if (backend_is_ours_) {
+    // `Close` will block until all jobs are done making a safe deletion
+    backend_->Close();
+  }
 }
 
 void RenderTask::SetAnchorPoint(const rational &r)
diff --git a/app/task/render/render.h b/app/task/render/render.h
index 978a45982..77b655c24 100644
--- a/app/task/render/render.h
+++ b/app/task/render/render.h
@@ -40,7 +40,6 @@ public:
 protected:
   void Render(const TimeRangeList &video_range,
               const TimeRangeList &audio_range,
-              const QMatrix4x4 &mat,
               bool use_disk_cache);
 
   virtual QFuture<void> DownloadFrame(FramePtr frame, const QByteArray &hash) = 0;

From cb93b6bfa14cb3bea045dd0d0e6a5652f0f76e0a Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 7 Jul 2020 13:16:41 +1000
Subject: [PATCH 045/138] text: keep text confined within text-safe area

---
 app/node/generator/text/text.cpp | 33 +++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/node/generator/text/text.cpp b/app/node/generator/text/text.cpp
index 656aaa8ca..993086bcb 100644
--- a/app/node/generator/text/text.cpp
+++ b/app/node/generator/text/text.cpp
@@ -110,23 +110,34 @@ void TextGenerator::GenerateFrame(FramePtr frame, const GenerateJob& job) const
 
   QTextDocument text_doc;
   text_doc.setHtml(job.GetValue(text_input_).data().toString());
-  text_doc.setTextWidth(frame->video_params().width());
+
+  // Align to 80% width because that's considered the "title safe" area
+  int tenth_of_width = frame->video_params().width() / 10;
+  text_doc.setTextWidth(tenth_of_width * 8);
 
   // Draw rich text onto image
   QPainter p(&img);
   p.scale(1.0 / frame->video_params().divider(), 1.0 / frame->video_params().divider());
 
-  TextVerticalAlign valign = static_cast<TextVerticalAlign>(job.GetValue(valign_input_).data().toInt());
-  if (valign != kVerticalAlignTop) {
-    int doc_height = text_doc.size().height();
+  // Push 10% inwards to compensate for title safe area
+  p.translate(tenth_of_width, 0);
 
-    if (valign == kVerticalAlignCenter) {
-      // Center align
-      p.translate(0, frame->video_params().height() / 2 - doc_height / 2);
-    } else {
-      // Must be bottom align
-      p.translate(0, frame->video_params().height() - doc_height);
-    }
+  TextVerticalAlign valign = static_cast<TextVerticalAlign>(job.GetValue(valign_input_).data().toInt());
+  int doc_height = text_doc.size().height();
+
+  switch (valign) {
+  case kVerticalAlignTop:
+    // Push 10% inwards for title safe area
+    p.translate(0, frame->video_params().height() / 10);
+    break;
+  case kVerticalAlignCenter:
+    // Center align
+    p.translate(0, frame->video_params().height() / 2 - doc_height / 2);
+    break;
+  case kVerticalAlignBottom:
+    // Push 10% inwards for title safe area
+    p.translate(0, frame->video_params().height() - doc_height - frame->video_params().height() / 10);
+    break;
   }
 
   text_doc.drawContents(&p);

From a239fa0e2f3e15b3bb67c062ffca70d5390d37b0 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 7 Jul 2020 18:06:49 +1000
Subject: [PATCH 046/138] timeline: fixed some ripple tool behavior bugs

---
 app/widget/timelinewidget/tool/pointer.cpp | 114 +++++++++++----------
 app/widget/timelinewidget/tool/ripple.cpp  |  17 +--
 app/widget/timelinewidget/undo/undo.cpp    |  10 +-
 3 files changed, 77 insertions(+), 64 deletions(-)

diff --git a/app/widget/timelinewidget/tool/pointer.cpp b/app/widget/timelinewidget/tool/pointer.cpp
index e300daff8..76a2ae157 100644
--- a/app/widget/timelinewidget/tool/pointer.cpp
+++ b/app/widget/timelinewidget/tool/pointer.cpp
@@ -497,11 +497,6 @@ bool TimelineWidget::PointerTool::IsClipTrimmable(TimelineViewBlockItem* clip,
   return true;
 }
 
-rational GetEarliestPointForClip(Block* block)
-{
-  return qMax(rational(0), block->in() - block->media_in());
-}
-
 rational TimelineWidget::PointerTool::ValidateInTrimming(rational movement,
                                                          const QVector<TimelineViewGhostItem *> ghosts,
                                                          bool prevent_overwriting)
@@ -516,41 +511,43 @@ rational TimelineWidget::PointerTool::ValidateInTrimming(rational movement,
     rational earliest_in = RATIONAL_MIN;
     rational latest_in = ghost->Out();
 
-    if (block->type() == Block::kTransition) {
-      // For transitions, validate with the attached block
-      TransitionBlock* transition = static_cast<TransitionBlock*>(block);
-
-      if (transition->connected_in_block() && transition->connected_out_block()) {
-        // Here, we try to get the latest earliest point for both the in and out blocks, we do in here and out will
-        // be calculated later
-        earliest_in = GetEarliestPointForClip(transition->connected_in_block());
-
-        // We set the block to the out block since that will be before the in block and will be the one we use to
-        // prevent overwriting since we're trimming the in side of this transition
-        block = transition->connected_out_block();
-
-        latest_in = transition->in() + transition->out_offset();
-      } else {
-        // Use whatever block is attached
-        block = transition->connected_in_block() ? transition->connected_in_block() : transition->connected_out_block();
-      }
-    }
-
-    earliest_in = qMax(earliest_in, GetEarliestPointForClip(block));
-
     if (!ghost->CanHaveZeroLength()) {
       latest_in -= parent()->timebase();
     }
 
-    if (prevent_overwriting) {
-      // Look for a Block in the way
-      Block* prev = block->previous();
-      while (prev != nullptr) {
-        if (prev->type() == Block::kClip) {
-          earliest_in = qMax(earliest_in, prev->out());
-          break;
+    if (block) {
+      /* FIXME: Rewrite transition logic
+      if (block->type() == Block::kTransition) {
+        // For transitions, validate with the attached block
+        TransitionBlock* transition = static_cast<TransitionBlock*>(block);
+
+        if (transition->connected_in_block() && transition->connected_out_block()) {
+          // Here, we try to get the latest earliest point for both the in and out blocks, we do in here and out will
+          // be calculated later
+          earliest_in = GetEarliestPointForClip(transition->connected_in_block());
+
+          // We set the block to the out block since that will be before the in block and will be the one we use to
+          // prevent overwriting since we're trimming the in side of this transition
+          block = transition->connected_out_block();
+
+          latest_in = transition->in() + transition->out_offset();
+        } else {
+          // Use whatever block is attached
+          block = transition->connected_in_block() ? transition->connected_in_block() : transition->connected_out_block();
+        }
+      }
+      */
+
+      if (prevent_overwriting) {
+        // Look for a Block in the way
+        Block* prev = block->previous();
+        while (prev != nullptr) {
+          if (prev->type() == Block::kClip) {
+            earliest_in = qMax(earliest_in, prev->out());
+            break;
+          }
+          prev = prev->previous();
         }
-        prev = prev->previous();
       }
     }
 
@@ -586,33 +583,38 @@ rational TimelineWidget::PointerTool::ValidateOutTrimming(rational movement,
 
     rational latest_out = RATIONAL_MAX;
 
-    if (block->type() == Block::kTransition) {
-      // For transitions, validate with the attached block
-      TransitionBlock* transition = static_cast<TransitionBlock*>(block);
+    // Ripple tool creates block-less ghosts and creates gaps with them later
+    if (block) {
+      /* FIXME: Rewrite transition logic
+      if (block->type() == Block::kTransition) {
+        // For transitions, validate with the attached block
+        TransitionBlock* transition = static_cast<TransitionBlock*>(block);
 
-      if (transition->connected_in_block() && transition->connected_out_block()) {
-        // We set the block to the out block since that will be before the in block and will be the one we use to
-        // prevent overwriting since we're trimming the in side of this transition
+        if (transition->connected_in_block() && transition->connected_out_block()) {
+          // We set the block to the out block since that will be before the in block and will be the one we use to
+          // prevent overwriting since we're trimming the in side of this transition
 
-        // FIXME: At some point we may add some better logic to `latest_out` akin to the logic in ValidateInTrimming
-        //        which is why this hasn't yet been collapsed into the ternary below.
-        block = transition->connected_in_block();
+          // FIXME: At some point we may add some better logic to `latest_out` akin to the logic in ValidateInTrimming
+          //        which is why this hasn't yet been collapsed into the ternary below.
+          block = transition->connected_in_block();
 
-        earliest_out = transition->out() - transition->in_offset();
-      } else {
-        block = transition->connected_in_block() ? transition->connected_in_block() : transition->connected_out_block();
+          earliest_out = transition->out() - transition->in_offset();
+        } else {
+          block = transition->connected_in_block() ? transition->connected_in_block() : transition->connected_out_block();
+        }
       }
-    }
+      */
 
-    if (prevent_overwriting) {
-      // Determine if there's a block in the way
-      Block* next = block->next();
-      while (next != nullptr) {
-        if (next->type() == Block::kClip) {
-          latest_out = qMin(latest_out, next->in());
-          break;
+      if (prevent_overwriting) {
+        // Determine if there's a block in the way
+        Block* next = block->next();
+        while (next != nullptr) {
+          if (next->type() == Block::kClip) {
+            latest_out = qMin(latest_out, next->in());
+            break;
+          }
+          next = next->next();
         }
-        next = next->next();
       }
     }
 
diff --git a/app/widget/timelinewidget/tool/ripple.cpp b/app/widget/timelinewidget/tool/ripple.cpp
index ed441b5de..9fb88ff40 100644
--- a/app/widget/timelinewidget/tool/ripple.cpp
+++ b/app/widget/timelinewidget/tool/ripple.cpp
@@ -87,13 +87,18 @@ void TimelineWidget::RippleTool::InitiateDrag(TimelineViewBlockItem *clicked_ite
         if (block_before_ripple->type() == Block::kGap) {
           // If this Block is already a Gap, ghost it now
           ghost = AddGhostFromBlock(block_before_ripple, track_ref, trim_mode);
-        } else {
-          // If there's no gap here, we'll need to create one
-          ghost = AddGhostFromNull(block_before_ripple->out(), block_before_ripple->out(), track_ref, trim_mode);
-          ghost->setData(TimelineViewGhostItem::kReferenceBlock, Node::PtrToValue(block_before_ripple));
-        }
+        } else if (block_before_ripple->next()) {
+          // Assuming this block is NOT at the end of the track (i.e. next != null)
 
-        ghost->SetInvisible(true);
+          // We're going to create a gap after it. If next is a gap, we can just use that
+          if (block_before_ripple->next()->type() == Block::kGap) {
+            ghost = AddGhostFromBlock(block_before_ripple->next(), track_ref, trim_mode);
+          } else {
+            // If next is NOT a gap, we'll need to create one, for which we'll use a null ghost
+            ghost = AddGhostFromNull(block_before_ripple->out(), block_before_ripple->out(), track_ref, trim_mode);
+            ghost->setData(TimelineViewGhostItem::kReferenceBlock, Node::PtrToValue(block_before_ripple));
+          }
+        }
       }
     }
   }
diff --git a/app/widget/timelinewidget/undo/undo.cpp b/app/widget/timelinewidget/undo/undo.cpp
index 9c46b09ca..9b03b5bec 100644
--- a/app/widget/timelinewidget/undo/undo.cpp
+++ b/app/widget/timelinewidget/undo/undo.cpp
@@ -1398,8 +1398,12 @@ void TrackListRippleToolCommand::redo_internal()
       const RippleInfo& info = info_.at(i);
 
       if (info.block) {
-        new_latest_pt = qMax(new_latest_pt, info.block->out());
-      } else {
+        if (info.new_length > 0) {
+          new_latest_pt = qMax(new_latest_pt, info.block->out());
+        } else {
+          new_latest_pt = qMax(new_latest_pt, info.block->in());
+        }
+      } else if (info.new_length > 0) {
         new_latest_pt = qMax(new_latest_pt, working_data_.at(i).created_gap->out());
       }
     }
@@ -1427,6 +1431,8 @@ void TrackListRippleToolCommand::redo_internal()
 
 void TrackListRippleToolCommand::undo_internal()
 {
+  // FIXME: Add cache shift optimization
+
   // Clean created gaps
   for (int i=info_.size()-1; i>=0; i--) {
     const RippleInfo& info = info_.at(i);

From af69f157a3d73afd5048d6205e6da62eef594386 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 7 Jul 2020 18:43:18 +1000
Subject: [PATCH 047/138] timeline: improved beam tool and its derivatives

---
 app/widget/timelinewidget/timelinewidget.h      |  5 ++++-
 app/widget/timelinewidget/tool/add.cpp          | 12 ++----------
 app/widget/timelinewidget/tool/beam.cpp         | 15 ++++++++++++++-
 app/widget/timelinewidget/tool/razor.cpp        |  2 +-
 app/widget/timelinewidget/view/timelineview.cpp |  6 +++---
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h
index fad1da588..64bbbddb0 100644
--- a/app/widget/timelinewidget/timelinewidget.h
+++ b/app/widget/timelinewidget/timelinewidget.h
@@ -216,6 +216,9 @@ private:
 
     virtual void HoverMove(TimelineViewMouseEvent *event) override;
 
+  protected:
+    TimelineCoordinate ValidatedCoordinate(TimelineCoordinate coord);
+
   };
 
   class PointerTool : public Tool
@@ -415,7 +418,7 @@ private:
 
   };
 
-  class AddTool : public Tool
+  class AddTool : public BeamTool
   {
   public:
     AddTool(TimelineWidget* parent);
diff --git a/app/widget/timelinewidget/tool/add.cpp b/app/widget/timelinewidget/tool/add.cpp
index 8f1ae9c74..a7a34a1f7 100644
--- a/app/widget/timelinewidget/tool/add.cpp
+++ b/app/widget/timelinewidget/tool/add.cpp
@@ -27,7 +27,7 @@
 OLIVE_NAMESPACE_ENTER
 
 TimelineWidget::AddTool::AddTool(TimelineWidget *parent) :
-  Tool(parent),
+  BeamTool(parent),
   ghost_(nullptr)
 {
 }
@@ -63,15 +63,7 @@ void TimelineWidget::AddTool::MousePress(TimelineViewMouseEvent *event)
 
   if (add_type == Timeline::kTrackTypeNone
       || add_type == track.type()) {
-    drag_start_point_ = event->GetFrame();
-
-    if (Core::instance()->snapping()) {
-      rational movement;
-      parent()->SnapPoint({drag_start_point_}, &movement);
-      if (!movement.isNull()) {
-        drag_start_point_ += movement;
-      }
-    }
+    drag_start_point_ = ValidatedCoordinate(event->GetCoordinates(true)).GetFrame();
 
     ghost_ = new TimelineViewGhostItem();
     ghost_->SetIn(drag_start_point_);
diff --git a/app/widget/timelinewidget/tool/beam.cpp b/app/widget/timelinewidget/tool/beam.cpp
index a04d14b9e..e2fe1120e 100644
--- a/app/widget/timelinewidget/tool/beam.cpp
+++ b/app/widget/timelinewidget/tool/beam.cpp
@@ -29,7 +29,20 @@ TimelineWidget::BeamTool::BeamTool(TimelineWidget *parent) :
 
 void TimelineWidget::BeamTool::HoverMove(TimelineViewMouseEvent *event)
 {
-  parent()->SetViewBeamCursor(event->GetCoordinates(true));
+  parent()->SetViewBeamCursor(ValidatedCoordinate(event->GetCoordinates(true)));
+}
+
+TimelineCoordinate TimelineWidget::BeamTool::ValidatedCoordinate(TimelineCoordinate coord)
+{
+  if (Core::instance()->snapping()) {
+    rational movement;
+    parent()->SnapPoint({coord.GetFrame()}, &movement);
+    if (!movement.isNull()) {
+      coord.SetFrame(coord.GetFrame() + movement);
+    }
+  }
+
+  return coord;
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/timelinewidget/tool/razor.cpp b/app/widget/timelinewidget/tool/razor.cpp
index 298a36b3b..49177ce8a 100644
--- a/app/widget/timelinewidget/tool/razor.cpp
+++ b/app/widget/timelinewidget/tool/razor.cpp
@@ -37,7 +37,7 @@ void TimelineWidget::RazorTool::MousePress(TimelineViewMouseEvent *event)
 void TimelineWidget::RazorTool::MouseMove(TimelineViewMouseEvent *event)
 {
   if (!dragging_) {
-    drag_start_ = event->GetCoordinates(true);
+    drag_start_ = ValidatedCoordinate(event->GetCoordinates(true));
     dragging_ = true;
   }
 
diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp
index d3ae73c56..cf253104e 100644
--- a/app/widget/timelinewidget/view/timelineview.cpp
+++ b/app/widget/timelinewidget/view/timelineview.cpp
@@ -37,6 +37,7 @@ OLIVE_NAMESPACE_ENTER
 
 TimelineView::TimelineView(Qt::Alignment vertical_alignment, QWidget *parent) :
   TimelineViewBase(parent),
+  show_beam_cursor_(false),
   connected_track_list_(nullptr)
 {
   Q_ASSERT(vertical_alignment == Qt::AlignTop || vertical_alignment == Qt::AlignBottom);
@@ -426,9 +427,8 @@ void TimelineView::ConnectTrackList(TrackList *list)
 
 void TimelineView::SetBeamCursor(const TimelineCoordinate &coord)
 {
-  bool update_required = true;/*(coord.GetTrack().type() == connected_track_list_->type()
-                          || cursor_coord_.GetTrack().type() == connected_track_list_->type()
-                          || !show_beam_cursor_);*/
+  bool update_required = coord.GetTrack().type() == connected_track_list_->type()
+                          || cursor_coord_.GetTrack().type() == connected_track_list_->type();
 
   show_beam_cursor_ = true;
   cursor_coord_ = coord;

From 8e7543230418d1a3797c5499ce1eb590753c74e2 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 8 Jul 2020 19:19:32 +1000
Subject: [PATCH 048/138] project/timeline: save timeline tracklist state in
 project file

---
 app/panel/timeline/timeline.cpp               | 10 +++++++
 app/panel/timeline/timeline.h                 |  4 +++
 app/widget/timelinewidget/timelinewidget.cpp  | 20 ++++++++++----
 app/widget/timelinewidget/timelinewidget.h    |  6 +++++
 app/window/mainwindow/mainwindow.cpp          | 16 +++++++-----
 app/window/mainwindow/mainwindow.h            |  2 +-
 .../mainwindow/mainwindowlayoutinfo.cpp       | 26 ++++++++++++-------
 app/window/mainwindow/mainwindowlayoutinfo.h  | 11 +++++---
 8 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/app/panel/timeline/timeline.cpp b/app/panel/timeline/timeline.cpp
index 4b42ea3f7..7d6cd4c8d 100644
--- a/app/panel/timeline/timeline.cpp
+++ b/app/panel/timeline/timeline.cpp
@@ -46,6 +46,16 @@ void TimelinePanel::SplitAtPlayhead()
   static_cast<TimelineWidget*>(GetTimeBasedWidget())->SplitAtPlayhead();
 }
 
+QByteArray TimelinePanel::SaveSplitterState() const
+{
+  return static_cast<TimelineWidget*>(GetTimeBasedWidget())->SaveSplitterState();
+}
+
+void TimelinePanel::RestoreSplitterState(const QByteArray &state)
+{
+  static_cast<TimelineWidget*>(GetTimeBasedWidget())->RestoreSplitterState(state);
+}
+
 void TimelinePanel::SelectAll()
 {
   static_cast<TimelineWidget*>(GetTimeBasedWidget())->SelectAll();
diff --git a/app/panel/timeline/timeline.h b/app/panel/timeline/timeline.h
index bafc9b0d1..cf09322cb 100644
--- a/app/panel/timeline/timeline.h
+++ b/app/panel/timeline/timeline.h
@@ -39,6 +39,10 @@ public:
 
   void SplitAtPlayhead();
 
+  QByteArray SaveSplitterState() const;
+
+  void RestoreSplitterState(const QByteArray& state);
+
   virtual void SelectAll() override;
 
   virtual void DeselectAll() override;
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index 504293a75..e8ac028bd 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -63,9 +63,9 @@ TimelineWidget::TimelineWidget(QWidget *parent) :
 
   // Create list of TimelineViews - these MUST correspond to the ViewType enum
 
-  QSplitter* view_splitter = new QSplitter(Qt::Vertical);
-  view_splitter->setChildrenCollapsible(false);
-  vert_layout->addWidget(view_splitter);
+  view_splitter_ = new QSplitter(Qt::Vertical);
+  view_splitter_->setChildrenCollapsible(false);
+  vert_layout->addWidget(view_splitter_);
 
   // Video view
   views_.append(new TimelineAndTrackView(Qt::AlignBottom));
@@ -109,7 +109,7 @@ TimelineWidget::TimelineWidget(QWidget *parent) :
     view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     view->SetSnapService(this);
 
-    view_splitter->addWidget(tview);
+    view_splitter_->addWidget(tview);
 
     ConnectTimelineView(view);
 
@@ -144,7 +144,7 @@ TimelineWidget::TimelineWidget(QWidget *parent) :
   }
 
   // Split viewer 50/50
-  view_splitter->setSizes({INT_MAX, INT_MAX});
+  view_splitter_->setSizes({INT_MAX, INT_MAX});
 
   // FIXME: Magic number
   SetScale(90.0);
@@ -1415,6 +1415,16 @@ void TimelineWidget::HideSnaps()
   }
 }
 
+QByteArray TimelineWidget::SaveSplitterState() const
+{
+  return view_splitter_->saveState();
+}
+
+void TimelineWidget::RestoreSplitterState(const QByteArray &state)
+{
+  view_splitter_->restoreState(state);
+}
+
 void TimelineWidget::StartRubberBandSelect(bool enable_selecting, bool select_links)
 {
   drag_origin_ = QCursor::pos();
diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h
index 64bbbddb0..fbd76a47f 100644
--- a/app/widget/timelinewidget/timelinewidget.h
+++ b/app/widget/timelinewidget/timelinewidget.h
@@ -98,6 +98,10 @@ public:
 
   virtual void HideSnaps() override;
 
+  QByteArray SaveSplitterState() const;
+
+  void RestoreSplitterState(const QByteArray& state);
+
 signals:
   void SelectionChanged(const QList<Block*>& selected_blocks);
 
@@ -501,6 +505,8 @@ private:
 
   bool use_audio_time_units_;
 
+  QSplitter* view_splitter_;
+
   int GetTrackY(const TrackReference& ref);
   int GetTrackHeight(const TrackReference& ref);
 
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 1c5f2b111..c34ee5764 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -117,8 +117,9 @@ void MainWindow::LoadLayout(const MainWindowLayoutInfo &info)
     FolderOpen(folder->project(), folder, true);
   }
 
-  foreach (Sequence* sequence, info.open_sequences()) {
-    OpenSequence(sequence, info.open_sequences().size() == 1);
+  foreach (const MainWindowLayoutInfo::OpenSequence& sequence, info.open_sequences()) {
+    TimelinePanel* panel = OpenSequence(sequence.sequence, info.open_sequences().size() == 1);
+    panel->RestoreSplitterState(sequence.panel_state);
   }
 
   restoreState(info.state());
@@ -136,7 +137,8 @@ MainWindowLayoutInfo MainWindow::SaveLayout() const
 
   foreach (TimelinePanel* panel, timeline_panels_) {
     if (panel->GetConnectedViewer()) {
-      info.add_sequence(static_cast<Sequence*>(panel->GetConnectedViewer()->parent()));
+      info.add_sequence({static_cast<Sequence*>(panel->GetConnectedViewer()->parent()),
+                         panel->SaveSplitterState()});
     }
   }
 
@@ -145,13 +147,13 @@ MainWindowLayoutInfo MainWindow::SaveLayout() const
   return info;
 }
 
-void MainWindow::OpenSequence(Sequence *sequence, bool enable_focus)
+TimelinePanel* MainWindow::OpenSequence(Sequence *sequence, bool enable_focus)
 {
   // See if this sequence is already open, and switch to it if so
   foreach (TimelinePanel* tl, timeline_panels_) {
     if (tl->GetConnectedViewer() == sequence->viewer_output()) {
       tl->raise();
-      return;
+      return tl;
     }
   }
 
@@ -170,6 +172,8 @@ void MainWindow::OpenSequence(Sequence *sequence, bool enable_focus)
   if (enable_focus) {
     TimelineFocused(sequence->viewer_output());
   }
+
+  return panel;
 }
 
 void MainWindow::CloseSequence(Sequence *sequence)
@@ -354,7 +358,7 @@ void MainWindow::SetApplicationProgressStatus(ProgressStatus status)
       taskbar_interface_->SetProgressState(reinterpret_cast<HWND>(this->winId()), TBPF_NORMAL);
       break;
     case kProgressNone:
-      taskbar_interface_->SetProgressState(reinterpret_cast<HWND>(this->winId()), TBPF_NOPROGRESS);
+      taskbar_interface_->SetProgressState(reinterpret_ cast<HWND>(this->winId()), TBPF_NOPROGRESS);
       break;
     case kProgressError:
       taskbar_interface_->SetProgressState(reinterpret_cast<HWND>(this->winId()), TBPF_ERROR);
diff --git a/app/window/mainwindow/mainwindow.h b/app/window/mainwindow/mainwindow.h
index f06b8c0fe..923a8f1b6 100644
--- a/app/window/mainwindow/mainwindow.h
+++ b/app/window/mainwindow/mainwindow.h
@@ -60,7 +60,7 @@ public:
 
   MainWindowLayoutInfo SaveLayout() const;
 
-  void OpenSequence(Sequence* sequence, bool enable_focus = true);
+  TimelinePanel *OpenSequence(Sequence* sequence, bool enable_focus = true);
 
   void CloseSequence(Sequence* sequence);
 
diff --git a/app/window/mainwindow/mainwindowlayoutinfo.cpp b/app/window/mainwindow/mainwindowlayoutinfo.cpp
index 168978f79..0b75a957f 100644
--- a/app/window/mainwindow/mainwindowlayoutinfo.cpp
+++ b/app/window/mainwindow/mainwindowlayoutinfo.cpp
@@ -17,9 +17,12 @@ void MainWindowLayoutInfo::toXml(QXmlStreamWriter *writer) const
 
   writer->writeStartElement(QStringLiteral("timeline"));
 
-  foreach (Sequence* sequence, open_sequences_) {
+  foreach (const OpenSequence& sequence, open_sequences_) {
     writer->writeTextElement(QStringLiteral("sequence"),
-                             QString::number(reinterpret_cast<quintptr>(sequence)));
+                             QString::number(reinterpret_cast<quintptr>(sequence.sequence)));
+
+    writer->writeTextElement(QStringLiteral("state"),
+                             QString(sequence.panel_state.toBase64()));
   }
 
   writer->writeEndElement(); // timeline
@@ -52,20 +55,25 @@ MainWindowLayoutInfo MainWindowLayoutInfo::fromXml(QXmlStreamReader *reader, XML
 
     } else if (reader->name() == QStringLiteral("timeline")) {
 
+      Sequence* open_seq = nullptr;
+      QByteArray tl_state;
+
       while (XMLReadNextStartElement(reader)) {
         if (reader->name() == QStringLiteral("sequence")) {
           quintptr item_id = reader->readElementText().toULongLong();
 
-          Sequence* open_seq = dynamic_cast<Sequence*>(xml_data.item_ptrs.value(item_id));
-
-          if (open_seq) {
-            info.open_sequences_.append(open_seq);
-          }
+          open_seq = dynamic_cast<Sequence*>(xml_data.item_ptrs.value(item_id));
+        } else if (reader->name() == QStringLiteral("state")) {
+          tl_state = QByteArray::fromBase64(reader->readElementText().toUtf8());
         } else {
           reader->skipCurrentElement();
         }
       }
 
+      if (open_seq) {
+        info.open_sequences_.append({open_seq, tl_state});
+      }
+
     } else if (reader->name() == QStringLiteral("state")) {
 
       info.state_ = QByteArray::fromBase64(reader->readElementText().toLatin1());
@@ -83,9 +91,9 @@ void MainWindowLayoutInfo::add_folder(olive::Folder *f)
   open_folders_.append(f);
 }
 
-void MainWindowLayoutInfo::add_sequence(Sequence *s)
+void MainWindowLayoutInfo::add_sequence(const OpenSequence &seq)
 {
-  open_sequences_.append(s);
+  open_sequences_.append(seq);
 }
 
 void MainWindowLayoutInfo::set_state(const QByteArray &layout)
diff --git a/app/window/mainwindow/mainwindowlayoutinfo.h b/app/window/mainwindow/mainwindowlayoutinfo.h
index 5f76cbc2b..59f357935 100644
--- a/app/window/mainwindow/mainwindowlayoutinfo.h
+++ b/app/window/mainwindow/mainwindowlayoutinfo.h
@@ -17,7 +17,12 @@ public:
 
   void add_folder(Folder* f);
 
-  void add_sequence(Sequence* s);
+  struct OpenSequence {
+    Sequence* sequence;
+    QByteArray panel_state;
+  };
+
+  void add_sequence(const OpenSequence& seq);
 
   void set_state(const QByteArray& layout);
 
@@ -26,7 +31,7 @@ public:
     return open_folders_;
   }
 
-  const QList<Sequence*>& open_sequences() const
+  const QList<OpenSequence>& open_sequences() const
   {
     return open_sequences_;
   }
@@ -41,7 +46,7 @@ private:
 
   QList<Folder*> open_folders_;
 
-  QList<Sequence*> open_sequences_;
+  QList<OpenSequence> open_sequences_;
 
 };
 

From a4acf5f99e897bdc40fc022b3815fccc40280c35 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 02:39:09 +1000
Subject: [PATCH 049/138] nodes: hash strings as their value rather than the
 struct

Erroneously hashed strings incorrectly so the actual string contents
weren't what was being hashed.
---
 app/node/param.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/node/param.cpp b/app/node/param.cpp
index ec1eb8b65..b5604c413 100644
--- a/app/node/param.cpp
+++ b/app/node/param.cpp
@@ -243,10 +243,10 @@ QByteArray NodeParam::ValueToBytes(const NodeParam::DataType &type, const QVaria
   case kInt: return ValueToBytesInternal<int>(value);
   case kFloat: return ValueToBytesInternal<float>(value);
   case kColor: return ValueToBytesInternal<Color>(value);
-  case kText: return ValueToBytesInternal<QString>(value);
+  case kText: return value.toString().toUtf8();
   case kBoolean: return ValueToBytesInternal<bool>(value);
-  case kFont: return ValueToBytesInternal<QString>(value); // FIXME: This should probably be a QFont?
-  case kFile: return ValueToBytesInternal<QString>(value);
+  case kFont: return value.toString().toUtf8();
+  case kFile: return value.toString().toUtf8();
   case kMatrix: return ValueToBytesInternal<QMatrix4x4>(value);
   case kRational: return ValueToBytesInternal<rational>(value);
   case kVec2: return ValueToBytesInternal<QVector2D>(value);

From 8e1be4a3ff7758c4c4c1d8068be11e55a6fb0500 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 02:40:09 +1000
Subject: [PATCH 050/138] nodeparamviewwidgetbridge: implemented editing font
 parameters

---
 app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
index 4e4fabba3..9950864d7 100644
--- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
+++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
@@ -163,6 +163,7 @@ void NodeParamViewWidgetBridge::CreateWidgets()
     {
       QFontComboBox* font_combobox = new QFontComboBox();
       widgets_.append(font_combobox);
+      connect(font_combobox, &QFontComboBox::currentFontChanged, this, &NodeParamViewWidgetBridge::WidgetCallback);
       break;
     }
     case NodeParam::kFootage:
@@ -350,7 +351,7 @@ void NodeParamViewWidgetBridge::WidgetCallback()
   case NodeParam::kFont:
   {
     // Widget is a QFontComboBox
-    SetInputValue(static_cast<QFontComboBox*>(sender())->currentFont(), 0);
+    SetInputValue(static_cast<QFontComboBox*>(sender())->currentFont().family(), 0);
     break;
   }
   case NodeParam::kFootage:
@@ -459,7 +460,7 @@ void NodeParamViewWidgetBridge::UpdateWidgetValues()
   case NodeParam::kText:
   {
     NodeParamViewRichText* e = static_cast<NodeParamViewRichText*>(widgets_.first());
-    e->setText(input_->get_value_at_time(node_time).toString());
+    e->setTextPreservingCursor(input_->get_value_at_time(node_time).toString());
     break;
   }
   case NodeParam::kBoolean:
@@ -467,7 +468,10 @@ void NodeParamViewWidgetBridge::UpdateWidgetValues()
     break;
   case NodeParam::kFont:
   {
-    // FIXME: Implement this
+    QFontComboBox* fc = static_cast<QFontComboBox*>(widgets_.first());
+    fc->blockSignals(true);
+    fc->setCurrentFont(input_->get_value_at_time(node_time).toString());
+    fc->blockSignals(false);
     break;
   }
   case NodeParam::kCombo:

From 0b4a9f4650fe28e1a909bc0abe93ad48d913ce8d Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 02:40:23 +1000
Subject: [PATCH 051/138] timeline: fixed bug that caused I-beam to render
 incorrectly

---
 app/widget/timelinewidget/view/timelineview.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp
index cf253104e..b55ec6cba 100644
--- a/app/widget/timelinewidget/view/timelineview.cpp
+++ b/app/widget/timelinewidget/view/timelineview.cpp
@@ -250,17 +250,17 @@ void TimelineView::drawForeground(QPainter *painter, const QRectF &rect)
 
   if (show_beam_cursor_
       && connected_track_list_
-      && cursor_coord_.GetTrack().type() == connected_track_list_->type()
-      && cursor_coord_.GetTrack().index() < connected_track_list_->GetTrackCount()) {
+      && cursor_coord_.GetTrack().type() == connected_track_list_->type()) {
     painter->setPen(Qt::gray);
 
     double cursor_x = TimeToScene(cursor_coord_.GetFrame());
     int track_index = cursor_coord_.GetTrack().index();
+    int track_y = GetTrackY(track_index);
 
     painter->drawLine(cursor_x,
-                      GetTrackY(track_index),
+                      track_y,
                       cursor_x,
-                      GetTrackHeight(track_index));
+                      track_y + GetTrackHeight(track_index));
   }
 }
 

From 911b6c2887533265c376cd55b6f4b730a7f90723 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 02:40:52 +1000
Subject: [PATCH 052/138] textnode: added parameters for default font and font
 size

Allows text node to be used without having to write HTML (but allows
the option for HTML still).
---
 app/node/generator/text/text.cpp | 28 +++++++++++++++++++++++++---
 app/node/generator/text/text.h   |  4 ++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/node/generator/text/text.cpp b/app/node/generator/text/text.cpp
index 993086bcb..de38f08bd 100644
--- a/app/node/generator/text/text.cpp
+++ b/app/node/generator/text/text.cpp
@@ -32,11 +32,9 @@ enum TextVerticalAlign {
 
 TextGenerator::TextGenerator()
 {
-  QString default_str = QStringLiteral("<html><div style='font-size:144pt; text-align: center;'>%1</div></html>").arg(tr("Sample Text"));
-
   text_input_ = new NodeInput(QStringLiteral("text_in"),
                               NodeParam::kText,
-                              default_str);
+                              tr("Sample Text"));
   AddInput(text_input_);
 
   color_input_ = new NodeInput(QStringLiteral("color_in"),
@@ -48,6 +46,15 @@ TextGenerator::TextGenerator()
                                 NodeParam::kCombo,
                                 1);
   AddInput(valign_input_);
+
+  font_input_ = new NodeInput(QStringLiteral("font_in"),
+                              NodeParam::kFont);
+  AddInput(font_input_);
+
+  font_size_input_ = new NodeInput(QStringLiteral("font_size_in"),
+                                   NodeParam::kFloat,
+                                   72.0f);
+  AddInput(font_size_input_);
 }
 
 Node *TextGenerator::copy() const
@@ -78,7 +85,10 @@ QString TextGenerator::Description() const
 void TextGenerator::Retranslate()
 {
   text_input_->set_name(tr("Text"));
+  font_input_->set_name(tr("Font"));
+  font_size_input_->set_name(tr("Font Size"));
   color_input_->set_name(tr("Color"));
+  valign_input_->set_name(tr("Vertical Align"));
   valign_input_->set_combobox_strings({tr("Top"), tr("Center"), tr("Bottom")});
 }
 
@@ -88,6 +98,8 @@ NodeValueTable TextGenerator::Value(NodeValueDatabase &value) const
   job.InsertValue(text_input_, value);
   job.InsertValue(color_input_, value);
   job.InsertValue(valign_input_, value);
+  job.InsertValue(font_input_, value);
+  job.InsertValue(font_size_input_, value);
   job.SetAlphaChannelRequired(true);
 
   NodeValueTable table = value.Merge();
@@ -109,6 +121,16 @@ void TextGenerator::GenerateFrame(FramePtr frame, const GenerateJob& job) const
   img.fill(0);
 
   QTextDocument text_doc;
+
+  // Set default font
+  QFont default_font;
+  default_font.setFamily(job.GetValue(font_input_).data().toString());
+  default_font.setPointSizeF(job.GetValue(font_size_input_).data().toFloat());
+  text_doc.setDefaultFont(default_font);
+
+  // Center by default
+  text_doc.setDefaultTextOption(QTextOption(Qt::AlignCenter));
+
   text_doc.setHtml(job.GetValue(text_input_).data().toString());
 
   // Align to 80% width because that's considered the "title safe" area
diff --git a/app/node/generator/text/text.h b/app/node/generator/text/text.h
index b94399041..e4a14b868 100644
--- a/app/node/generator/text/text.h
+++ b/app/node/generator/text/text.h
@@ -50,6 +50,10 @@ private:
 
   NodeInput* valign_input_;
 
+  NodeInput* font_input_;
+
+  NodeInput* font_size_input_;
+
 };
 
 OLIVE_NAMESPACE_EXIT

From 343c39d66d57012a92a4cbdc6e405328edf5b7da Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 02:41:35 +1000
Subject: [PATCH 053/138] nodeparamview: preserve cursor position when text is
 edited

---
 app/widget/nodeparamview/nodeparamviewrichtext.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/widget/nodeparamview/nodeparamviewrichtext.h b/app/widget/nodeparamview/nodeparamviewrichtext.h
index 88a2befef..974a742b4 100644
--- a/app/widget/nodeparamview/nodeparamviewrichtext.h
+++ b/app/widget/nodeparamview/nodeparamviewrichtext.h
@@ -45,6 +45,13 @@ public slots:
     line_edit_->setText(s);
   }
 
+  void setTextPreservingCursor(const QString &s)
+  {
+    int cursor_pos = line_edit_->cursorPosition();
+    line_edit_->setText(s);
+    line_edit_->setCursorPosition(cursor_pos);
+  }
+
 signals:
   void textEdited(const QString &);
 

From 0f9d409fb08d10d45af3e20f0db7795c9db69ad1 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 03:37:29 +1000
Subject: [PATCH 054/138] code: removed unused function declaration

---
 app/render/backend/renderworker.h | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/render/backend/renderworker.h b/app/render/backend/renderworker.h
index a8848c643..3f5af3f9d 100644
--- a/app/render/backend/renderworker.h
+++ b/app/render/backend/renderworker.h
@@ -84,18 +84,6 @@ public:
     preview_job_time_ = job_time;
   }
 
-  /**
-   * @brief Return a unique ID for the image generated at this time
-   *
-   * This hash should always be unique to this image and can therefore be used to match existing
-   * cached frames.
-   *
-   * @return
-   *
-   * SHA-1 hash or empty QByteArray if no viewer node is set.
-   */
-  void Hash(RenderTicketPtr ticket, ViewerOutput *viewer, const QList<rational>& times);
-
   /**
    * @brief Render the frame at this time
    *

From 90bc678377412c3b3d39e44693a4cb206a6ac4cd Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 18:26:30 +1000
Subject: [PATCH 055/138] nodeinputarray: delete sub-params immediately instead
 of queuing

Queuing the destructor caused a potential desync in the node graph that
disconnected blocks after they were reconnected elsewhere. Destroying
immediately keeps this logic synchronized.
---
 app/node/inputarray.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/node/inputarray.cpp b/app/node/inputarray.cpp
index 8ca54f435..b1ec0caa8 100644
--- a/app/node/inputarray.cpp
+++ b/app/node/inputarray.cpp
@@ -59,7 +59,7 @@ void NodeInputArray::SetSize(int size)
   if (size < old_size) {
     // If the new size is less, delete all extraneous parameters
     for (int i=size;i<old_size;i++) {
-      sub_params_.at(i)->deleteLater();
+      delete sub_params_.at(i);
     }
   }
 

From df78e881500f121a3e13925709ee6366f15e400c Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 18:30:03 +1000
Subject: [PATCH 056/138] cmake: disable optimizations for debug builds

Makes debugging certain bugs easier.
---
 app/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 4e693987d..7ea42d7f5 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -100,7 +100,7 @@ else()
   target_compile_options(
     ${OLIVE_TARGET}
     PRIVATE
-    -O2
+    "$<$<CONFIG:RELEASE>:-O2>"
     -Werror
     -Wuninitialized
     -pedantic-errors

From 36dd06d2dc07a139af9cf67590b2f4a9268c8632 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 18:30:39 +1000
Subject: [PATCH 057/138] viewer: set video and audio caches to children of the
 viewer

Ensures their thread gets changed along with the viewer. The project
gets loaded/created in a background thread so the GUI can remain
responsive, and is then moved to the main thread for intended event
handling. However if the caches aren't parented, the hierarchy breaks
and the caches remain in a thread whose event loop is quickly destroyed.
Now that they're parented, events can be properly queued on them once
again.
---
 app/node/output/viewer/viewer.cpp |  4 +++-
 app/render/audioplaybackcache.cpp |  3 ++-
 app/render/audioplaybackcache.h   |  2 +-
 app/render/framehashcache.h       | 10 +++++++---
 app/render/playbackcache.h        |  5 ++++-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp
index 45fd6b23d..b5b0f495b 100644
--- a/app/node/output/viewer/viewer.cpp
+++ b/app/node/output/viewer/viewer.cpp
@@ -24,7 +24,9 @@
 
 OLIVE_NAMESPACE_ENTER
 
-ViewerOutput::ViewerOutput()
+ViewerOutput::ViewerOutput() :
+  video_frame_cache_(this),
+  audio_playback_cache_(this)
 {
   texture_input_ = new NodeInput("tex_in", NodeInput::kTexture);
   AddInput(texture_input_);
diff --git a/app/render/audioplaybackcache.cpp b/app/render/audioplaybackcache.cpp
index 98503223e..73e76a067 100644
--- a/app/render/audioplaybackcache.cpp
+++ b/app/render/audioplaybackcache.cpp
@@ -28,7 +28,8 @@
 
 OLIVE_NAMESPACE_ENTER
 
-AudioPlaybackCache::AudioPlaybackCache()
+AudioPlaybackCache::AudioPlaybackCache(QObject* parent) :
+  PlaybackCache(parent)
 {
   quint32 r = std::rand();
   UpdateFilename(QString::number(r));
diff --git a/app/render/audioplaybackcache.h b/app/render/audioplaybackcache.h
index 9e1328fbc..5fdb224df 100644
--- a/app/render/audioplaybackcache.h
+++ b/app/render/audioplaybackcache.h
@@ -31,7 +31,7 @@ class AudioPlaybackCache : public PlaybackCache
 {
   Q_OBJECT
 public:
-  AudioPlaybackCache();
+  AudioPlaybackCache(QObject* parent = nullptr);
 
   AudioParams GetParameters() {
     QMutexLocker locker(lock());
diff --git a/app/render/framehashcache.h b/app/render/framehashcache.h
index a31c4335c..96878059e 100644
--- a/app/render/framehashcache.h
+++ b/app/render/framehashcache.h
@@ -35,12 +35,13 @@ class FrameHashCache : public PlaybackCache
 {
   Q_OBJECT
 public:
-  FrameHashCache() = default;
+  FrameHashCache(QObject* parent = nullptr) :
+    PlaybackCache(parent)
+  {
+  }
 
   QByteArray GetHash(const rational& time);
 
-  void SetHash(const rational& time, const QByteArray& hash, const qint64 &job_time);
-
   void SetTimebase(const rational& tb);
 
   /**
@@ -72,6 +73,9 @@ public:
   QVector<rational> GetFrameListFromTimeRange(const TimeRangeList &range);
   QVector<rational> GetInvalidatedFrames();
 
+public slots:
+  void SetHash(const OLIVE_NAMESPACE::rational& time, const QByteArray& hash, const qint64 &job_time);
+
 protected:
   virtual void LengthChangedEvent(const rational& old, const rational& newlen) override;
 
diff --git a/app/render/playbackcache.h b/app/render/playbackcache.h
index f73cefb9f..ce54bdd7e 100644
--- a/app/render/playbackcache.h
+++ b/app/render/playbackcache.h
@@ -32,7 +32,10 @@ class PlaybackCache : public QObject
 {
   Q_OBJECT
 public:
-  PlaybackCache() = default;
+  PlaybackCache(QObject* parent = nullptr) :
+    QObject(parent)
+  {
+  }
 
   void Invalidate(const TimeRange& r);
 

From efd90d5c8f154c8ce00a81fa4aac97f743ffc735 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 18:39:47 +1000
Subject: [PATCH 058/138] renderer: use shared backend when caching

I think there was an earlier commit with a similar name but turns out
I'd only done foundational work in that commit and never actually
properly set it up. Of course once I did, there were several issues that
needed fixing to make it work correctly, but now it works as expected.

Heavily optimizes larger projects by allowing cache jobs to only copy
what has changed.
---
 app/node/input.cpp                   |  8 +--
 app/node/input.h                     |  2 +-
 app/render/backend/renderbackend.cpp | 75 ++++++++++++++++------------
 app/render/backend/renderbackend.h   |  4 +-
 app/render/backend/renderticket.cpp  |  2 +-
 app/render/backend/renderticket.h    |  7 +--
 app/render/backend/renderworker.cpp  | 35 ++++++++++++-
 app/render/backend/renderworker.h    |  4 ++
 app/task/render/render.cpp           | 10 ++--
 app/widget/viewer/viewer.cpp         | 12 ++---
 10 files changed, 104 insertions(+), 55 deletions(-)

diff --git a/app/node/input.cpp b/app/node/input.cpp
index d17656194..4e75caa5b 100644
--- a/app/node/input.cpp
+++ b/app/node/input.cpp
@@ -1007,7 +1007,7 @@ void NodeInput::set_is_keyframable(bool k)
   keyframable_ = k;
 }
 
-void NodeInput::CopyValues(NodeInput *source, NodeInput *dest, bool include_connections)
+void NodeInput::CopyValues(NodeInput *source, NodeInput *dest, bool include_connections, bool traverse_arrays)
 {
   Q_ASSERT(source->id() == dest->id());
 
@@ -1037,8 +1037,10 @@ void NodeInput::CopyValues(NodeInput *source, NodeInput *dest, bool include_conn
 
     dst_array->SetSize(src_array->GetSize());
 
-    for (int i=0;i<dst_array->GetSize();i++) {
-      CopyValues(src_array->At(i), dst_array->At(i), include_connections);
+    if (traverse_arrays) {
+      for (int i=0;i<dst_array->GetSize();i++) {
+        CopyValues(src_array->At(i), dst_array->At(i), include_connections);
+      }
     }
   }
 
diff --git a/app/node/input.h b/app/node/input.h
index 4a6da4822..cbf401250 100644
--- a/app/node/input.h
+++ b/app/node/input.h
@@ -235,7 +235,7 @@ public:
   /**
    * @brief Copy all values including keyframe information and connections from another NodeInput
    */
-  static void CopyValues(NodeInput* source, NodeInput* dest, bool include_connections = true);
+  static void CopyValues(NodeInput* source, NodeInput* dest, bool include_connections = true, bool traverse_arrays = true);
 
   /**
    * @brief Set an arbitrary property on this input to influence a UI representation's behavior
diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index 87b68d78b..2dddc700e 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -113,19 +113,20 @@ void RenderBackend::ClearVideoQueue()
   render_queue_.clear();
 }
 
-QFuture<QVector<QByteArray> > RenderBackend::Hash(const QVector<rational> &times)
+RenderTicketPtr RenderBackend::Hash(const QVector<rational> &times)
 {
-  return QtConcurrent::run(&pool_, [this](const QVector<rational> &t){
-    QVector<QByteArray> hashes(t.size());
+  if (!viewer_node_) {
+    return nullptr;
+  }
 
-    for (int i=0;i<hashes.size();i++) {
-      hashes[i] = HashNode(copied_viewer_node_->texture_input()->get_connected_node(),
-                           video_params_,
-                           t.at(i));
-    }
+  RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeHash,
+                                                          QVariant::fromValue(times));
 
-    return hashes;
-  }, times);
+  render_queue_.push_back(ticket);
+
+  QMetaObject::invokeMethod(this, "RunNextJob", Qt::QueuedConnection);
+
+  return ticket;
 }
 
 RenderTicketPtr RenderBackend::RenderFrame(const rational &time)
@@ -135,7 +136,7 @@ RenderTicketPtr RenderBackend::RenderFrame(const rational &time)
   }
 
   RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeVideo,
-                                                          TimeRange(time, time));
+                                                          QVariant::fromValue(time));
 
   render_queue_.push_back(ticket);
 
@@ -151,7 +152,7 @@ RenderTicketPtr RenderBackend::RenderAudio(const TimeRange &r)
   }
 
   RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeAudio,
-                                                          r);
+                                                          QVariant::fromValue(r));
 
   render_queue_.push_back(ticket);
 
@@ -215,6 +216,11 @@ void RenderBackend::NodeGraphChanged(NodeInput *source)
   for (int i=0; i<graph_update_queue_.size(); i++) {
     NodeInput* queued_input = graph_update_queue_.at(i);
 
+    // If this input is already queued, nothing to be done
+    if (source == queued_input) {
+      return;
+    }
+
     // Check if this dependency graph is already queued
     if (source->parentNode()->OutputsTo(queued_input, true)) {
       // In which case, no further copy is necessary
@@ -300,7 +306,7 @@ void RenderBackend::RunNextJob()
 
       worker->SetVideoParams(video_params_);
       worker->SetAudioParams(audio_params_);
-      worker->SetVideoDownloadMatrix(video_download_matrix_);
+      worker->SetVideoDownloadMatrix(video_dwnload_matrix_);
       worker->SetRenderMode(render_mode_);
       if (preview_job_time_) {
         worker->EnablePreviewGeneration(viewer_node_->audio_playback_cache(), preview_job_time_);
@@ -311,13 +317,21 @@ void RenderBackend::RunNextJob()
       render_queue_.pop_front();
 
       switch (ticket->GetType()) {
+      case RenderTicket::kTypeHash:
+        QtConcurrent::run(&pool_,
+                          worker,
+                          &RenderWorker::Hash,
+                          ticket,
+                          copied_viewer_node_,
+                          ticket->GetTime().value<QVector<rational> >());
+        break;
       case RenderTicket::kTypeVideo:
         QtConcurrent::run(&pool_,
                           worker,
                           &RenderWorker::RenderFrame,
                           ticket,
                           copied_viewer_node_,
-                          ticket->GetTime().in());
+                          ticket->GetTime().value<rational>());
         break;
       case RenderTicket::kTypeAudio:
         QtConcurrent::run(&pool_,
@@ -325,7 +339,7 @@ void RenderBackend::RunNextJob()
                           &RenderWorker::RenderAudio,
                           ticket,
                           copied_viewer_node_,
-                          ticket->GetTime());
+                          ticket->GetTime().value<TimeRange>());
         break;
       }
 
@@ -337,27 +351,25 @@ void RenderBackend::RunNextJob()
   }
 }
 
+//#define PRINT_UPDATE_QUEUE_INFO
 void RenderBackend::ProcessUpdateQueue()
 {
+#ifdef PRINT_UPDATE_QUEUE_INFO
+  qint64 t = QDateTime::currentMSecsSinceEpoch();
+  qDebug() << "Processing update queue of" << graph_update_queue_.size() << "elements:";
+#endif
+
   while (!graph_update_queue_.isEmpty()) {
-    CopyNodeInputValue(graph_update_queue_.takeFirst());
-  }
-}
-
-QByteArray RenderBackend::HashNode(const Node *n, const VideoParams &params, const rational &time)
-{
-  QCryptographicHash hasher(QCryptographicHash::Sha1);
-
-  // Embed video parameters into this hash
-  hasher.addData(reinterpret_cast<const char*>(&params.effective_width()), sizeof(int));
-  hasher.addData(reinterpret_cast<const char*>(&params.effective_height()), sizeof(int));
-  hasher.addData(reinterpret_cast<const char*>(&params.format()), sizeof(PixelFormat::Format));
-
-  if (n) {
-    n->Hash(hasher, time);
+    NodeInput* i = graph_update_queue_.takeFirst();
+#ifdef PRINT_UPDATE_QUEUE_INFO
+    qDebug() << " " << i->parentNode()->id() << i->id();
+#endif
+    CopyNodeInputValue(i);
   }
 
-  return hasher.result();
+#ifdef PRINT_UPDATE_QUEUE_INFO
+  qDebug() << "Update queue took:" << (QDateTime::currentMSecsSinceEpoch() - t);
+#endif
 }
 
 void RenderBackend::WorkerFinished()
@@ -386,6 +398,7 @@ void RenderBackend::CopyNodeInputValue(NodeInput *input)
   // Copy the standard/keyframe values between these two inputs
   NodeInput::CopyValues(input,
                         our_copy,
+                        false,
                         false);
 
   // Handle connections
diff --git a/app/render/backend/renderbackend.h b/app/render/backend/renderbackend.h
index c31632aef..19ab3948f 100644
--- a/app/render/backend/renderbackend.h
+++ b/app/render/backend/renderbackend.h
@@ -69,12 +69,10 @@ public:
 
   void ProcessUpdateQueue();
 
-  static QByteArray HashNode(const Node* n, const VideoParams& params, const rational& time);
-
   /**
    * @brief Asynchronously generate a hash at a given time
    */
-  QFuture<QVector<QByteArray> > Hash(const QVector<rational> &times);
+  RenderTicketPtr Hash(const QVector<rational> &times);
 
   /**
    * @brief Asynchronously generate a frame at a given time
diff --git a/app/render/backend/renderticket.cpp b/app/render/backend/renderticket.cpp
index 85d0d46d8..1e719a5f6 100644
--- a/app/render/backend/renderticket.cpp
+++ b/app/render/backend/renderticket.cpp
@@ -22,7 +22,7 @@
 
 OLIVE_NAMESPACE_ENTER
 
-RenderTicket::RenderTicket(Type type, const TimeRange &time) :
+RenderTicket::RenderTicket(Type type, const QVariant &time) :
   finished_(false),
   cancelled_(false),
   time_(time),
diff --git a/app/render/backend/renderticket.h b/app/render/backend/renderticket.h
index 3432b0df5..22fe46c8d 100644
--- a/app/render/backend/renderticket.h
+++ b/app/render/backend/renderticket.h
@@ -35,13 +35,14 @@ class RenderTicket : public QObject
   Q_OBJECT
 public:
   enum Type {
+    kTypeHash,
     kTypeVideo,
     kTypeAudio
   };
 
-  RenderTicket(Type type, const TimeRange& time);
+  RenderTicket(Type type, const QVariant& time);
 
-  const TimeRange& GetTime() const
+  const QVariant& GetTime() const
   {
     return time_;
   }
@@ -82,7 +83,7 @@ private:
 
   QWaitCondition wait_;
 
-  TimeRange time_;
+  QVariant time_;
 
   Type type_;
 
diff --git a/app/render/backend/renderworker.cpp b/app/render/backend/renderworker.cpp
index 1ff861658..37de178b4 100644
--- a/app/render/backend/renderworker.cpp
+++ b/app/render/backend/renderworker.cpp
@@ -21,13 +21,13 @@
 #include "renderworker.h"
 
 #include <QDir>
+#include <QThread>
 
 #include "audio/audiovisualwaveform.h"
 #include "common/functiontimer.h"
 #include "config/config.h"
 #include "node/block/clip/clip.h"
 #include "task/conform/conform.h"
-#include "renderbackend.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -40,6 +40,37 @@ RenderWorker::RenderWorker(RenderBackend* parent) :
 {
 }
 
+void RenderWorker::Hash(RenderTicketPtr ticket, ViewerOutput *viewer, const QVector<rational> &times)
+{
+  QVector<QByteArray> hashes(times.size());
+
+  for (int i=0;i<hashes.size();i++) {
+    hashes[i] = HashNode(viewer->texture_input()->get_connected_node(),
+                         video_params_,
+                         times.at(i));
+  }
+
+  ticket->Finish(QVariant::fromValue(hashes));
+
+  emit FinishedJob();
+}
+
+QByteArray RenderWorker::HashNode(const Node *n, const VideoParams &params, const rational &time)
+{
+  QCryptographicHash hasher(QCryptographicHash::Sha1);
+
+  // Embed video parameters into this hash
+  hasher.addData(reinterpret_cast<const char*>(&params.effective_width()), sizeof(int));
+  hasher.addData(reinterpret_cast<const char*>(&params.effective_height()), sizeof(int));
+  hasher.addData(reinterpret_cast<const char*>(&params.format()), sizeof(PixelFormat::Format));
+
+  if (n) {
+    n->Hash(hasher, time);
+  }
+
+  return hasher.result();
+}
+
 void RenderWorker::RenderFrame(RenderTicketPtr ticket, ViewerOutput* viewer, const rational &time)
 {
   NodeValueTable table = ProcessInput(viewer->texture_input(),
@@ -237,7 +268,7 @@ QVariant RenderWorker::ProcessFrameGeneration(const Node* node, const GenerateJo
 QVariant RenderWorker::GetCachedFrame(const Node* node, const rational& time)
 {
   if (node->id() == QStringLiteral("org.olivevideoeditor.Olive.videoinput")) {
-    QByteArray hash = RenderBackend::HashNode(node, video_params(), time);
+    QByteArray hash = HashNode(node, video_params(), time);
 
     QString fn = FrameHashCache::CachePathName(hash);
 
diff --git a/app/render/backend/renderworker.h b/app/render/backend/renderworker.h
index 3f5af3f9d..65655a2b2 100644
--- a/app/render/backend/renderworker.h
+++ b/app/render/backend/renderworker.h
@@ -84,6 +84,8 @@ public:
     preview_job_time_ = job_time;
   }
 
+  void Hash(RenderTicketPtr ticket, ViewerOutput* viewer, const QVector<rational>& times);
+
   /**
    * @brief Render the frame at this time
    *
@@ -146,6 +148,8 @@ signals:
 private:
   DecoderPtr ResolveDecoderFromInput(StreamPtr stream);
 
+  static QByteArray HashNode(const Node* n, const VideoParams& params, const rational& time);
+
   RenderBackend* parent_;
 
   VideoParams video_params_;
diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp
index 31da11f17..1b93fe61e 100644
--- a/app/task/render/render.cpp
+++ b/app/task/render/render.cpp
@@ -107,11 +107,13 @@ void RenderTask::Render(const TimeRangeList& video_range,
 
     total_length += video_frame_sz * times.size();
 
-    QFuture<QVector<QByteArray> > hash_future = backend_->Hash(times);
-    hashes = hash_future.result();
+    RenderTicketPtr hash_future = backend_->Hash(times);
+    hashes = hash_future->Get().value<QVector<QByteArray> >();
 
-    for (int i=0;i<times.size();i++) {
-      frame_queue.push_back({times.at(i), hashes.at(i)});
+    if (!hash_future->WasCancelled()) {
+      for (int i=0;i<times.size();i++) {
+        frame_queue.push_back({times.at(i), hashes.at(i)});
+      }
     }
   }
 
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 77ffb8102..8d982bd2b 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -214,7 +214,7 @@ void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
 
 void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
 {
-  Pause();
+  PauseInternal();
 
   if (cache_background_task_ == our_cache_background_task_) {
     StopAllBackgroundCacheTasks(true);
@@ -646,7 +646,8 @@ RenderTicketPtr ViewerWidget::GetFrame(const rational &t, bool clear_render_queu
     // Frame has been cached, grab the frame
     QString cache_fn = GetConnectedNode()->video_frame_cache()->CachePathName(cached_hash);
 
-    RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeVideo, TimeRange(t, t));
+    RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeVideo,
+                                                            QVariant::fromValue(t));
     QtConcurrent::run(DecodeCachedImage, ticket, cache_fn, t);
     return ticket;
 
@@ -875,10 +876,7 @@ void ViewerWidget::StartBackgroundCaching()
       cache_wait_timer_.start();
 
     } else {
-      cache_background_task_ = new CacheTask(GetConnectedNode(),
-                                             GetConnectedNode()->video_params(),
-                                             GetConnectedNode()->audio_params(),
-                                             false);
+      cache_background_task_ = new CacheTask(renderer_, false);
 
       our_cache_background_task_ = cache_background_task_;
 
@@ -1223,7 +1221,7 @@ void ViewerWidget::ViewerInvalidatedRange()
   StopAllBackgroundCacheTasks(false);
 
   if (!(qApp->mouseButtons() & Qt::LeftButton)) {
-    StartBackgroundCaching();
+    cache_wait_timer_.start();
   }
 }
 

From c710fd162e332a7ad1e849db9a56545707981e1e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 18:42:13 +1000
Subject: [PATCH 059/138] richtextdialog: show html tags rather than wysiwyg

While good in theory, a WYSIWYG rich text editor for large video frames
was unwieldy (and in many cases unhelpful). Instead the titler will
show plain text/HTML tags so the user can still write rich text but
without the unwieldy UI.

For a true WYSIWYG experience, we would probably need to write a true
graphical editor (a la Premiere's titler), but that's a later goal.
This titler will be sufficient in a good majority of cases and there
are plenty of dedicated graphics packages if more complex titling is
required for the timebeing.
---
 app/dialog/richtext/richtext.cpp                   | 11 ++++++++---
 app/dialog/richtext/richtext.h                     |  9 +++++++--
 app/widget/nodeparamview/nodeparamviewrichtext.cpp |  6 ++++--
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/dialog/richtext/richtext.cpp b/app/dialog/richtext/richtext.cpp
index 8807156b9..1b49c649a 100644
--- a/app/dialog/richtext/richtext.cpp
+++ b/app/dialog/richtext/richtext.cpp
@@ -29,7 +29,7 @@
 
 OLIVE_NAMESPACE_ENTER
 
-RichTextDialog::RichTextDialog(const QString &start, QWidget* parent) :
+RichTextDialog::RichTextDialog(QString start, QWidget* parent) :
   QDialog(parent)
 {
   QVBoxLayout* layout = new QVBoxLayout(this);
@@ -70,8 +70,9 @@ RichTextDialog::RichTextDialog(const QString &start, QWidget* parent) :
   // Create text edit widget
   text_edit_ = new QTextEdit();
   text_edit_->setWordWrapMode(QTextOption::NoWrap);
-  connect(text_edit_, &QTextEdit::cursorPositionChanged, this, &RichTextDialog::UpdateButtons);
-  text_edit_->document()->setHtml(start);
+  //connect(text_edit_, &QTextEdit::cursorPositionChanged, this, &RichTextDialog::UpdateButtons);
+  start.replace(QStringLiteral("<br>"), QStringLiteral("\n"));
+  text_edit_->document()->setPlainText(start);
   layout->addWidget(text_edit_);
 
   // Create buttons
@@ -81,6 +82,7 @@ RichTextDialog::RichTextDialog(const QString &start, QWidget* parent) :
   connect(buttons, &QDialogButtonBox::rejected, this, &RichTextDialog::reject);
 
   // Connect font buttons
+  /*
   connect(bold_btn_, &QPushButton::clicked, this, [this](bool e){
     text_edit_->setFontWeight(e ? QFont::Bold : QFont::Normal);
   });
@@ -113,6 +115,7 @@ RichTextDialog::RichTextDialog(const QString &start, QWidget* parent) :
   connect(font_combo_, &QFontComboBox::currentTextChanged, this, [this](const QString& s){
     text_edit_->setFontFamily(s);
   });
+  */
 }
 
 QPushButton *RichTextDialog::CreateToolbarButton(const QString& label, const QString& tooltip)
@@ -126,6 +129,7 @@ QPushButton *RichTextDialog::CreateToolbarButton(const QString& label, const QSt
 
 void RichTextDialog::UpdateButtons()
 {
+  /*
   bold_btn_->setChecked(text_edit_->fontWeight() > QFont::Normal);
   italic_btn_->setChecked(text_edit_->fontItalic());
   underline_btn_->setChecked(text_edit_->fontUnderline());
@@ -142,6 +146,7 @@ void RichTextDialog::UpdateButtons()
   center_align_btn_->setChecked(text_edit_->alignment() == Qt::AlignCenter);
   right_align_btn_->setChecked(text_edit_->alignment() == Qt::AlignRight);
   justify_align_btn_->setChecked(text_edit_->alignment() == Qt::AlignJustify);
+  */
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/richtext/richtext.h b/app/dialog/richtext/richtext.h
index 7e2bbc252..aface3d04 100644
--- a/app/dialog/richtext/richtext.h
+++ b/app/dialog/richtext/richtext.h
@@ -34,11 +34,16 @@ class RichTextDialog : public QDialog
 {
   Q_OBJECT
 public:
-  RichTextDialog(const QString& start, QWidget* parent = nullptr);
+  RichTextDialog(QString start, QWidget* parent = nullptr);
 
   QString text() const
   {
-    return text_edit_->document()->toHtml("utf-8");
+    QString s = text_edit_->document()->toPlainText();
+
+    // Convert linebreaks
+    s.replace('\n', QStringLiteral("<br>"));
+
+    return s;
   }
 
 private:
diff --git a/app/widget/nodeparamview/nodeparamviewrichtext.cpp b/app/widget/nodeparamview/nodeparamviewrichtext.cpp
index de382f0c9..476c7cc76 100644
--- a/app/widget/nodeparamview/nodeparamviewrichtext.cpp
+++ b/app/widget/nodeparamview/nodeparamviewrichtext.cpp
@@ -48,8 +48,10 @@ void NodeParamViewRichText::ShowRichTextDialog()
 {
   RichTextDialog d(line_edit_->text(), this);
   if (d.exec() == QDialog::Accepted) {
-    line_edit_->setText(d.text());
-    emit textEdited(d.text());
+    QString s = d.text();
+
+    line_edit_->setText(s);
+    emit textEdited(s);
   }
 }
 

From cabf581a2036b86fcbc4dbb8f2d6d3a20e4c8c08 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 18:45:45 +1000
Subject: [PATCH 060/138] code: fixed typo

Not sure how this got here but ok
---
 app/render/backend/renderbackend.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index 2dddc700e..5e1a1f018 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -306,7 +306,7 @@ void RenderBackend::RunNextJob()
 
       worker->SetVideoParams(video_params_);
       worker->SetAudioParams(audio_params_);
-      worker->SetVideoDownloadMatrix(video_dwnload_matrix_);
+      worker->SetVideoDownloadMatrix(video_download_matrix_);
       worker->SetRenderMode(render_mode_);
       if (preview_job_time_) {
         worker->EnablePreviewGeneration(viewer_node_->audio_playback_cache(), preview_job_time_);

From 39d71eb7cde1813492cbdb04b666011263a016ab Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 10 Jul 2020 19:28:42 +1000
Subject: [PATCH 061/138] nodeview: drop nodes on release rather than press

Minor UI improvement that also addresses issue where the cache would
ignore the invalidation.
---
 app/widget/nodeview/nodeview.cpp | 52 ++++++++++++++++----------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp
index e2a5ed929..ebd5d8c26 100644
--- a/app/widget/nodeview/nodeview.cpp
+++ b/app/widget/nodeview/nodeview.cpp
@@ -356,32 +356,6 @@ void NodeView::mousePressEvent(QMouseEvent *event)
 {
   if (HandPress(event)) return;
 
-  if (!attached_items_.isEmpty()) {
-    if (attached_items_.size() == 1) {
-      Node* dropping_node = attached_items_.first().item->GetNode();
-
-      if (drop_edge_) {
-        NodeEdgePtr old_edge = drop_edge_->edge();
-
-        // We have everything we need to place the node in between
-        QUndoCommand* command = new QUndoCommand();
-
-        // Remove old edge
-        new NodeEdgeRemoveCommand(old_edge, command);
-
-        // Place new edges
-        new NodeEdgeAddCommand(old_edge->output(), drop_input_, command);
-        new NodeEdgeAddCommand(dropping_node->output(), old_edge->input(), command);
-
-        Core::instance()->undo_stack()->push(command);
-      }
-
-      drop_edge_ = nullptr;
-    }
-
-    DetachItemsFromCursor();
-  }
-
   super::mousePressEvent(event);
 }
 
@@ -456,6 +430,32 @@ void NodeView::mouseReleaseEvent(QMouseEvent *event)
 {
   if (HandRelease(event)) return;
 
+  if (!attached_items_.isEmpty()) {
+    if (attached_items_.size() == 1) {
+      Node* dropping_node = attached_items_.first().item->GetNode();
+
+      if (drop_edge_) {
+        NodeEdgePtr old_edge = drop_edge_->edge();
+
+        // We have everything we need to place the node in between
+        QUndoCommand* command = new QUndoCommand();
+
+        // Remove old edge
+        new NodeEdgeRemoveCommand(old_edge, command);
+
+        // Place new edges
+        new NodeEdgeAddCommand(old_edge->output(), drop_input_, command);
+        new NodeEdgeAddCommand(dropping_node->output(), old_edge->input(), command);
+
+        Core::instance()->undo_stack()->push(command);
+      }
+
+      drop_edge_ = nullptr;
+    }
+
+    DetachItemsFromCursor();
+  }
+
   super::mouseReleaseEvent(event);
 }
 

From ceeb4912939c3640d2a476cf6455dc7d295a62d1 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 11 Jul 2020 01:44:48 +1000
Subject: [PATCH 062/138] richtextdialog: implemented basic html tag editing

Another step in moving away from the WYSIWYG rich text dialog.
---
 app/dialog/richtext/richtext.cpp | 235 +++++++++++++++++++++++++++----
 app/dialog/richtext/richtext.h   |  15 +-
 2 files changed, 225 insertions(+), 25 deletions(-)

diff --git a/app/dialog/richtext/richtext.cpp b/app/dialog/richtext/richtext.cpp
index 1b49c649a..40f2baabd 100644
--- a/app/dialog/richtext/richtext.cpp
+++ b/app/dialog/richtext/richtext.cpp
@@ -20,6 +20,7 @@
 
 #include "richtext.h"
 
+#include <QDebug>
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
 #include <QPushButton>
@@ -37,13 +38,13 @@ RichTextDialog::RichTextDialog(QString start, QWidget* parent) :
   // Create toolbar
   QHBoxLayout* toolbar_layout = new QHBoxLayout();
 
-  bold_btn_ = CreateToolbarButton(tr("B"), tr("Bold"));
+  bold_btn_ = CreateToolbarButton(tr("B"), tr("Bold"), {QStringLiteral("b"), QStringLiteral("strong")});
   toolbar_layout->addWidget(bold_btn_);
-  italic_btn_ = CreateToolbarButton(tr("I"), tr("Italic"));
+  italic_btn_ = CreateToolbarButton(tr("I"), tr("Italic"), {QStringLiteral("i"), QStringLiteral("em")});
   toolbar_layout->addWidget(italic_btn_);
-  underline_btn_ = CreateToolbarButton(tr("U"), tr("Underline"));
+  underline_btn_ = CreateToolbarButton(tr("U"), tr("Underline"), {QStringLiteral("u")});
   toolbar_layout->addWidget(underline_btn_);
-  strikeout_btn_ = CreateToolbarButton(tr("S"), tr("Strikethrough"));
+  strikeout_btn_ = CreateToolbarButton(tr("S"), tr("Strikethrough"), {QStringLiteral("strike")});
   toolbar_layout->addWidget(strikeout_btn_);
   font_combo_ = new QFontComboBox();
   font_combo_->setToolTip(tr("Font Family"));
@@ -56,13 +57,13 @@ RichTextDialog::RichTextDialog(QString start, QWidget* parent) :
 
   toolbar_layout->addStretch();
 
-  left_align_btn_ = CreateToolbarButton(tr("L"), tr("Left Align"));
+  left_align_btn_ = CreateToolbarButton(tr("L"), tr("Left Align"), {});
   toolbar_layout->addWidget(left_align_btn_);
-  center_align_btn_ = CreateToolbarButton(tr("C"), tr("Center Align"));
+  center_align_btn_ = CreateToolbarButton(tr("C"), tr("Center Align"), {});
   toolbar_layout->addWidget(center_align_btn_);
-  right_align_btn_ = CreateToolbarButton(tr("R"), tr("Right Align"));
+  right_align_btn_ = CreateToolbarButton(tr("R"), tr("Right Align"), {});
   toolbar_layout->addWidget(right_align_btn_);
-  justify_align_btn_ = CreateToolbarButton(tr("J"), tr("Justify Align"));
+  justify_align_btn_ = CreateToolbarButton(tr("J"), tr("Justify Align"), {});
   toolbar_layout->addWidget(justify_align_btn_);
 
   layout->addLayout(toolbar_layout);
@@ -70,7 +71,7 @@ RichTextDialog::RichTextDialog(QString start, QWidget* parent) :
   // Create text edit widget
   text_edit_ = new QTextEdit();
   text_edit_->setWordWrapMode(QTextOption::NoWrap);
-  //connect(text_edit_, &QTextEdit::cursorPositionChanged, this, &RichTextDialog::UpdateButtons);
+  connect(text_edit_, &QTextEdit::cursorPositionChanged, this, &RichTextDialog::UpdateButtons);
   start.replace(QStringLiteral("<br>"), QStringLiteral("\n"));
   text_edit_->document()->setPlainText(start);
   layout->addWidget(text_edit_);
@@ -83,16 +84,6 @@ RichTextDialog::RichTextDialog(QString start, QWidget* parent) :
 
   // Connect font buttons
   /*
-  connect(bold_btn_, &QPushButton::clicked, this, [this](bool e){
-    text_edit_->setFontWeight(e ? QFont::Bold : QFont::Normal);
-  });
-  connect(italic_btn_, &QPushButton::clicked, text_edit_, &QTextEdit::setFontItalic);
-  connect(underline_btn_, &QPushButton::clicked, text_edit_, &QTextEdit::setFontUnderline);
-  connect(strikeout_btn_, &QPushButton::clicked, this, [this](bool e){
-    QFont current_font = text_edit_->currentFont();
-    current_font.setStrikeOut(e);
-    text_edit_->setCurrentFont(current_font);
-  });
   connect(size_slider_, &FloatSlider::ValueChanged, text_edit_, &QTextEdit::setFontPointSize);
   connect(left_align_btn_, &QPushButton::clicked, this, [this](){
     text_edit_->setAlignment(Qt::AlignLeft);
@@ -118,22 +109,218 @@ RichTextDialog::RichTextDialog(QString start, QWidget* parent) :
   */
 }
 
-QPushButton *RichTextDialog::CreateToolbarButton(const QString& label, const QString& tooltip)
+QPushButton *RichTextDialog::CreateToolbarButton(const QString& label, const QString& tooltip, const QStringList &tags)
 {
   QPushButton* btn = new QPushButton(label);
   btn->setCheckable(true);
   btn->setToolTip(tooltip);
   btn->setFixedWidth(btn->sizeHint().height());
+
+  if (!tags.isEmpty()) {
+    btn->setProperty("tag", tags);
+    connect(btn, &QPushButton::clicked, this, &RichTextDialog::TagButtonToggled);
+  }
+
   return btn;
 }
 
+int SnapPositionOutsideTags(const QString& text, int pos)
+{
+  // Look for closest opening bracket before position
+  int opening_bracket_pos = text.lastIndexOf('<', pos - text.size() -1);
+
+  // Look for closest closing bracket before position
+  int closing_bracket_pos = text.indexOf('>', opening_bracket_pos);
+
+  if (opening_bracket_pos > -1 && closing_bracket_pos >= pos) {
+    // Must be inside an angle bracket, snap to closest position outside of bracket
+    closing_bracket_pos++;
+
+    if (pos - opening_bracket_pos < closing_bracket_pos - pos) {
+      // Closer to opening bracket pos
+      return opening_bracket_pos;
+    } else {
+      return closing_bracket_pos;
+    }
+  }
+
+  return pos;
+}
+
+void RichTextDialog::SetTags(const QStringList &t, bool enabled)
+{
+  QString s = text_edit_->toPlainText();
+
+  int selection_start, selection_end;
+
+  {
+    QTextCursor c = text_edit_->textCursor();
+
+    if (c.hasSelection()) {
+      selection_start = SnapPositionOutsideTags(s, c.selectionStart());
+      selection_end = SnapPositionOutsideTags(s, c.selectionEnd());
+
+      c.clearSelection();
+      c.setPosition(selection_start, QTextCursor::MoveAnchor);
+      c.setPosition(selection_end, QTextCursor::KeepAnchor);
+    } else {
+      selection_start = SnapPositionOutsideTags(s, c.position());
+      selection_end = selection_start;
+      c.setPosition(selection_start, QTextCursor::MoveAnchor);
+    }
+
+    text_edit_->setTextCursor(c);
+  }
+
+  QString open_tag = CreateOpeningTag(t.first());
+  QString close_tag = CreateClosingTag(t.first());
+
+  // Insert tags
+  QString new_text;
+
+  if (!enabled) {
+    std::swap(open_tag, close_tag);
+  }
+
+  bool open_tag_cancels_out = !QString::compare(s.mid(selection_start - close_tag.size(), close_tag.size()), close_tag, Qt::CaseInsensitive);
+  bool close_tag_cancels_out = !QString::compare(s.mid(selection_end, open_tag.size()), open_tag, Qt::CaseInsensitive);
+
+  QString selected_text = text_edit_->textCursor().selectedText();
+
+  if (open_tag_cancels_out && close_tag_cancels_out) {
+
+    // Both tags cancel each other out, simply remove
+    selection_start -= close_tag.size();
+
+    QTextCursor c = text_edit_->textCursor();
+    c.clearSelection();
+    c.setPosition(selection_start, QTextCursor::MoveAnchor);
+    c.setPosition(selection_end + open_tag.size(), QTextCursor::KeepAnchor);
+    text_edit_->setTextCursor(c);
+
+    selection_end -= close_tag.size();
+
+    new_text = selected_text;
+
+  } else if (open_tag_cancels_out) {
+
+    // Open tag cancels out, shift close tag rather than inserting new tags
+    selection_start -= close_tag.size();
+
+    QTextCursor c = text_edit_->textCursor();
+    c.clearSelection();
+    c.setPosition(selection_start, QTextCursor::MoveAnchor);
+    c.setPosition(selection_end, QTextCursor::KeepAnchor);
+    text_edit_->setTextCursor(c);
+
+    selection_end -= close_tag.size();
+
+    new_text = selected_text;
+    new_text.append(close_tag);
+
+  } else if (close_tag_cancels_out) {
+
+    // Close tag cancels out, shift open tag rather than inserting new tags
+    selection_end += open_tag.size();
+
+    QTextCursor c = text_edit_->textCursor();
+    c.clearSelection();
+    c.setPosition(selection_start, QTextCursor::MoveAnchor);
+    c.setPosition(selection_end, QTextCursor::KeepAnchor);
+    text_edit_->setTextCursor(c);
+
+    selection_start += open_tag.size();
+
+    new_text = open_tag;
+    new_text.append(selected_text);
+
+  } else {
+    // Nothing is cancelled out, simply insert tags
+    new_text = QStringLiteral("%1%2%3").arg(open_tag,
+                                            selected_text,
+                                            close_tag);
+
+    selection_start += open_tag.size();
+    selection_end += open_tag.size();
+  }
+
+  text_edit_->insertPlainText(new_text);
+
+  text_edit_->setFocus();
+
+  {
+    // Re-select text
+    QTextCursor c = text_edit_->textCursor();
+
+    c.clearSelection();
+    c.setPosition(selection_start, QTextCursor::MoveAnchor);
+    c.setPosition(selection_end, QTextCursor::KeepAnchor);
+    text_edit_->setTextCursor(c);
+  }
+}
+
+QString RichTextDialog::CreateOpeningTag(const QString &s)
+{
+  return QStringLiteral("<%1>").arg(s);
+}
+
+QString RichTextDialog::CreateClosingTag(const QString &s)
+{
+  return QStringLiteral("</%1>").arg(s);
+}
+
+void RichTextDialog::UpdateTagButton(QPushButton *btn,
+                                     const QString &text,
+                                     int cursor_pos)
+{
+  QStringList tags = btn->property("tag").toStringList();
+  foreach (const QString& t, tags) {
+    QString opening = CreateOpeningTag(t);
+    QString closing = CreateClosingTag(t);
+
+    int opening_index = text.lastIndexOf(opening,
+                                         cursor_pos - text.size() - 1,
+                                         Qt::CaseInsensitive);
+    int closing_index = text.indexOf(closing,
+                                     opening_index,
+                                     Qt::CaseInsensitive);
+
+    if (opening_index > -1 && closing_index + closing.size() > cursor_pos) {
+      btn->setChecked(true);
+      btn->setProperty("foundtag", t);
+      return;
+    }
+  }
+
+  btn->setChecked(false);
+  btn->setProperty("foundtag", QVariant());
+}
+
+void RichTextDialog::TagButtonToggled(bool checked)
+{
+  QPushButton* src = static_cast<QPushButton*>(sender());
+  QStringList tags;
+
+  if (src->property("foundtag").isNull()) {
+    tags = src->property("tag").toStringList();
+  } else {
+    tags = QStringList({src->property("foundtag").toString()});
+  }
+
+  SetTags(tags, checked);
+}
+
 void RichTextDialog::UpdateButtons()
 {
+  QString text = text_edit_->toPlainText();
+  int cursor_pos = text_edit_->textCursor().position();
+
+  UpdateTagButton(bold_btn_, text, cursor_pos);
+  UpdateTagButton(italic_btn_, text, cursor_pos);
+  UpdateTagButton(underline_btn_, text, cursor_pos);
+  UpdateTagButton(strikeout_btn_, text, cursor_pos);
+
   /*
-  bold_btn_->setChecked(text_edit_->fontWeight() > QFont::Normal);
-  italic_btn_->setChecked(text_edit_->fontItalic());
-  underline_btn_->setChecked(text_edit_->fontUnderline());
-  strikeout_btn_->setChecked(text_edit_->currentFont().strikeOut());
 
   // Update font family
   font_combo_->blockSignals(true);
diff --git a/app/dialog/richtext/richtext.h b/app/dialog/richtext/richtext.h
index aface3d04..b3514df4b 100644
--- a/app/dialog/richtext/richtext.h
+++ b/app/dialog/richtext/richtext.h
@@ -47,7 +47,18 @@ public:
   }
 
 private:
-  QPushButton* CreateToolbarButton(const QString &label, const QString &tooltip);
+  QPushButton* CreateToolbarButton(const QString &label,
+                                   const QString &tooltip,
+                                   const QStringList& tags);
+
+  void SetTags(const QStringList& t, bool enabled);
+
+  static QString CreateOpeningTag(const QString& s);
+  static QString CreateClosingTag(const QString& s);
+
+  static void UpdateTagButton(QPushButton* btn,
+                              const QString &text,
+                              int cursor_pos);
 
   QFontDatabase font_db_;
 
@@ -65,6 +76,8 @@ private:
   QPushButton* justify_align_btn_;
 
 private slots:
+  void TagButtonToggled(bool checked);
+
   void UpdateButtons();
 
 };

From 4d6003bb55f457748a9f5304720a432775afbc7c Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 12 Jul 2020 13:54:31 +1000
Subject: [PATCH 063/138] slider: update label color

Dark blue on dark gray was a little unreadable.
---
 app/ui/style/olive-dark/palette.ini | 2 +-
 app/widget/slider/sliderlabel.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/ui/style/olive-dark/palette.ini b/app/ui/style/olive-dark/palette.ini
index 7f93ffd25..778c3d8fc 100644
--- a/app/ui/style/olive-dark/palette.ini
+++ b/app/ui/style/olive-dark/palette.ini
@@ -6,7 +6,7 @@ Button=#353535
 ButtonText=#FFFFFF
 Highlight=#2A82DA
 HighlightedText=#FFFFFF
-Link=#2A82DA
+Link=#E0B040
 Text=#FFFFFF
 ToolTipBase=#191919
 ToolTipText=#FFFFFF
diff --git a/app/widget/slider/sliderlabel.cpp b/app/widget/slider/sliderlabel.cpp
index 319398a91..d100379a5 100644
--- a/app/widget/slider/sliderlabel.cpp
+++ b/app/widget/slider/sliderlabel.cpp
@@ -38,7 +38,7 @@ SliderLabel::SliderLabel(QWidget *parent) :
   setPalette(p);
 
   // Use highlight color as font color
-  setForegroundRole(QPalette::Highlight);
+  setForegroundRole(QPalette::Link);
 
   // Set underlined
   QFont f = font();

From 11afdf32feb7ed0a16972831a06ef22f051a0454 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 12 Jul 2020 18:25:51 +1000
Subject: [PATCH 064/138] decoder/timeline: improve decoding of still images

---
 app/codec/ffmpeg/ffmpegdecoder.cpp            | 424 ++++++++++--------
 app/codec/ffmpeg/ffmpegdecoder.h              |   2 +
 .../videostreamproperties.cpp                 |  23 +-
 .../streamproperties/videostreamproperties.h  |   8 +
 app/project/item/footage/imagestream.cpp      |   3 +-
 app/project/item/footage/imagestream.h        |  20 +
 app/widget/timelinewidget/tool/import.cpp     |  27 +-
 app/widget/timelinewidget/tool/pointer.cpp    |   3 +
 8 files changed, 313 insertions(+), 197 deletions(-)

diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp
index 3b54fcdb2..c3aee6965 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.cpp
+++ b/app/codec/ffmpeg/ffmpegdecoder.cpp
@@ -86,12 +86,12 @@ bool FFmpegDecoder::Open()
     return false;
   }
 
-  if (stream()->type() == Stream::kVideo) {
+  if (stream()->type() == Stream::kImage || stream()->type() == Stream::kVideo) {
     // Get an Olive compatible AVPixelFormat
     src_pix_fmt_ = static_cast<AVPixelFormat>(our_instance->stream()->codecpar->format);
     ideal_pix_fmt_ = FFmpegCommon::GetCompatiblePixelFormat(src_pix_fmt_);
 
-    {
+    if (stream()->type() == Stream::kVideo) {
       QMutexLocker map_locker(&instance_map_lock_);
 
       // FIXME: Test code, this should be changed later
@@ -144,165 +144,177 @@ FramePtr FFmpegDecoder::RetrieveVideo(const rational &timecode, const int &divid
     return nullptr;
   }
 
-  if (stream()->type() != Stream::kVideo) {
+  if (stream()->type() != Stream::kImage && stream()->type() != Stream::kVideo) {
     return nullptr;
   }
 
-  int64_t target_ts = Timecode::time_to_timestamp(timecode, time_base_) + start_time_;
+  ImageStreamPtr is = std::static_pointer_cast<ImageStream>(stream());
 
-  VideoStreamPtr vs = std::static_pointer_cast<VideoStream>(stream());
+  if (stream()->type() == Stream::kImage) {
 
-  FFmpegDecoderInstance* working_instance = nullptr;
-  FFmpegFramePool::ElementPtr return_frame = nullptr;
+    // FIXME: Hacky
+    FFmpegDecoderInstance i(stream()->footage()->filename().toUtf8(), stream()->index());
 
-  // Find instance
-  do {
-    QMutexLocker list_locker(&instance_map_lock_);
+    AVPacket* pkt = av_packet_alloc();
+    AVFrame* frame = av_frame_alloc();
+    FramePtr output_frame = nullptr;
 
-    QList<FFmpegDecoderInstance*> non_ideal_contenders;
+    int ret = i.GetFrame(pkt, frame);
 
-    QList<FFmpegDecoderInstance*> instances = instance_map_.value(stream().get());
+    if (ret >= 0) {
+      output_frame = BuffersToNativeFrame(divider,
+                                          is->width(),
+                                          is->height(),
+                                          0,
+                                          frame->data,
+                                          frame->linesize);
+    } else {
+      qWarning() << "Failed to retrieve still image from decoder";
+    }
 
-    foreach (FFmpegDecoderInstance* i, instances) {
+    av_frame_free(&frame);
+    av_packet_free(&pkt);
 
-      i->cache_lock()->lock();
+    return output_frame;
 
-      if (i->CacheContainsTime(target_ts)) {
+  } else {
 
-        // Found our instance, allow others to enter the list
+    FFmpegFramePool::ElementPtr return_frame = nullptr;
 
-        list_locker.unlock();
+    int64_t target_ts = Timecode::time_to_timestamp(timecode, time_base_) + start_time_;
 
-        // Get the frame from this cache
-        return_frame = i->GetFrameFromCache(target_ts);
+    VideoStreamPtr vs = std::static_pointer_cast<VideoStream>(stream());
 
-        // Got our frame, allow cache to continue
-        i->cache_lock()->unlock();
-        break;
+    FFmpegDecoderInstance* working_instance = nullptr;
 
-      } else if (i->CacheWillContainTime(target_ts) || i->CacheCouldContainTime(target_ts)) {
+    // Find instance
+    do {
+      QMutexLocker list_locker(&instance_map_lock_);
 
-        // Found our instance, allow others to enter the list
-        list_locker.unlock();
+      QList<FFmpegDecoderInstance*> non_ideal_contenders;
 
-        // If the instance is currently in use, enter into a loop of seeing from frames come up next in case one is ours
-        if (i->IsWorking()) {
+      QList<FFmpegDecoderInstance*> instances = instance_map_.value(stream().get());
 
-          do {
-            // Allow instance to continue to the next frame
-            i->cache_wait_cond()->wait(i->cache_lock());
+      foreach (FFmpegDecoderInstance* i, instances) {
 
-            // See if the cache now contains this frame, if so we'll exit this loop
-            if (i->CacheContainsTime(target_ts)) {
+        i->cache_lock()->lock();
 
-              // Grab the frame
-              return_frame = i->GetFrameFromCache(target_ts);
+        if (i->CacheContainsTime(target_ts)) {
 
-              // We can release this worker now since we don't need it anymore
-              i->cache_lock()->unlock();
+          // Found our instance, allow others to enter the list
 
-            } else if (!i->IsWorking()) {
+          list_locker.unlock();
 
-              // This instance finished and we didn't get our frame, we'll take it and continue it
-              working_instance = i;
-              break;
+          // Get the frame from this cache
+          return_frame = i->GetFrameFromCache(target_ts);
 
-            }
-          } while (!return_frame);
+          // Got our frame, allow cache to continue
+          i->cache_lock()->unlock();
+          break;
+
+        } else if (i->CacheWillContainTime(target_ts) || i->CacheCouldContainTime(target_ts)) {
+
+          // Found our instance, allow others to enter the list
+          list_locker.unlock();
+
+          // If the instance is currently in use, enter into a loop of seeing from frames come up next in case one is ours
+          if (i->IsWorking()) {
+
+            do {
+              // Allow instance to continue to the next frame
+              i->cache_wait_cond()->wait(i->cache_lock());
+
+              // See if the cache now contains this frame, if so we'll exit this loop
+              if (i->CacheContainsTime(target_ts)) {
+
+                // Grab the frame
+                return_frame = i->GetFrameFromCache(target_ts);
+
+                // We can release this worker now since we don't need it anymore
+                i->cache_lock()->unlock();
+
+              } else if (!i->IsWorking()) {
+
+                // This instance finished and we didn't get our frame, we'll take it and continue it
+                working_instance = i;
+                break;
+
+              }
+            } while (!return_frame);
+
+          } else {
+            // Otherwise, we'll grab this instance and continue it ourselves
+            working_instance = i;
+          }
+
+          break;
+
+        } else if (i->IsWorking()) {
+
+          // Ignore currently working instances
+          i->cache_lock()->unlock();
+
+        } else if (i->CacheIsEmpty()) {
+
+          // Prioritize this cache over others (leaves this instance LOCKED in case we end up using it later)
+          non_ideal_contenders.prepend(i);
 
         } else {
-          // Otherwise, we'll grab this instance and continue it ourselves
-          working_instance = i;
+
+          // De-prioritize this cache (leaves this instance LOCKED in case we end up using it later)
+          non_ideal_contenders.append(i);
+
         }
-
-        break;
-
-      } else if (i->IsWorking()) {
-
-        // Ignore currently working instances
-        i->cache_lock()->unlock();
-
-      } else if (i->CacheIsEmpty()) {
-
-        // Prioritize this cache over others (leaves this instance LOCKED in case we end up using it later)
-        non_ideal_contenders.prepend(i);
-
-      } else {
-
-        // De-prioritize this cache (leaves this instance LOCKED in case we end up using it later)
-        non_ideal_contenders.append(i);
-
       }
+
+      // If we didn't find a suitable contender, grab the first non-suitable and roll with that
+      if (!return_frame && !working_instance && !non_ideal_contenders.isEmpty()) {
+        working_instance = non_ideal_contenders.takeFirst();
+      }
+
+      // For all instances we left locked but didn't end up using, lock them now
+      foreach (FFmpegDecoderInstance* unsuitable_instance, non_ideal_contenders) {
+        unsuitable_instance->cache_lock()->unlock();
+      }
+    } while (!return_frame && !working_instance);
+
+    if (!return_frame && working_instance) {
+
+      // This instance SHOULD remain locked from our earlier loop, making this operation safe
+      working_instance->SetWorking(true);
+
+      // Retrieve frame
+      return_frame = working_instance->RetrieveFrame(target_ts, true);
+
+      // Set working to false and wake any threads waiting
+      working_instance->cache_lock()->lock();
+      working_instance->SetWorking(false);
+      working_instance->cache_wait_cond()->wakeAll();
+      working_instance->cache_lock()->unlock();
     }
 
-    // If we didn't find a suitable contender, grab the first non-suitable and roll with that
-    if (!return_frame && !working_instance && !non_ideal_contenders.isEmpty()) {
-      working_instance = non_ideal_contenders.takeFirst();
+    // We found the frame, we'll return a copy
+    if (return_frame) {
+      // Align buffer to data/linesize points that can be passed to sws_scale
+      uint8_t* input_data[4];
+      int input_linesize[4];
+
+      av_image_fill_arrays(input_data,
+                           input_linesize,
+                           reinterpret_cast<const uint8_t*>(return_frame->data()),
+                           src_pix_fmt_,
+                           vs->width(),
+                           vs->height(),
+                           1);
+
+      return BuffersToNativeFrame(divider,
+                                  vs->width(),
+                                  vs->height(),
+                                  target_ts,
+                                  input_data,
+                                  input_linesize);
     }
 
-    // For all instances we left locked but didn't end up using, lock them now
-    foreach (FFmpegDecoderInstance* unsuitable_instance, non_ideal_contenders) {
-      unsuitable_instance->cache_lock()->unlock();
-    }
-  } while (!return_frame && !working_instance);
-
-  if (!return_frame && working_instance) {
-
-    // This instance SHOULD remain locked from our earlier loop, making this operation safe
-    working_instance->SetWorking(true);
-
-    // Retrieve frame
-    return_frame = working_instance->RetrieveFrame(target_ts, true);
-
-    // Set working to false and wake any threads waiting
-    working_instance->cache_lock()->lock();
-    working_instance->SetWorking(false);
-    working_instance->cache_wait_cond()->wakeAll();
-    working_instance->cache_lock()->unlock();
-  }
-
-  // We found the frame, we'll return a copy
-  if (return_frame) {
-    if (divider != scale_divider_) {
-      FreeScaler();
-      InitScaler(divider);
-    }
-
-    // Create frame to return
-    FramePtr copy = Frame::Create();
-    copy->set_video_params(VideoParams(vs->width(),
-                                       vs->height(),
-                                       native_pix_fmt_,
-                                       divider));
-    copy->set_timestamp(Timecode::timestamp_to_time(target_ts, time_base_));
-    copy->set_sample_aspect_ratio(aspect_ratio_);
-    copy->allocate();
-
-    // Align buffer to data/linesize points that can be passed to sws_scale
-    uint8_t* input_data[4];
-    int input_linesize[4];
-
-    av_image_fill_arrays(input_data,
-                         input_linesize,
-                         reinterpret_cast<const uint8_t*>(return_frame->data()),
-                         src_pix_fmt_,
-                         vs->width(),
-                         vs->height(),
-                         1);
-
-    // Convert frame to RGB/A for the rest of the pipeline
-    uint8_t* output_data = reinterpret_cast<uint8_t*>(copy->data());
-    int output_linesize = copy->linesize_bytes();
-
-    sws_scale(scale_ctx_,
-              input_data,
-              input_linesize,
-              0,
-              vs->height(),
-              &output_data,
-              &output_linesize);
-
-    return copy;
   }
 
   return nullptr;
@@ -436,8 +448,6 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
   AVFormatContext* fmt_ctx = nullptr;
   error_code = avformat_open_input(&fmt_ctx, filename, nullptr, nullptr);
 
-  QList<Stream*> streams_that_need_manual_duration;
-
   // Handle format context error
   if (error_code == 0) {
 
@@ -453,16 +463,72 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
 
       if (avstream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
 
-        // Create a video stream object
-        VideoStreamPtr video_stream = std::make_shared<VideoStream>();
+        bool image_is_still = false;
+        ImageStream::Interlacing interlacing = ImageStream::kInterlaceNone;
 
-        video_stream->set_width(avstream->codecpar->width);
-        video_stream->set_height(avstream->codecpar->height);
-        video_stream->set_format(GetNativePixelFormat(FFmpegCommon::GetCompatiblePixelFormat(static_cast<AVPixelFormat>(avstream->codecpar->format))));
-        video_stream->set_frame_rate(av_guess_frame_rate(fmt_ctx, avstream, nullptr));
-        video_stream->set_start_time(avstream->start_time);
+        {
+          // Read at least two frames to get more information about this video stream
+          AVPacket* pkt = av_packet_alloc();
+          AVFrame* frame = av_frame_alloc();
 
-        str = video_stream;
+          {
+            FFmpegDecoderInstance instance(filename, i);
+
+            // Read first frame and retrieve some metadata
+            if (instance.GetFrame(pkt, frame) >= 0) {
+              // Check if video is interlaced and what field dominance it has if so
+              if (frame->interlaced_frame) {
+                if (frame->top_field_first) {
+                  interlacing = ImageStream::kInterlacedTopFirst;
+                } else {
+                  interlacing = ImageStream::kInterlacedBottomFirst;
+                }
+              }
+            }
+
+            // Read second frame
+            int ret = instance.GetFrame(pkt, frame);
+
+            if (ret >= 0) {
+              // Check if we need a manual duration
+              if (avstream->duration == AV_NOPTS_VALUE) {
+                int64_t new_dur;
+
+                do {
+                  new_dur = frame->pts;
+                } while (instance.GetFrame(pkt, frame) >= 0);
+
+                avstream->duration = new_dur;
+              }
+            } else if (ret == AVERROR_EOF) {
+              // Video has only one frame in it, treat it like a still image
+              image_is_still = true;
+            }
+          }
+
+          av_frame_free(&frame);
+          av_packet_free(&pkt);
+        }
+
+        ImageStreamPtr image_stream;
+
+        if (image_is_still) {
+          image_stream = std::make_shared<ImageStream>();
+        } else {
+          VideoStreamPtr video_stream = std::make_shared<VideoStream>();
+
+          video_stream->set_frame_rate(av_guess_frame_rate(fmt_ctx, avstream, nullptr));
+          video_stream->set_start_time(avstream->start_time);
+
+          image_stream = video_stream;
+        }
+
+        image_stream->set_width(avstream->codecpar->width);
+        image_stream->set_height(avstream->codecpar->height);
+        image_stream->set_format(GetNativePixelFormat(FFmpegCommon::GetCompatiblePixelFormat(static_cast<AVPixelFormat>(avstream->codecpar->format))));
+        image_stream->set_interlacing(interlacing);
+
+        str = image_stream;
 
       } else if (avstream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
 
@@ -511,11 +577,6 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
       str->set_timebase(avstream->time_base);
       str->set_duration(avstream->duration);
 
-      // The container/stream info may not contain a duration, so we'll need to manually retrieve it
-      if (avstream->duration == AV_NOPTS_VALUE) {
-        streams_that_need_manual_duration.append(str.get());
-      }
-
       f->add_stream(str);
     }
 
@@ -523,51 +584,6 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
     result = true;
   }
 
-  // If the metadata did not contain a duration, we'll need to loop through the file to retrieve it
-  if (!streams_that_need_manual_duration.isEmpty()) {
-
-    AVPacket* pkt = av_packet_alloc();
-
-    QVector<int64_t> durations(streams_that_need_manual_duration.size());
-    durations.fill(0);
-
-    while (true) {
-      if (cancelled && *cancelled) {
-        break;
-      }
-
-      // Ensure previous buffers are cleared
-      av_packet_unref(pkt);
-
-      // Read packet from file
-      int ret = av_read_frame(fmt_ctx, pkt);
-
-      if (ret < 0) {
-        // Handle errors that aren't EOF (which simply means the file is finished)
-        if (ret != AVERROR_EOF) {
-          qWarning() << "Error while finding duration";
-        }
-        break;
-      } else {
-        for (int i=0;i<streams_that_need_manual_duration.size();i++) {
-          if (streams_that_need_manual_duration.at(i)->index() == pkt->stream_index
-              && pkt->pts > durations.at(i)) {
-            durations.replace(i, pkt->pts);
-          }
-        }
-      }
-    }
-
-    av_packet_free(&pkt);
-
-    if (!cancelled || !*cancelled) {
-      for (int i=0;i<streams_that_need_manual_duration.size();i++) {
-        streams_that_need_manual_duration.at(i)->set_duration(durations.at(i));
-      }
-    }
-
-  }
-
   // Free all memory
   avformat_close_input(&fmt_ctx);
 
@@ -795,6 +811,38 @@ uint64_t FFmpegDecoder::ValidateChannelLayout(AVStream* stream)
   return av_get_default_channel_layout(stream->codecpar->channels);
 }
 
+FramePtr FFmpegDecoder::BuffersToNativeFrame(int divider, int width, int height, int64_t ts, uint8_t** input_data, int* input_linesize)
+{
+  if (divider != scale_divider_) {
+    FreeScaler();
+    InitScaler(divider);
+  }
+
+  // Create frame to return
+  FramePtr copy = Frame::Create();
+  copy->set_video_params(VideoParams(width,
+                                     height,
+                                     native_pix_fmt_,
+                                     divider));
+  copy->set_timestamp(Timecode::timestamp_to_time(ts, time_base_));
+  copy->set_sample_aspect_ratio(aspect_ratio_);
+  copy->allocate();
+
+  // Convert frame to RGB/A for the rest of the pipeline
+  uint8_t* output_data = reinterpret_cast<uint8_t*>(copy->data());
+  int output_linesize = copy->linesize_bytes();
+
+  sws_scale(scale_ctx_,
+            input_data,
+            input_linesize,
+            0,
+            height,
+            &output_data,
+            &output_linesize);
+
+  return copy;
+}
+
 int FFmpegDecoderInstance::GetFrame(AVPacket *pkt, AVFrame *frame)
 {
   bool eof = false;
diff --git a/app/codec/ffmpeg/ffmpegdecoder.h b/app/codec/ffmpeg/ffmpegdecoder.h
index 009a9a5ae..0904bf9d1 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.h
+++ b/app/codec/ffmpeg/ffmpegdecoder.h
@@ -182,6 +182,8 @@ private:
 
   static uint64_t ValidateChannelLayout(AVStream *stream);
 
+  FramePtr BuffersToNativeFrame(int divider, int width, int height, int64_t ts, uint8_t **input_data, int* input_linesize);
+
   SwsContext* scale_ctx_;
   int scale_divider_;
   AVPixelFormat src_pix_fmt_;
diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
index 6f565aa33..d60e21df1 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
@@ -41,6 +41,21 @@ VideoStreamProperties::VideoStreamProperties(ImageStreamPtr stream) :
 
   int row = 0;
 
+  video_layout->addWidget(new QLabel(tr("Interlacing:")), row, 0);
+
+  video_interlace_combo_ = new QComboBox();
+
+  // These must match the Interlacing enum in ImageStream
+  video_interlace_combo_->addItem(tr("None (Progressive)"));
+  video_interlace_combo_->addItem(tr("Top-Field First"));
+  video_interlace_combo_->addItem(tr("Bottom-Field First"));
+
+  video_interlace_combo_->setCurrentIndex(stream->interlacing());
+
+  video_layout->addWidget(video_interlace_combo_, row, 1);
+
+  row++;
+
   video_layout->addWidget(new QLabel(tr("Color Space:")), row, 0);
 
   video_color_space_ = new QComboBox();
@@ -109,6 +124,7 @@ void VideoStreamProperties::Accept(QUndoCommand *parent)
     new VideoStreamChangeCommand(stream_,
                                  video_premultiply_alpha_->isChecked(),
                                  set_colorspace,
+                                 static_cast<ImageStream::Interlacing>(video_interlace_combo_->currentIndex()),
                                  parent);
   }
 
@@ -150,11 +166,13 @@ bool VideoStreamProperties::IsImageSequence(ImageStream *stream)
 VideoStreamProperties::VideoStreamChangeCommand::VideoStreamChangeCommand(ImageStreamPtr stream,
                                                                           bool premultiplied,
                                                                           QString colorspace,
+                                                                          ImageStream::Interlacing interlacing,
                                                                           QUndoCommand *parent) :
   UndoCommand(parent),
   stream_(stream),
   new_premultiplied_(premultiplied),
-  new_colorspace_(colorspace)
+  new_colorspace_(colorspace),
+  new_interlacing_(interlacing)
 {
 }
 
@@ -167,15 +185,18 @@ void VideoStreamProperties::VideoStreamChangeCommand::redo_internal()
 {
   old_premultiplied_ = stream_->premultiplied_alpha();
   old_colorspace_ = stream_->colorspace(false);
+  old_interlacing_ = stream_->interlacing();
 
   stream_->set_premultiplied_alpha(new_premultiplied_);
   stream_->set_colorspace(new_colorspace_);
+  stream_->set_interlacing(new_interlacing_);
 }
 
 void VideoStreamProperties::VideoStreamChangeCommand::undo_internal()
 {
   stream_->set_premultiplied_alpha(old_premultiplied_);
   stream_->set_colorspace(old_colorspace_);
+  stream_->set_interlacing(old_interlacing_);
 }
 
 VideoStreamProperties::ImageSequenceChangeCommand::ImageSequenceChangeCommand(VideoStreamPtr video_stream, int64_t start_index, int64_t duration, QUndoCommand *parent) :
diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.h b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
index 6bd164ab8..0770d6a07 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.h
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
@@ -58,6 +58,11 @@ private:
    */
   QComboBox* video_color_space_;
 
+  /**
+   * @brief Setting for video interlacing
+   */
+  QComboBox* video_interlace_combo_;
+
   /**
    * @brief Sets the start index for image sequences
    */
@@ -73,6 +78,7 @@ private:
     VideoStreamChangeCommand(ImageStreamPtr stream,
                              bool premultiplied,
                              QString colorspace,
+                             ImageStream::Interlacing interlacing,
                              QUndoCommand* parent = nullptr);
 
     virtual Project* GetRelevantProject() const override;
@@ -86,9 +92,11 @@ private:
 
     bool new_premultiplied_;
     QString new_colorspace_;
+    ImageStream::Interlacing new_interlacing_;
 
     bool old_premultiplied_;
     QString old_colorspace_;
+    ImageStream::Interlacing old_interlacing_;
 
   };
 
diff --git a/app/project/item/footage/imagestream.cpp b/app/project/item/footage/imagestream.cpp
index 41a9d0d23..fc74ac6e3 100644
--- a/app/project/item/footage/imagestream.cpp
+++ b/app/project/item/footage/imagestream.cpp
@@ -28,7 +28,8 @@
 OLIVE_NAMESPACE_ENTER
 
 ImageStream::ImageStream() :
-  premultiplied_alpha_(false)
+  premultiplied_alpha_(false),
+  interlacing_(kInterlaceNone)
 {
   set_type(kImage);
 }
diff --git a/app/project/item/footage/imagestream.h b/app/project/item/footage/imagestream.h
index 30fc712a2..78a700f77 100644
--- a/app/project/item/footage/imagestream.h
+++ b/app/project/item/footage/imagestream.h
@@ -75,6 +75,24 @@ public:
 
   QString get_colorspace_match_string() const;
 
+  enum Interlacing {
+    kInterlaceNone,
+    kInterlacedTopFirst,
+    kInterlacedBottomFirst
+  };
+
+  Interlacing interlacing() const
+  {
+    return interlacing_;
+  }
+
+  void set_interlacing(Interlacing i)
+  {
+    interlacing_ = i;
+
+    emit ParametersChanged();
+  }
+
 protected:
   virtual void FootageSetEvent(Footage*) override;
 
@@ -87,6 +105,7 @@ private:
   int height_;
   bool premultiplied_alpha_;
   QString colorspace_;
+  Interlacing interlacing_;
 
   PixelFormat::Format format_;
 
@@ -94,6 +113,7 @@ private slots:
   void ColorConfigChanged();
 
   void DefaultColorSpaceChanged();
+
 };
 
 using ImageStreamPtr = std::shared_ptr<ImageStream>;
diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp
index 148129721..5d9150388 100644
--- a/app/widget/timelinewidget/tool/import.cpp
+++ b/app/widget/timelinewidget/tool/import.cpp
@@ -216,7 +216,9 @@ void TimelineWidget::ImportTool::FootageToGhosts(rational ghost_start, const QLi
     QVector<int> track_offsets(Timeline::kTrackTypeCount);
     track_offsets.fill(track_start);
 
+    QVector<TimelineViewGhostItem*> footage_ghosts;
     rational footage_duration;
+    bool contains_image_stream = false;
 
     quint64 enabled_streams = footage.streams();
 
@@ -236,22 +238,21 @@ void TimelineWidget::ImportTool::FootageToGhosts(rational ghost_start, const QLi
       TimelineViewGhostItem* ghost = new TimelineViewGhostItem();
 
       if (stream->type() == Stream::kImage) {
-        // Stream is essentially length-less - use config's default image length
-        footage_duration = Config::Current()["DefaultStillLength"].value<rational>();
+        // Stream is essentially length-less - we may use the default still image length in config,
+        // or we may use another stream's length depending on the circumstance
+        contains_image_stream = true;
       } else {
         // Rescale stream duration to timeline timebase
         // Convert to rational time
         if (footage.footage()->workarea()->enabled()) {
-          footage_duration = footage.footage()->workarea()->range().length();
+          footage_duration = qMax(footage_duration, footage.footage()->workarea()->range().length());
           ghost->SetMediaIn(footage.footage()->workarea()->in());
         } else {
           int64_t stream_duration = Timecode::rescale_timestamp_ceil(stream->duration(), stream->timebase(), dest_tb);
-          footage_duration = Timecode::timestamp_to_time(stream_duration, dest_tb);
+          footage_duration = qMax(footage_duration, Timecode::timestamp_to_time(stream_duration, dest_tb));
         }
       }
 
-      ghost->SetIn(ghost_start);
-      ghost->SetOut(ghost_start + footage_duration);
       ghost->SetTrack(TrackReference(track_type, track_offsets.at(track_type)));
 
       // Increment track count for this track type
@@ -263,10 +264,22 @@ void TimelineWidget::ImportTool::FootageToGhosts(rational ghost_start, const QLi
       ghost->setData(TimelineViewGhostItem::kAttachedFootage, QVariant::fromValue(stream));
       ghost->SetMode(Timeline::kMove);
 
-      parent()->AddGhost(ghost);
+      footage_ghosts.append(ghost);
 
     }
 
+    if (contains_image_stream && footage_duration.isNull()) {
+      // Footage must ONLY be image streams so no duration value was found, use default in config
+      footage_duration = Config::Current()["DefaultStillLength"].value<rational>();
+    }
+
+    foreach (TimelineViewGhostItem* ghost, footage_ghosts) {
+      ghost->SetIn(ghost_start);
+      ghost->SetOut(ghost_start + footage_duration);
+
+      parent()->AddGhost(ghost);
+    }
+
     // Stack each ghost one after the other
     ghost_start += footage_duration;
 
diff --git a/app/widget/timelinewidget/tool/pointer.cpp b/app/widget/timelinewidget/tool/pointer.cpp
index 76a2ae157..6afac6c25 100644
--- a/app/widget/timelinewidget/tool/pointer.cpp
+++ b/app/widget/timelinewidget/tool/pointer.cpp
@@ -548,6 +548,9 @@ rational TimelineWidget::PointerTool::ValidateInTrimming(rational movement,
           }
           prev = prev->previous();
         }
+
+        // Limit in point at 0 on the timeline
+        earliest_in = qMax(rational(), earliest_in);
       }
     }
 

From ae62750d9dd994c84b1771935fbd662f5f8986b2 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 14 Jul 2020 22:31:11 +1000
Subject: [PATCH 065/138] various: fix broken transition creation

It's now possible to create transitions! But they're still broken in
a multitude of other ways so plenty more work to do hahahahahahahahaha
---
 app/core.cpp                                  | 12 +++-
 app/core.h                                    | 17 ++++-
 app/node/block/transition/CMakeLists.txt      |  3 +
 .../transition/crossdissolve/CMakeLists.txt   | 22 ++++++
 .../crossdissolve/crossdissolvetransition.cpp | 62 +++++++++++++++++
 .../crossdissolve/crossdissolvetransition.h   | 48 +++++++++++++
 .../transition/diptocolor/CMakeLists.txt      | 22 ++++++
 .../diptocolor/diptocolortransition.cpp       | 68 +++++++++++++++++++
 .../diptocolor/diptocolortransition.h         | 52 ++++++++++++++
 app/node/block/transition/transition.cpp      | 31 ++++++---
 app/node/block/transition/transition.h        |  5 ++
 app/node/factory.cpp                          | 17 ++++-
 app/node/factory.h                            |  9 ++-
 app/node/node.cpp                             |  2 +
 app/node/node.h                               |  1 +
 app/panel/tool/tool.cpp                       |  1 +
 app/shaders/crossdissolve.frag                |  3 +-
 app/shaders/diptoblack.frag                   | 24 +++----
 app/widget/timelinewidget/tool/transition.cpp | 10 ++-
 app/widget/toolbar/toolbar.cpp                | 22 +++++-
 app/widget/toolbar/toolbar.h                  | 17 +++++
 21 files changed, 415 insertions(+), 33 deletions(-)
 create mode 100644 app/node/block/transition/crossdissolve/CMakeLists.txt
 create mode 100644 app/node/block/transition/crossdissolve/crossdissolvetransition.cpp
 create mode 100644 app/node/block/transition/crossdissolve/crossdissolvetransition.h
 create mode 100644 app/node/block/transition/diptocolor/CMakeLists.txt
 create mode 100644 app/node/block/transition/diptocolor/diptocolortransition.cpp
 create mode 100644 app/node/block/transition/diptocolor/diptocolortransition.h

diff --git a/app/core.cpp b/app/core.cpp
index e8f34fcf4..d7014f408 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -281,16 +281,26 @@ const Tool::Item &Core::tool() const
   return tool_;
 }
 
-const Tool::AddableObject &Core::selected_addable_object() const
+const Tool::AddableObject &Core::GetSelectedAddableObject() const
 {
   return addable_object_;
 }
 
+const QString &Core::GetSelectedTransition() const
+{
+  return selected_transition_;
+}
+
 void Core::SetSelectedAddableObject(const Tool::AddableObject &obj)
 {
   addable_object_ = obj;
 }
 
+void Core::SetSelectedTransitionObject(const QString &obj)
+{
+  selected_transition_ = obj;
+}
+
 void Core::ClearOpenRecentList()
 {
   recent_projects_.clear();
diff --git a/app/core.h b/app/core.h
index 9b3d25728..1ead89b5c 100644
--- a/app/core.h
+++ b/app/core.h
@@ -114,7 +114,12 @@ public:
   /**
    * @brief Get the currently selected object that the add tool should make (if the add tool is active)
    */
-  const Tool::AddableObject& selected_addable_object() const;
+  const Tool::AddableObject& GetSelectedAddableObject() const;
+
+  /**
+   * @brief Get the currently selected node that the transition tool should make (if the transition tool is active)
+   */
+  const QString& GetSelectedTransition() const;
 
   /**
    * @brief Get current snapping value
@@ -341,6 +346,11 @@ public slots:
    */
   void SetSelectedAddableObject(const Tool::AddableObject& obj);
 
+  /**
+   * @brief Set the currently selected object that the add tool should make
+   */
+  void SetSelectedTransitionObject(const QString& obj);
+
   /**
    * @brief Clears the list of recently opened/saved projects
    */
@@ -456,6 +466,11 @@ private:
    */
   Tool::AddableObject addable_object_;
 
+  /**
+   * @brief Currently selected transition
+   */
+  QString selected_transition_;
+
   /**
    * @brief Current snapping setting
    */
diff --git a/app/node/block/transition/CMakeLists.txt b/app/node/block/transition/CMakeLists.txt
index 65f672588..4a380bc81 100644
--- a/app/node/block/transition/CMakeLists.txt
+++ b/app/node/block/transition/CMakeLists.txt
@@ -14,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+add_subdirectory(crossdissolve)
+add_subdirectory(diptocolor)
+
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
   node/block/transition/transition.h
diff --git a/app/node/block/transition/crossdissolve/CMakeLists.txt b/app/node/block/transition/crossdissolve/CMakeLists.txt
new file mode 100644
index 000000000..25c90ed8e
--- /dev/null
+++ b/app/node/block/transition/crossdissolve/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  node/block/transition/crossdissolve/crossdissolvetransition.h
+  node/block/transition/crossdissolve/crossdissolvetransition.cpp
+  PARENT_SCOPE
+)
diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp b/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp
new file mode 100644
index 000000000..c6d471030
--- /dev/null
+++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp
@@ -0,0 +1,62 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "crossdissolvetransition.h"
+
+OLIVE_NAMESPACE_ENTER
+
+CrossDissolveTransition::CrossDissolveTransition()
+{
+
+}
+
+Node *CrossDissolveTransition::copy() const
+{
+  return new CrossDissolveTransition();
+}
+
+QString CrossDissolveTransition::Name() const
+{
+  return tr("Cross Dissolve");
+}
+
+QString CrossDissolveTransition::id() const
+{
+  return QStringLiteral("org.olivevideoeditor.Olive.crossdissolve");
+}
+
+QList<Node::CategoryID> CrossDissolveTransition::Category() const
+{
+  return {kCategoryTransition};
+}
+
+QString CrossDissolveTransition::Description() const
+{
+  return tr("Smoothly transition between two clips.");
+}
+
+ShaderCode CrossDissolveTransition::GetShaderCode(const QString &shader_id) const
+{
+  Q_UNUSED(shader_id)
+
+  return ShaderCode(Node::ReadFileAsString(":/shaders/crossdissolve.frag"), QString());
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.h b/app/node/block/transition/crossdissolve/crossdissolvetransition.h
new file mode 100644
index 000000000..ccd8877d3
--- /dev/null
+++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.h
@@ -0,0 +1,48 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef CROSSDISSOLVETRANSITION_H
+#define CROSSDISSOLVETRANSITION_H
+
+#include "node/block/transition/transition.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class CrossDissolveTransition : public TransitionBlock
+{
+public:
+  CrossDissolveTransition();
+
+  virtual Node* copy() const override;
+
+  virtual QString Name() const override;
+  virtual QString id() const override;
+  virtual QList<CategoryID> Category() const override;
+  virtual QString Description() const override;
+
+  //virtual void Retranslate() override;
+
+  virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // CROSSDISSOLVETRANSITION_H
diff --git a/app/node/block/transition/diptocolor/CMakeLists.txt b/app/node/block/transition/diptocolor/CMakeLists.txt
new file mode 100644
index 000000000..7eb37f14d
--- /dev/null
+++ b/app/node/block/transition/diptocolor/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  node/block/transition/diptocolor/diptocolortransition.h
+  node/block/transition/diptocolor/diptocolortransition.cpp
+  PARENT_SCOPE
+)
diff --git a/app/node/block/transition/diptocolor/diptocolortransition.cpp b/app/node/block/transition/diptocolor/diptocolortransition.cpp
new file mode 100644
index 000000000..816c75011
--- /dev/null
+++ b/app/node/block/transition/diptocolor/diptocolortransition.cpp
@@ -0,0 +1,68 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "diptocolortransition.h"
+
+OLIVE_NAMESPACE_ENTER
+
+DipToColorTransition::DipToColorTransition()
+{
+  color_input_ = new NodeInput(QStringLiteral("color_in"), NodeParam::kColor, QVariant::fromValue(Color(0, 0, 0)));
+  AddInput(color_input_);
+}
+
+Node *DipToColorTransition::copy() const
+{
+  return new DipToColorTransition();
+}
+
+QString DipToColorTransition::Name() const
+{
+  return tr("Dip To Color");
+}
+
+QString DipToColorTransition::id() const
+{
+  return QStringLiteral("org.olivevideoeditor.Olive.diptocolor");
+}
+
+QList<Node::CategoryID> DipToColorTransition::Category() const
+{
+  return {kCategoryTransition};
+}
+
+QString DipToColorTransition::Description() const
+{
+  return tr("Transition between clips by dipping to a color.");
+}
+
+ShaderCode DipToColorTransition::GetShaderCode(const QString &shader_id) const
+{
+  Q_UNUSED(shader_id)
+
+  return ShaderCode(Node::ReadFileAsString(":/shaders/diptoblack.frag"), QString());
+}
+
+void DipToColorTransition::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &job) const
+{
+  job.InsertValue(color_input_, value);
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/node/block/transition/diptocolor/diptocolortransition.h b/app/node/block/transition/diptocolor/diptocolortransition.h
new file mode 100644
index 000000000..2c19443e1
--- /dev/null
+++ b/app/node/block/transition/diptocolor/diptocolortransition.h
@@ -0,0 +1,52 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef DIPTOCOLORTRANSITION_H
+#define DIPTOCOLORTRANSITION_H
+
+#include "node/block/transition/transition.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class DipToColorTransition : public TransitionBlock
+{
+public:
+  DipToColorTransition();
+
+  virtual Node* copy() const override;
+
+  virtual QString Name() const override;
+  virtual QString id() const override;
+  virtual QList<CategoryID> Category() const override;
+  virtual QString Description() const override;
+
+  virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
+
+protected:
+  virtual void ShaderJobEvent(NodeValueDatabase &value, ShaderJob& job) const override;
+
+private:
+  NodeInput* color_input_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // DIPTOCOLORTRANSITION_H
diff --git a/app/node/block/transition/transition.cpp b/app/node/block/transition/transition.cpp
index 3f820fd47..aa8a77c0a 100644
--- a/app/node/block/transition/transition.cpp
+++ b/app/node/block/transition/transition.cpp
@@ -131,6 +131,8 @@ double TransitionBlock::GetInProgress(const rational &time) const
 
 void TransitionBlock::Hash(QCryptographicHash &hash, const rational &time) const
 {
+  Node::Hash(hash, time);
+
   double all_prog = GetTotalProgress(time);
   double in_prog = GetInProgress(time);
   double out_prog = GetOutProgress(time);
@@ -138,14 +140,6 @@ void TransitionBlock::Hash(QCryptographicHash &hash, const rational &time) const
   hash.addData(reinterpret_cast<const char*>(&all_prog), sizeof(double));
   hash.addData(reinterpret_cast<const char*>(&in_prog), sizeof(double));
   hash.addData(reinterpret_cast<const char*>(&out_prog), sizeof(double));
-
-  if (out_block_input_->is_connected()) {
-    out_block_input_->get_connected_node()->Hash(hash, time);
-  }
-
-  if (in_block_input_->is_connected()) {
-    in_block_input_->get_connected_node()->Hash(hash, time);
-  }
 }
 
 double TransitionBlock::GetInternalTransitionTime(const rational &time) const
@@ -177,4 +171,25 @@ void TransitionBlock::BlockDisconnected(NodeEdgePtr edge)
   }
 }
 
+NodeValueTable TransitionBlock::Value(NodeValueDatabase &value) const
+{
+  ShaderJob job;
+
+  job.InsertValue(out_block_input(), value);
+  job.InsertValue(in_block_input(), value);
+  job.SetAlphaChannelRequired(true);
+
+  ShaderJobEvent(value, job);
+
+  NodeValueTable table = value.Merge();
+  table.Push(NodeParam::kShaderJob, QVariant::fromValue(job), this);
+  return table;
+}
+
+void TransitionBlock::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &job) const
+{
+  Q_UNUSED(value)
+  Q_UNUSED(job)
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/node/block/transition/transition.h b/app/node/block/transition/transition.h
index 62f4280b5..50d6ac204 100644
--- a/app/node/block/transition/transition.h
+++ b/app/node/block/transition/transition.h
@@ -49,6 +49,11 @@ public:
 
   virtual void Hash(QCryptographicHash& hash, const rational &time) const override;
 
+  virtual NodeValueTable Value(NodeValueDatabase &value) const override;
+
+protected:
+  virtual void ShaderJobEvent(NodeValueDatabase &value, ShaderJob& job) const;
+
 private:
   double GetInternalTransitionTime(const rational& time) const;
 
diff --git a/app/node/factory.cpp b/app/node/factory.cpp
index ee2fe3892..7c389f443 100644
--- a/app/node/factory.cpp
+++ b/app/node/factory.cpp
@@ -24,6 +24,8 @@
 #include "audio/volume/volume.h"
 #include "block/clip/clip.h"
 #include "block/gap/gap.h"
+#include "block/transition/crossdissolve/crossdissolvetransition.h"
+#include "block/transition/diptocolor/diptocolortransition.h"
 #include "generator/matrix/matrix.h"
 #include "generator/polygon/polygon.h"
 #include "generator/solid/solid.h"
@@ -48,7 +50,7 @@ void NodeFactory::Initialize()
 
   // Add internal types
   for (int i=0;i<kInternalNodeCount;i++) {
-    library_.append(CreateInternal(static_cast<InternalID>(i)));
+    library_.append(CreateFromFactoryIndex(static_cast<InternalID>(i)));
   }
 
   /*
@@ -63,7 +65,7 @@ void NodeFactory::Destroy()
   library_.clear();
 }
 
-Menu *NodeFactory::CreateMenu(QWidget* parent, bool create_none_item)
+Menu *NodeFactory::CreateMenu(QWidget* parent, bool create_none_item, Node::CategoryID restrict_to)
 {
   Menu* menu = new Menu(parent);
   menu->setToolTipsVisible(true);
@@ -71,6 +73,11 @@ Menu *NodeFactory::CreateMenu(QWidget* parent, bool create_none_item)
   for (int i=0;i<library_.size();i++) {
     Node* n = library_.at(i);
 
+    if (restrict_to != Node::kCategoryUnknown && !n->Category().contains(restrict_to)) {
+      // Skip this node
+      continue;
+    }
+
     // Make sure nodes are up-to-date with the current translation
     n->Retranslate();
 
@@ -165,7 +172,7 @@ Node *NodeFactory::CreateFromID(const QString &id)
   return nullptr;
 }
 
-Node *NodeFactory::CreateInternal(const NodeFactory::InternalID &id)
+Node *NodeFactory::CreateFromFactoryIndex(const NodeFactory::InternalID &id)
 {
   switch (id) {
   case kClipBlock:
@@ -204,6 +211,10 @@ Node *NodeFactory::CreateInternal(const NodeFactory::InternalID &id)
     return new StrokeFilterNode();
   case kTextGenerator:
     return new TextGenerator();
+  case kCrossDissolveTransition:
+    return new CrossDissolveTransition();
+  case kDipToColorTransition:
+    return new DipToColorTransition();
 
   case kInternalNodeCount:
     break;
diff --git a/app/node/factory.h b/app/node/factory.h
index b5c1b6f0f..6025070ef 100644
--- a/app/node/factory.h
+++ b/app/node/factory.h
@@ -50,6 +50,8 @@ public:
     kMerge,
     kStrokeFilter,
     kTextGenerator,
+    kCrossDissolveTransition,
+    kDipToColorTransition,
 
     // Count value
     kInternalNodeCount
@@ -61,7 +63,7 @@ public:
 
   static void Destroy();
 
-  static Menu* CreateMenu(QWidget *parent, bool create_none_item = false);
+  static Menu* CreateMenu(QWidget *parent, bool create_none_item = false, Node::CategoryID restrict_to = Node::kCategoryUnknown);
 
   static Node* CreateFromMenuAction(QAction* action);
 
@@ -71,10 +73,11 @@ public:
 
   static Node* CreateFromID(const QString& id);
 
-private:
-  static Node* CreateInternal(const InternalID& id);
+  static Node* CreateFromFactoryIndex(const InternalID& id);
 
+private:
   static QList<Node*> library_;
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/node/node.cpp b/app/node/node.cpp
index 840406ed8..46d615b60 100644
--- a/app/node/node.cpp
+++ b/app/node/node.cpp
@@ -668,6 +668,8 @@ QString Node::GetCategoryName(const CategoryID &c)
     return tr("Generator");
   case kCategoryChannels:
     return tr("Channel");
+  case kCategoryTransition:
+    return tr("Transition");
   case kCategoryUnknown:
   case kCategoryCount:
     break;
diff --git a/app/node/node.h b/app/node/node.h
index 11a69704f..eb3b272a2 100644
--- a/app/node/node.h
+++ b/app/node/node.h
@@ -70,6 +70,7 @@ public:
     kCategoryGeneral,
     kCategoryTimeline,
     kCategoryChannels,
+    kCategoryTransition,
 
     kCategoryCount
   };
diff --git a/app/panel/tool/tool.cpp b/app/panel/tool/tool.cpp
index ac8b1162d..7822ece90 100644
--- a/app/panel/tool/tool.cpp
+++ b/app/panel/tool/tool.cpp
@@ -42,6 +42,7 @@ ToolPanel::ToolPanel(QWidget *parent) :
   connect(Core::instance(), &Core::SnappingChanged, t, &Toolbar::SetSnapping);
 
   connect(t, &Toolbar::AddableObjectChanged, Core::instance(), &Core::SetSelectedAddableObject);
+  connect(t, &Toolbar::SelectedTransitionChanged, Core::instance(), &Core::SetSelectedTransitionObject);
 
   Retranslate();
 }
diff --git a/app/shaders/crossdissolve.frag b/app/shaders/crossdissolve.frag
index 22eb8e54f..2af4b17b4 100644
--- a/app/shaders/crossdissolve.frag
+++ b/app/shaders/crossdissolve.frag
@@ -19,8 +19,7 @@ void main(void) {
     }
 
     if (in_block_in_enabled) {
-        vec4 in_block_col = texture(in_block_in, ove_texcoord) * ove_tprog_all;
-        composite += in_block_col;
+        composite += texture(in_block_in, ove_texcoord) * ove_tprog_all;
     }
 
     fragColor = composite;
diff --git a/app/shaders/diptoblack.frag b/app/shaders/diptoblack.frag
index 064264506..b6e89dad3 100644
--- a/app/shaders/diptoblack.frag
+++ b/app/shaders/diptoblack.frag
@@ -4,7 +4,9 @@ uniform sampler2D out_block_in;
 uniform sampler2D in_block_in;
 uniform bool out_block_in_enabled;
 uniform bool in_block_in_enabled;
+uniform vec4 color_in;
 
+uniform float ove_tprog_all;
 uniform float ove_tprog_out;
 uniform float ove_tprog_in;
 
@@ -13,20 +15,16 @@ in vec2 ove_texcoord;
 out vec4 fragColor;
 
 void main(void) {
-    vec4 out_block_col;
-    vec4 in_block_col;
+    if (out_block_in_enabled && in_block_in_enabled) {
+        vec4 out_block_col = mix(texture(out_block_in, ove_texcoord), color_in, ove_tprog_out);
+        vec4 in_block_col = mix(texture(in_block_in, ove_texcoord), color_in, 1.0 - ove_tprog_in);
 
-    if (out_block_in_enabled) {
-        out_block_col = texture(out_block_in, ove_texcoord) * pow(ove_tprog_out, 2.0);
+        fragColor = out_block_col + in_block_col;
+    } else if (out_block_in_enabled) {
+        fragColor = mix(texture(out_block_in, ove_texcoord), color_in, ove_tprog_all);
+    } else if (in_block_in_enabled) {
+        fragColor = mix(texture(in_block_in, ove_texcoord), color_in, 1.0 - ove_tprog_all);
     } else {
-        out_block_col = vec4(0.0);
+        fragColor = vec4(0.0);
     }
-
-    if (in_block_in_enabled) {
-        in_block_col = texture(in_block_in, ove_texcoord) * pow(ove_tprog_in, 2.0);
-    } else {
-        in_block_col = vec4(0.0);
-    }
-
-    fragColor = out_block_col + in_block_col;
 }
diff --git a/app/widget/timelinewidget/tool/transition.cpp b/app/widget/timelinewidget/tool/transition.cpp
index 6592581e9..3b8f0ae40 100644
--- a/app/widget/timelinewidget/tool/transition.cpp
+++ b/app/widget/timelinewidget/tool/transition.cpp
@@ -20,6 +20,7 @@
 
 #include "widget/timelinewidget/timelinewidget.h"
 
+#include "node/block/transition/crossdissolve/crossdissolvetransition.h"
 #include "node/block/transition/transition.h"
 #include "node/factory.h"
 #include "widget/nodeview/nodeviewundo.h"
@@ -111,7 +112,14 @@ void TimelineWidget::TransitionTool::MouseRelease(TimelineViewMouseEvent *event)
 
   if (ghost_) {
     if (!ghost_->AdjustedLength().isNull()) {
-      TransitionBlock* transition = static_cast<TransitionBlock*>(NodeFactory::CreateFromID("org.olivevideoeditor.Olive.crossdissolve"));
+      TransitionBlock* transition;
+
+      if (Core::instance()->GetSelectedTransition().isEmpty()) {
+        // Fallback if the user hasn't selected one yet
+        transition = new CrossDissolveTransition();
+      } else {
+        transition = static_cast<TransitionBlock*>(NodeFactory::CreateFromID(Core::instance()->GetSelectedTransition()));
+      }
 
       QUndoCommand* command = new QUndoCommand();
 
diff --git a/app/widget/toolbar/toolbar.cpp b/app/widget/toolbar/toolbar.cpp
index c04a4661c..62bb3f5ab 100644
--- a/app/widget/toolbar/toolbar.cpp
+++ b/app/widget/toolbar/toolbar.cpp
@@ -25,8 +25,9 @@
 #include <QButtonGroup>
 #include <QEvent>
 
-#include "widget/menu/menu.h"
+#include "node/factory.h"
 #include "ui/icons/icons.h"
+#include "widget/menu/menu.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -54,6 +55,9 @@ Toolbar::Toolbar(QWidget *parent) :
   btn_snapping_toggle_ = CreateNonToolButton();
   connect(btn_snapping_toggle_, &QPushButton::clicked, this, &Toolbar::SnappingButtonClicked);
 
+  // Connect transition button to menu signal
+  connect(btn_transition_tool_, &QPushButton::clicked, this, &Toolbar::TransitionButtonClicked);
+
   // Connect add button to menu signal
   connect(btn_add_, &QPushButton::clicked, this, &Toolbar::AddButtonClicked);
 
@@ -181,9 +185,25 @@ void Toolbar::AddButtonClicked()
   m.exec(QCursor::pos());
 }
 
+void Toolbar::TransitionButtonClicked()
+{
+  Menu* m = NodeFactory::CreateMenu(this, false, Node::kCategoryTransition);
+
+  connect(m, &QMenu::triggered, this, &Toolbar::TransitionMenuItemTriggered);
+
+  m->exec(QCursor::pos());
+
+  delete m;
+}
+
 void Toolbar::AddMenuItemTriggered(QAction* a)
 {
   emit AddableObjectChanged(static_cast<Tool::AddableObject>(a->data().toInt()));
 }
 
+void Toolbar::TransitionMenuItemTriggered(QAction *a)
+{
+  emit SelectedTransitionChanged(NodeFactory::GetIDFromMenuAction(a));
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/toolbar/toolbar.h b/app/widget/toolbar/toolbar.h
index 2f315e738..74c48167d 100644
--- a/app/widget/toolbar/toolbar.h
+++ b/app/widget/toolbar/toolbar.h
@@ -113,6 +113,11 @@ signals:
    */
   void AddableObjectChanged(const Tool::AddableObject& obj);
 
+  /**
+   * @brief Emitted when the selected transition is changed from the transition tool menu
+   */
+  void SelectedTransitionChanged(const QString& id);
+
 private:
   /**
    * @brief Reset all strings based on the currently selected language
@@ -210,11 +215,23 @@ private slots:
    */
   void AddButtonClicked();
 
+  /**
+   * @brief Receiver for the transition button
+   *
+   * The transition button pops up a list for which transition to create.
+   */
+  void TransitionButtonClicked();
+
   /**
    * @brief Receiver for the menu created by AddButtonClicked()
    */
   void AddMenuItemTriggered(QAction* a);
 
+  /**
+   * @brief Receiver for the menu created by TransitionButtonClicked()
+   */
+  void TransitionMenuItemTriggered(QAction* a);
+
 };
 
 OLIVE_NAMESPACE_EXIT

From fdfadd88589aac6eb949cc5aac60651e4c7109e7 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 14 Jul 2020 22:32:01 +1000
Subject: [PATCH 066/138] add tool: use new class directly rather than text ID

Minor code improvement/optimization.
---
 app/widget/timelinewidget/tool/add.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/widget/timelinewidget/tool/add.cpp b/app/widget/timelinewidget/tool/add.cpp
index a7a34a1f7..58b4e44de 100644
--- a/app/widget/timelinewidget/tool/add.cpp
+++ b/app/widget/timelinewidget/tool/add.cpp
@@ -22,6 +22,8 @@
 
 #include "core.h"
 #include "node/factory.h"
+#include "node/generator/solid/solid.h"
+#include "node/generator/text/text.h"
 #include "widget/nodeview/nodeviewundo.h"
 
 OLIVE_NAMESPACE_ENTER
@@ -44,7 +46,7 @@ void TimelineWidget::AddTool::MousePress(TimelineViewMouseEvent *event)
 
   Timeline::TrackType add_type = Timeline::kTrackTypeNone;
 
-  switch (Core::instance()->selected_addable_object()) {
+  switch (Core::instance()->GetSelectedAddableObject()) {
   case OLIVE_NAMESPACE::Tool::kAddableBars:
   case OLIVE_NAMESPACE::Tool::kAddableSolid:
   case OLIVE_NAMESPACE::Tool::kAddableTitle:
@@ -97,7 +99,7 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event)
 
       ClipBlock* clip = new ClipBlock();
       clip->set_length_and_media_out(ghost_->AdjustedLength());
-      clip->SetLabel(OLIVE_NAMESPACE::Tool::GetAddableObjectName(Core::instance()->selected_addable_object()));
+      clip->SetLabel(OLIVE_NAMESPACE::Tool::GetAddableObjectName(Core::instance()->GetSelectedAddableObject()));
 
       NodeGraph* graph = static_cast<NodeGraph*>(parent()->GetConnectedNode()->parent());
 
@@ -111,13 +113,13 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event)
                                  ghost_->GetAdjustedIn(),
                                  command);
 
-      switch (Core::instance()->selected_addable_object()) {
+      switch (Core::instance()->GetSelectedAddableObject()) {
       case OLIVE_NAMESPACE::Tool::kAddableEmpty:
         // Empty, nothing to be done
         break;
       case OLIVE_NAMESPACE::Tool::kAddableSolid:
       {
-        Node* solid = NodeFactory::CreateFromID(QStringLiteral("org.olivevideoeditor.Olive.solidgenerator"));
+        Node* solid = new SolidGenerator();
 
         new NodeAddCommand(graph,
                            solid,
@@ -128,7 +130,7 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event)
       }
       case OLIVE_NAMESPACE::Tool::kAddableTitle:
       {
-        Node* text = NodeFactory::CreateFromID(QStringLiteral("org.olivevideoeditor.Olive.textgenerator"));
+        Node* text = new TextGenerator();
 
         new NodeAddCommand(graph,
                            text,
@@ -140,7 +142,7 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event)
       case OLIVE_NAMESPACE::Tool::kAddableBars:
       case OLIVE_NAMESPACE::Tool::kAddableTone:
         // Not implemented yet
-        qWarning() << "Unimplemented add object:" << Core::instance()->selected_addable_object();
+        qWarning() << "Unimplemented add object:" << Core::instance()->GetSelectedAddableObject();
         break;
       case OLIVE_NAMESPACE::Tool::kAddableCount:
         // Invalid value, do nothing

From e67b801a50afbdf879a089898def61eaf94a778a Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 14 Jul 2020 22:32:27 +1000
Subject: [PATCH 067/138] renderer: treat buffer inputs as texture inputs when
 appropriate

Fixes bug where a null buffer would not set a null texture.
---
 app/render/backend/opengl/openglproxy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/render/backend/opengl/openglproxy.cpp b/app/render/backend/opengl/openglproxy.cpp
index 08aa8864c..32c24f92d 100644
--- a/app/render/backend/opengl/openglproxy.cpp
+++ b/app/render/backend/opengl/openglproxy.cpp
@@ -288,7 +288,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
     // This variable is used in the shader, let's set it
     const QVariant& value = it.value().data();
 
-    const NodeParam::DataType& data_type = (it.value().type() != NodeParam::kNone)
+    NodeParam::DataType data_type = (it.value().type() != NodeParam::kNone)
         ? it.value().type()
         : it.key()->data_type();
 
@@ -340,6 +340,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
     case NodeInput::kBoolean:
       shader->setUniformValue(variable_location, value.toBool());
       break;
+    case NodeInput::kBuffer:
     case NodeInput::kTexture:
     {
       OpenGLTextureCache::ReferencePtr texture = value.value<OpenGLTextureCache::ReferencePtr>();
@@ -392,7 +393,6 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
     case NodeInput::kSampleJob:
     case NodeInput::kGenerateJob:
     case NodeInput::kFootage:
-    case NodeInput::kBuffer:
     case NodeInput::kNone:
     case NodeInput::kAny:
       break;

From de74adeb5e2501e3c3a802358f201a9ae0deeeb5 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 16 Jul 2020 00:32:00 +1000
Subject: [PATCH 068/138] nodes: improved changed signal processing

Improves stability and cache reliability.

Earlier iterations were prone to skipping necessary signals (usually
leading to some sort of assert fail), particularly when track
optimizations were used. Those optimizations have been moved to the
viewer node so there's a higher degree of control over which signals
get optimized and in which ways.
---
 app/node/block/block.cpp                | 10 ----
 app/node/block/block.h                  |  2 -
 app/node/node.cpp                       | 27 ++++++++--
 app/node/node.h                         | 13 +++++
 app/node/output/track/track.cpp         | 70 ++++++++++---------------
 app/node/output/track/track.h           | 11 ----
 app/node/output/viewer/viewer.cpp       | 41 ++++++++++-----
 app/node/output/viewer/viewer.h         |  6 +++
 app/widget/timelinewidget/undo/undo.cpp | 66 +++++++++++------------
 9 files changed, 128 insertions(+), 118 deletions(-)

diff --git a/app/node/block/block.cpp b/app/node/block/block.cpp
index f46179786..222bc042d 100644
--- a/app/node/block/block.cpp
+++ b/app/node/block/block.cpp
@@ -355,16 +355,6 @@ NodeInput *Block::speed_input() const
   return speed_input_;
 }
 
-void Block::InvalidateCache(const TimeRange &range, NodeInput *from, NodeInput *source)
-{
-  if (range.out() <= in() || range.in() >= out()) {
-    // Ignore this range
-    return;
-  }
-
-  Node::InvalidateCache(TimeRange(qMax(range.in(), in()), qMin(range.out(), out())), from, source);
-}
-
 void Block::Hash(QCryptographicHash &, const rational &) const
 {
   // A block does nothing by default, so we hash nothing
diff --git a/app/node/block/block.h b/app/node/block/block.h
index 5694d4391..09182e7ea 100644
--- a/app/node/block/block.h
+++ b/app/node/block/block.h
@@ -88,8 +88,6 @@ public:
   NodeInput* media_in_input() const;
   NodeInput* speed_input() const;
 
-  virtual void InvalidateCache(const TimeRange& range, NodeInput* from, NodeInput* source) override;
-
   virtual void Hash(QCryptographicHash &hash, const rational &time) const override;
 
 public slots:
diff --git a/app/node/node.cpp b/app/node/node.cpp
index 46d615b60..051575c05 100644
--- a/app/node/node.cpp
+++ b/app/node/node.cpp
@@ -177,6 +177,28 @@ void Node::InvalidateCache(const TimeRange &range, NodeInput *from, NodeInput *s
   SendInvalidateCache(range, source);
 }
 
+void Node::BeginOperation()
+{
+  foreach (NodeParam* param, params_) {
+    if (param->type() == NodeParam::kOutput) {
+      foreach (NodeEdgePtr edge, param->edges()) {
+        edge->input()->parentNode()->BeginOperation();
+      }
+    }
+  }
+}
+
+void Node::EndOperation()
+{
+  foreach (NodeParam* param, params_) {
+    if (param->type() == NodeParam::kOutput) {
+      foreach (NodeEdgePtr edge, param->edges()) {
+        edge->input()->parentNode()->EndOperation();
+      }
+    }
+  }
+}
+
 TimeRange Node::InputTimeAdjustment(NodeInput *, const TimeRange &input_time) const
 {
   // Default behavior is no time adjustment at all
@@ -195,10 +217,7 @@ void Node::SendInvalidateCache(const TimeRange &range, NodeInput *source)
   foreach (NodeParam* param, params_) {
     // If the Node is an output, relay the signal to any Nodes that are connected to it
     if (param->type() == NodeParam::kOutput) {
-
-      QVector<NodeEdgePtr> edges = param->edges();
-
-      foreach (NodeEdgePtr edge, edges) {
+      foreach (NodeEdgePtr edge, param->edges()) {
         NodeInput* connected_input = edge->input();
         Node* connected_node = connected_input->parentNode();
 
diff --git a/app/node/node.h b/app/node/node.h
index eb3b272a2..9260ed44f 100644
--- a/app/node/node.h
+++ b/app/node/node.h
@@ -304,6 +304,19 @@ public:
    */
   virtual void InvalidateCache(const TimeRange& range, NodeInput* from, NodeInput* source);
 
+  /**
+   * @brief Limits cache invalidation temporarily
+   *
+   * If you intend to do a number of operations in quick succession, you can optimize it by running
+   * this function with EndOperation().
+   */
+  virtual void BeginOperation();
+
+  /**
+   * @brief Stops limiting cache invalidation and flushes changes
+   */
+  virtual void EndOperation();
+
   /**
    * @brief Adjusts time that should be sent to nodes connected to certain inputs.
    *
diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp
index 96c2f6145..daa15748a 100644
--- a/app/node/output/track/track.cpp
+++ b/app/node/output/track/track.cpp
@@ -31,10 +31,8 @@ OLIVE_NAMESPACE_ENTER
 
 TrackOutput::TrackOutput() :
   track_type_(Timeline::kTrackTypeNone),
-  block_invalidate_cache_stack_(0),
   index_(-1),
-  locked_(false),
-  queued_length_change_(false)
+  locked_(false)
 {
   block_input_ = new NodeInputArray("block_in", NodeParam::kAny);
   block_input_->set_is_keyframable(false);
@@ -252,11 +250,24 @@ const QList<Block *> &TrackOutput::Blocks() const
 
 void TrackOutput::InvalidateCache(const TimeRange &range, NodeInput *from, NodeInput *source)
 {
-  if (block_invalidate_cache_stack_ == 0) {
-    PushLengthChangeSignal(true);
+  TimeRange limited;
 
-    Node::InvalidateCache(TimeRange(qMax(range.in(), rational(0)), qMin(range.out(), track_length())), from, source);
+  if (block_input_->sub_params().contains(from)
+      && from->get_connected_node()
+      && from->get_connected_node()->IsBlock()) {
+    // Limit the range signal to the corresponding block
+    Block* b = static_cast<Block*>(from->get_connected_node());
+
+    if (range.out() <= b->in() || range.in() >= b->out()) {
+      return;
+    }
+
+    limited = TimeRange(qMax(range.in(), b->in()), qMin(range.out(), b->out()));
+  } else {
+    limited = TimeRange(qMax(range.in(), rational(0)), qMin(range.out(), track_length()));
   }
+
+  Node::InvalidateCache(limited, from, source);
 }
 
 void TrackOutput::InsertBlockBefore(Block* block, Block* after)
@@ -279,12 +290,12 @@ void TrackOutput::InsertBlockAfter(Block *block, Block *before)
 
 void TrackOutput::PrependBlock(Block *block)
 {
-  BlockInvalidateCache();
+  BeginOperation();
 
   block_input_->Prepend();
   NodeParam::ConnectEdge(block->output(), block_input_->First());
 
-  UnblockInvalidateCache();
+  EndOperation();
 
   // Everything has shifted at this point
   InvalidateCache(TimeRange(0, track_length()), block_input_, block_input_);
@@ -292,57 +303,47 @@ void TrackOutput::PrependBlock(Block *block)
 
 void TrackOutput::InsertBlockAtIndex(Block *block, int index)
 {
-  BlockInvalidateCache();
+  BeginOperation();
 
   int insert_index = GetInputIndexFromCacheIndex(index);
   block_input_->InsertAt(insert_index);
   NodeParam::ConnectEdge(block->output(),
                          block_input_->At(insert_index));
 
-  UnblockInvalidateCache();
+  EndOperation();
 
   InvalidateCache(TimeRange(block->in(), track_length()), block_input_, block_input_);
 }
 
 void TrackOutput::AppendBlock(Block *block)
 {
-  BlockInvalidateCache();
+  BeginOperation();
 
   block_input_->Append();
   NodeParam::ConnectEdge(block->output(), block_input_->Last());
 
-  UnblockInvalidateCache();
+  EndOperation();
 
   // Invalidate area that block was added to
   InvalidateCache(TimeRange(block->in(), track_length()), block_input_, block_input_);
 }
 
-void TrackOutput::BlockInvalidateCache()
-{
-  block_invalidate_cache_stack_++;
-}
-
-void TrackOutput::UnblockInvalidateCache()
-{
-  block_invalidate_cache_stack_--;
-}
-
 void TrackOutput::RippleRemoveBlock(Block *block)
 {
-  BlockInvalidateCache();
+  BeginOperation();
 
   rational remove_in = block->in();
 
   block_input_->RemoveAt(GetInputIndexFromCacheIndex(block));
 
-  UnblockInvalidateCache();
+  EndOperation();
 
   InvalidateCache(TimeRange(remove_in, track_length()), block_input_, block_input_);
 }
 
 void TrackOutput::ReplaceBlock(Block *old, Block *replace)
 {
-  BlockInvalidateCache();
+  BeginOperation();
 
   int index_of_old_block = GetInputIndexFromCacheIndex(old);
 
@@ -352,7 +353,7 @@ void TrackOutput::ReplaceBlock(Block *old, Block *replace)
   NodeParam::ConnectEdge(replace->output(),
                          block_input_->At(index_of_old_block));
 
-  UnblockInvalidateCache();
+  EndOperation();
 
   if (old->length() == replace->length()) {
     InvalidateCache(TimeRange(replace->in(), replace->out()), block_input_, block_input_);
@@ -443,14 +444,6 @@ void TrackOutput::Hash(QCryptographicHash &hash, const rational &time) const
   }
 }
 
-void TrackOutput::PushLengthChangeSignal(bool invalidate)
-{
-  if (queued_length_change_) {
-    queued_length_change_ = false;
-    SetLengthInternal(queued_length_, invalidate);
-  }
-}
-
 void TrackOutput::SetTrackName(const QString &name)
 {
   track_name_ = name;
@@ -507,15 +500,6 @@ int TrackOutput::GetInputIndexFromCacheIndex(Block *block)
 
 void TrackOutput::SetLengthInternal(const rational &r, bool invalidate)
 {
-  if (block_invalidate_cache_stack_ > 0) {
-    queued_length_change_ = true;
-  }
-
-  if (queued_length_change_) {
-    queued_length_ = r;
-    return;
-  }
-
   if (r != track_length_) {
     TimeRange invalidate_range(track_length_, r);
 
diff --git a/app/node/output/track/track.h b/app/node/output/track/track.h
index 35c444a0e..ad658bcd2 100644
--- a/app/node/output/track/track.h
+++ b/app/node/output/track/track.h
@@ -166,10 +166,6 @@ public:
    */
   void ReplaceBlock(Block* old, Block* replace);
 
-  void BlockInvalidateCache();
-
-  void UnblockInvalidateCache();
-
   static TrackOutput* TrackFromBlock(const Block *block);
 
   const rational& track_length() const;
@@ -192,8 +188,6 @@ public:
 
   virtual void Hash(QCryptographicHash& hash, const rational &time) const override;
 
-  void PushLengthChangeSignal(bool invalidate = false);
-
   AudioVisualWaveform& waveform()
   {
     return waveform_;
@@ -274,15 +268,10 @@ private:
 
   QString track_name_;
 
-  int block_invalidate_cache_stack_;
-
   int index_;
 
   bool locked_;
 
-  bool queued_length_change_;
-  rational queued_length_;
-
   AudioVisualWaveform waveform_;
   QMutex waveform_lock_;
 
diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp
index b5b0f495b..457ce99de 100644
--- a/app/node/output/viewer/viewer.cpp
+++ b/app/node/output/viewer/viewer.cpp
@@ -26,7 +26,8 @@ OLIVE_NAMESPACE_ENTER
 
 ViewerOutput::ViewerOutput() :
   video_frame_cache_(this),
-  audio_playback_cache_(this)
+  audio_playback_cache_(this),
+  operation_stack_(0)
 {
   texture_input_ = new NodeInput("tex_in", NodeInput::kTexture);
   AddInput(texture_input_);
@@ -49,7 +50,7 @@ ViewerOutput::ViewerOutput() :
     TrackList* list = new TrackList(this, static_cast<Timeline::TrackType>(i), track_input);
     track_lists_.replace(i, list);
     connect(list, &TrackList::TrackListChanged, this, &ViewerOutput::UpdateTrackCache);
-    connect(list, &TrackList::LengthChanged, this, &ViewerOutput::VerifyLength);
+    //connect(list, &TrackList::LengthChanged, this, &ViewerOutput::VerifyLength);
     connect(list, &TrackList::BlockAdded, this, &ViewerOutput::TrackListAddedBlock);
     connect(list, &TrackList::BlockRemoved, this, &ViewerOutput::BlockRemoved);
     connect(list, &TrackList::TrackAdded, this, &ViewerOutput::TrackListAddedTrack);
@@ -111,20 +112,22 @@ void ViewerOutput::InvalidateCache(const TimeRange &range, NodeInput *from, Node
 {
   emit GraphChangedFrom(source);
 
-  if (from == texture_input_ || from == samples_input_) {
-    TimeRange invalidated_range(qMax(rational(), range.in()),
-                                qMin(GetLength(), range.out()));
+  if (operation_stack_ == 0) {
+    if (from == texture_input_ || from == samples_input_) {
+      TimeRange invalidated_range(qMax(rational(), range.in()),
+                                  qMin(GetLength(), range.out()));
 
-    if (invalidated_range.in() != invalidated_range.out()) {
-      if (from == texture_input_) {
-        video_frame_cache_.Invalidate(invalidated_range);
-      } else {
-        audio_playback_cache_.Invalidate(invalidated_range);
+      if (invalidated_range.in() != invalidated_range.out()) {
+        if (from == texture_input_) {
+          video_frame_cache_.Invalidate(invalidated_range);
+        } else {
+          audio_playback_cache_.Invalidate(invalidated_range);
+        }
       }
     }
-  }
 
-  VerifyLength();
+    VerifyLength();
+  }
 
   Node::InvalidateCache(range, from, source);
 }
@@ -257,6 +260,20 @@ void ViewerOutput::set_media_name(const QString &name)
   emit MediaNameChanged(media_name_);
 }
 
+void ViewerOutput::BeginOperation()
+{
+  operation_stack_++;
+
+  Node::BeginOperation();
+}
+
+void ViewerOutput::EndOperation()
+{
+  operation_stack_--;
+
+  Node::EndOperation();
+}
+
 void ViewerOutput::TrackListAddedBlock(Block *block, int index)
 {
   Timeline::TrackType type = static_cast<TrackList*>(sender())->type();
diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h
index b2ebb3b34..e57406c46 100644
--- a/app/node/output/viewer/viewer.h
+++ b/app/node/output/viewer/viewer.h
@@ -118,6 +118,10 @@ public:
     return &audio_playback_cache_;
   }
 
+  virtual void BeginOperation() override;
+
+  virtual void EndOperation() override;
+
 signals:
   void TimebaseChanged(const rational&);
 
@@ -164,6 +168,8 @@ private:
 
   AudioPlaybackCache audio_playback_cache_;
 
+  int operation_stack_;
+
 private slots:
   void UpdateTrackCache();
 
diff --git a/app/widget/timelinewidget/undo/undo.cpp b/app/widget/timelinewidget/undo/undo.cpp
index 9b03b5bec..ce66be641 100644
--- a/app/widget/timelinewidget/undo/undo.cpp
+++ b/app/widget/timelinewidget/undo/undo.cpp
@@ -202,7 +202,7 @@ void TrackRippleRemoveAreaCommand::redo_internal()
     }
   }
 
-  track_->BlockInvalidateCache();
+  track_->BeginOperation();
 
   // If we picked up a block to splice
   if (splice_) {
@@ -273,7 +273,7 @@ void TrackRippleRemoveAreaCommand::redo_internal()
     }
   }
 
-  track_->UnblockInvalidateCache();
+  track_->EndOperation();
 
   track_->InvalidateCache(TimeRange(in_, insert_ ? out_ : RATIONAL_MAX),
                           track_->block_input(),
@@ -282,7 +282,7 @@ void TrackRippleRemoveAreaCommand::redo_internal()
 
 void TrackRippleRemoveAreaCommand::undo_internal()
 {
-  track_->BlockInvalidateCache();
+  track_->BeginOperation();
 
   // If we were given a block to insert, insert it here
   if (insert_ != nullptr) {
@@ -330,7 +330,7 @@ void TrackRippleRemoveAreaCommand::undo_internal()
 
   }
 
-  track_->UnblockInvalidateCache();
+  track_->EndOperation();
 
   track_->InvalidateCache(TimeRange(in_, insert_ ? out_ : RATIONAL_MAX), track_->block_input(), track_->block_input());
 }
@@ -432,7 +432,7 @@ Project *BlockSplitCommand::GetRelevantProject() const
 
 void BlockSplitCommand::redo_internal()
 {
-  track_->BlockInvalidateCache();
+  track_->BeginOperation();
 
   static_cast<NodeGraph*>(block_->parent())->AddNode(new_block_);
   Node::CopyInputs(block_, new_block_);
@@ -450,12 +450,12 @@ void BlockSplitCommand::redo_internal()
     NodeParam::ConnectEdge(new_block_->output(), transition);
   }
 
-  track_->UnblockInvalidateCache();
+  track_->EndOperation();
 }
 
 void BlockSplitCommand::undo_internal()
 {
-  track_->BlockInvalidateCache();
+  track_->BeginOperation();
 
   block_->set_length_and_media_out(old_length_);
   track_->RippleRemoveBlock(new_block_);
@@ -467,7 +467,7 @@ void BlockSplitCommand::undo_internal()
     NodeParam::ConnectEdge(block_->output(), transition);
   }
 
-  track_->UnblockInvalidateCache();
+  track_->EndOperation();
 }
 
 Block *BlockSplitCommand::new_block()
@@ -856,7 +856,7 @@ Project *BlockTrimCommand::GetRelevantProject() const
 
 void BlockTrimCommand::redo_internal()
 {
-  track_->BlockInvalidateCache();
+  track_->BeginOperation();
 
   // Will be POSITIVE if trimming shorter and NEGATIVE if trimming longer
   rational trim_diff = old_length_ - new_length_;
@@ -923,14 +923,14 @@ void BlockTrimCommand::redo_internal()
     }
   }
 
-  track_->UnblockInvalidateCache();
+  track_->EndOperation();
 
   track_->InvalidateCache(invalidate_range, track_->block_input(), track_->block_input());
 }
 
 void BlockTrimCommand::undo_internal()
 {
-  track_->BlockInvalidateCache();
+  track_->BeginOperation();
 
   // Will be POSITIVE if trimming shorter and NEGATIVE if trimming longer
   rational trim_diff = old_length_ - new_length_;
@@ -979,7 +979,7 @@ void BlockTrimCommand::undo_internal()
     invalidate_range = TimeRange(block_->out(), block_->out() - trim_diff);
   }
 
-  track_->UnblockInvalidateCache();
+  track_->EndOperation();
 
   track_->InvalidateCache(invalidate_range, track_->block_input(), track_->block_input());
 }
@@ -1003,7 +1003,7 @@ void TrackReplaceBlockWithGapCommand::redo_internal()
 {
   TimeRange invalidate_range;
 
-  track_->BlockInvalidateCache();
+  track_->BeginOperation();
 
   // If the block has no next, it's at the end of the track and there's no need to create a gap
   if (block_->next()) {
@@ -1062,7 +1062,7 @@ void TrackReplaceBlockWithGapCommand::redo_internal()
     invalidate_range = TimeRange(earliest_change, RATIONAL_MAX);
   }
 
-  track_->UnblockInvalidateCache();
+  track_->EndOperation();
 
   track_->InvalidateCache(invalidate_range, track_->block_input(), track_->block_input());
 }
@@ -1071,7 +1071,7 @@ void TrackReplaceBlockWithGapCommand::undo_internal()
 {
   TimeRange invalidate_range;
 
-  track_->BlockInvalidateCache();
+  track_->BeginOperation();
 
   if (gap_) {
 
@@ -1116,7 +1116,7 @@ void TrackReplaceBlockWithGapCommand::undo_internal()
 
   merged_gap_ = nullptr;
 
-  track_->UnblockInvalidateCache();
+  track_->EndOperation();
 
   track_->InvalidateCache(invalidate_range, track_->block_input(), track_->block_input());
 }
@@ -1156,7 +1156,7 @@ void TrackSlideCommand::slide_internal(bool undo)
 
   // Perform trims
   foreach (const BlockSlideInfo& info, blocks_) {
-    info.track->BlockInvalidateCache();
+    info.track->BeginOperation();
 
     if (info.mode == Timeline::kTrimIn || info.mode == Timeline::kTrimOut) {
       rational new_len = undo ? info.old_time : info.new_time;
@@ -1176,7 +1176,7 @@ void TrackSlideCommand::slide_internal(bool undo)
       added_gaps_.append(gap);
     }
 
-    info.track->UnblockInvalidateCache();
+    info.track->EndOperation();
   }
 
   if (undo) {
@@ -1184,12 +1184,12 @@ void TrackSlideCommand::slide_internal(bool undo)
     foreach (GapBlock* gap, added_gaps_) {
       TrackOutput* track = TrackOutput::TrackFromBlock(gap);
 
-      track->BlockInvalidateCache();
+      track->BeginOperation();
 
       track->RippleRemoveBlock(gap);
       delete TakeNodeFromParentGraph(gap);
 
-      track->UnblockInvalidateCache();
+      track->EndOperation();
     }
 
     added_gaps_.clear();
@@ -1253,7 +1253,7 @@ void TrackListRippleRemoveAreaCommand::redo_internal()
     }
 
     foreach (TrackOutput* track, working_tracks_) {
-      track->BlockInvalidateCache();
+      track->BeginOperation();
     }
   }
 
@@ -1263,8 +1263,7 @@ void TrackListRippleRemoveAreaCommand::redo_internal()
 
   if (all_tracks_unlocked_) {
     foreach (TrackOutput* track, working_tracks_) {
-      track->UnblockInvalidateCache();
-      track->PushLengthChangeSignal();
+      track->EndOperation();
     }
   }
 }
@@ -1281,7 +1280,7 @@ void TrackListRippleRemoveAreaCommand::undo_internal()
     }
 
     foreach (TrackOutput* track, working_tracks_) {
-      track->BlockInvalidateCache();
+      track->BeginOperation();
     }
   }
 
@@ -1291,8 +1290,7 @@ void TrackListRippleRemoveAreaCommand::undo_internal()
 
   if (all_tracks_unlocked_) {
     foreach (TrackOutput* track, working_tracks_) {
-      track->UnblockInvalidateCache();
-      track->PushLengthChangeSignal();
+      track->EndOperation();
     }
   }
 }
@@ -1338,7 +1336,7 @@ void TrackListRippleToolCommand::redo_internal()
   if (all_tracks_unlocked_) {
     // We can do some optimization here
     foreach (const RippleInfo& info, info_) {
-      info.track->BlockInvalidateCache();
+      info.track->BeginOperation();
     }
 
     old_latest_pt = RATIONAL_MIN;
@@ -1415,15 +1413,13 @@ void TrackListRippleToolCommand::redo_internal()
     }
 
     foreach (const RippleInfo& info, info_) {
-      info.track->UnblockInvalidateCache();
+      info.track->EndOperation();
 
       // FIXME: Untested, is this desirable behavior?
       if (earliest_pt < new_latest_pt) {
         info.track->InvalidateCache(TimeRange(earliest_pt, new_latest_pt),
                                     info.track->block_input(),
                                     info.track->block_input());
-      } else {
-        info.track->PushLengthChangeSignal();
       }
     }
   }
@@ -1505,7 +1501,7 @@ void TrackListInsertGaps::redo_internal()
     }
 
     foreach (TrackOutput* track, working_tracks_) {
-      track->BlockInvalidateCache();
+      track->BeginOperation();
     }
   }
 
@@ -1545,8 +1541,7 @@ void TrackListInsertGaps::redo_internal()
 
   if (all_tracks_unlocked_) {
     foreach (TrackOutput* track, working_tracks_) {
-      track->UnblockInvalidateCache();
-      track->PushLengthChangeSignal(false);
+      track->EndOperation();
     }
   }
 }
@@ -1562,7 +1557,7 @@ void TrackListInsertGaps::undo_internal()
     }
 
     foreach (TrackOutput* track, working_tracks_) {
-      track->BlockInvalidateCache();
+      track->BeginOperation();
     }
   }
 
@@ -1588,8 +1583,7 @@ void TrackListInsertGaps::undo_internal()
 
   if (all_tracks_unlocked_) {
     foreach (TrackOutput* track, working_tracks_) {
-      track->UnblockInvalidateCache();
-      track->PushLengthChangeSignal(false);
+      track->EndOperation();
     }
   }
 }

From 662d66ad1021519bbe4507eb48d4eb95dceaabca Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 16 Jul 2020 00:36:21 +1000
Subject: [PATCH 069/138] transitions: extended transition logic

General code and functionality improvements. Moved more code out of the
OpenGL backend for portability. Implemented audio transitions.
Implemented basic transition animation curve settings.
---
 .../crossdissolve/crossdissolvetransition.cpp |  27 ++++
 .../crossdissolve/crossdissolvetransition.h   |   3 +
 app/node/block/transition/transition.cpp      | 127 +++++++++++++++---
 app/node/block/transition/transition.h        |  22 ++-
 app/node/traverser.cpp                        |  15 ++-
 app/node/traverser.h                          |   2 +
 app/render/backend/opengl/openglproxy.cpp     |  30 ++---
 app/render/backend/renderworker.cpp           |  13 +-
 app/render/shaderinfo.h                       |  18 ++-
 app/shaders/crossdissolve.frag                |  19 ++-
 10 files changed, 224 insertions(+), 52 deletions(-)

diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp b/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp
index c6d471030..2dfe7ace4 100644
--- a/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp
+++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp
@@ -59,4 +59,31 @@ ShaderCode CrossDissolveTransition::GetShaderCode(const QString &shader_id) cons
   return ShaderCode(Node::ReadFileAsString(":/shaders/crossdissolve.frag"), QString());
 }
 
+void CrossDissolveTransition::SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const
+{
+  for (int i=0; i<out_samples->sample_count(); i++) {
+    double this_sample_time = out_samples->audio_params().samples_to_time(i).toDouble() + time_in;
+    double progress = GetTotalProgress(this_sample_time);
+
+    for (int j=0; j<out_samples->audio_params().channel_count(); j++) {
+      out_samples->data()[j][i] = 0;
+
+      if (from_samples) {
+        if (i < from_samples->sample_count()) {
+          out_samples->data()[j][i] += from_samples->data()[j][i] * TransformCurve(1.0 - progress);
+        }
+      }
+
+      if (to_samples) {
+        // Offset input samples from the end
+        int in_index = i - (out_samples->sample_count() - to_samples->sample_count());
+
+        if (in_index >= 0) {
+          out_samples->data()[j][i] += to_samples->data()[j][in_index] * TransformCurve(progress);
+        }
+      }
+    }
+  }
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.h b/app/node/block/transition/crossdissolve/crossdissolvetransition.h
index ccd8877d3..965267e83 100644
--- a/app/node/block/transition/crossdissolve/crossdissolvetransition.h
+++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.h
@@ -41,6 +41,9 @@ public:
 
   virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
 
+protected:
+  virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const;
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/node/block/transition/transition.cpp b/app/node/block/transition/transition.cpp
index aa8a77c0a..abf79edc2 100644
--- a/app/node/block/transition/transition.cpp
+++ b/app/node/block/transition/transition.cpp
@@ -28,17 +28,22 @@ TransitionBlock::TransitionBlock() :
   connected_out_block_(nullptr),
   connected_in_block_(nullptr)
 {
-  out_block_input_ = new NodeInput("out_block_in", NodeParam::kBuffer);
+  out_block_input_ = new NodeInput(QStringLiteral("out_block_in"), NodeParam::kBuffer);
   out_block_input_->set_is_keyframable(false);
   connect(out_block_input_, &NodeParam::EdgeAdded, this, &TransitionBlock::BlockConnected);
   connect(out_block_input_, &NodeParam::EdgeRemoved, this, &TransitionBlock::BlockDisconnected);
   AddInput(out_block_input_);
 
-  in_block_input_ = new NodeInput("in_block_in", NodeParam::kBuffer);
+  in_block_input_ = new NodeInput(QStringLiteral("in_block_in"), NodeParam::kBuffer);
   in_block_input_->set_is_keyframable(false);
   connect(in_block_input_, &NodeParam::EdgeAdded, this, &TransitionBlock::BlockConnected);
   connect(in_block_input_, &NodeParam::EdgeRemoved, this, &TransitionBlock::BlockDisconnected);
   AddInput(in_block_input_);
+
+  curve_input_ = new NodeInput(QStringLiteral("curve_in"), NodeParam::kCombo);
+  curve_input_->set_is_keyframable(false);
+  curve_input_->set_connectable(false);
+  AddInput(curve_input_);
 }
 
 Block::Type TransitionBlock::type() const
@@ -62,6 +67,10 @@ void TransitionBlock::Retranslate()
 
   out_block_input_->set_name(tr("From"));
   in_block_input_->set_name(tr("To"));
+  curve_input_->set_name(tr("Curve"));
+
+  // These must correspond to the CurveType enum
+  curve_input_->set_combobox_strings({ tr("Linear"), tr("Exponential"), tr("Logarithmic") });
 }
 
 rational TransitionBlock::in_offset() const
@@ -106,12 +115,12 @@ Block *TransitionBlock::connected_in_block() const
   return connected_in_block_;
 }
 
-double TransitionBlock::GetTotalProgress(const rational &time) const
+double TransitionBlock::GetTotalProgress(const double &time) const
 {
   return GetInternalTransitionTime(time) / length().toDouble();
 }
 
-double TransitionBlock::GetOutProgress(const rational &time) const
+double TransitionBlock::GetOutProgress(const double &time) const
 {
   if (out_offset() == 0) {
     return 0;
@@ -120,7 +129,7 @@ double TransitionBlock::GetOutProgress(const rational &time) const
   return clamp(1.0 - (GetInternalTransitionTime(time) / out_offset().toDouble()), 0.0, 1.0);
 }
 
-double TransitionBlock::GetInProgress(const rational &time) const
+double TransitionBlock::GetInProgress(const double &time) const
 {
   if (in_offset() == 0) {
     return 0;
@@ -133,18 +142,34 @@ void TransitionBlock::Hash(QCryptographicHash &hash, const rational &time) const
 {
   Node::Hash(hash, time);
 
-  double all_prog = GetTotalProgress(time);
-  double in_prog = GetInProgress(time);
-  double out_prog = GetOutProgress(time);
+  double time_dbl = time.toDouble();
+  double all_prog = GetTotalProgress(time_dbl);
+  double in_prog = GetInProgress(time_dbl);
+  double out_prog = GetOutProgress(time_dbl);
 
   hash.addData(reinterpret_cast<const char*>(&all_prog), sizeof(double));
   hash.addData(reinterpret_cast<const char*>(&in_prog), sizeof(double));
   hash.addData(reinterpret_cast<const char*>(&out_prog), sizeof(double));
 }
 
-double TransitionBlock::GetInternalTransitionTime(const rational &time) const
+double TransitionBlock::GetInternalTransitionTime(const double &time) const
 {
-  return time.toDouble() - in().toDouble();
+  return time - in().toDouble();
+}
+
+void TransitionBlock::InsertTransitionTimes(AcceleratedJob *job, const double &time) const
+{
+  // Provides total transition progress from 0.0 (start) - 1.0 (end)
+  job->InsertValue(QStringLiteral("ove_tprog_all"),
+                   NodeValue(NodeParam::kFloat, GetTotalProgress(time), this));
+
+  // Provides progress of out section from 1.0 (start) - 0.0 (end)
+  job->InsertValue(QStringLiteral("ove_tprog_out"),
+                   NodeValue(NodeParam::kFloat, GetOutProgress(time), this));
+
+  // Provides progress of in section from 0.0 (start) - 1.0 (end)
+  job->InsertValue(QStringLiteral("ove_tprog_in"),
+                   NodeValue(NodeParam::kFloat, GetInProgress(time), this));
 }
 
 void TransitionBlock::BlockConnected(NodeEdgePtr edge)
@@ -173,16 +198,62 @@ void TransitionBlock::BlockDisconnected(NodeEdgePtr edge)
 
 NodeValueTable TransitionBlock::Value(NodeValueDatabase &value) const
 {
-  ShaderJob job;
+  NodeParam::DataType data_type;
 
-  job.InsertValue(out_block_input(), value);
-  job.InsertValue(in_block_input(), value);
-  job.SetAlphaChannelRequired(true);
+  if (out_block_input()->is_connected()) {
+    data_type = value[out_block_input()].GetWithMeta(NodeParam::kBuffer).type();
+  } else if (in_block_input()->is_connected()) {
+    data_type = value[in_block_input()].GetWithMeta(NodeParam::kBuffer).type();
+  } else {
+    data_type = NodeParam::kNone;
+  }
 
-  ShaderJobEvent(value, job);
+  NodeParam::DataType job_type;
+  QVariant push_job;
+
+  if (data_type == NodeParam::kTexture) {
+    // This must be a visual transition
+    ShaderJob job;
+
+    job.InsertValue(out_block_input(), value);
+    job.InsertValue(in_block_input(), value);
+    job.InsertValue(curve_input_, value);
+    job.SetAlphaChannelRequired(true);
+
+    double time = value[QStringLiteral("global")].Get(NodeParam::kFloat, QStringLiteral("time_in")).toDouble();
+    InsertTransitionTimes(&job, time);
+
+    ShaderJobEvent(value, job);
+
+    job_type = NodeParam::kShaderJob;
+    push_job = QVariant::fromValue(job);
+  } else if (data_type == NodeParam::kSamples) {
+    // This must be an audio transition
+    SampleBufferPtr from_samples = value[out_block_input()].Take(NodeParam::kBuffer).value<SampleBufferPtr>();
+    SampleBufferPtr to_samples = value[in_block_input()].Take(NodeParam::kBuffer).value<SampleBufferPtr>();
+
+    if (from_samples || to_samples) {
+      double time_in = value[QStringLiteral("global")].Get(NodeParam::kFloat, QStringLiteral("time_in")).toDouble();
+      double time_out = value[QStringLiteral("global")].Get(NodeParam::kFloat, QStringLiteral("time_out")).toDouble();
+
+      const AudioParams& params = (from_samples) ? from_samples->audio_params() : to_samples->audio_params();
+
+      int nb_samples = params.time_to_samples(time_out - time_in);
+
+      SampleBufferPtr out_samples = SampleBuffer::CreateAllocated(params, nb_samples);
+      SampleJobEvent(from_samples, to_samples, out_samples, time_in);
+
+      job_type = NodeParam::kSamples;
+      push_job = QVariant::fromValue(out_samples);
+    }
+  }
 
   NodeValueTable table = value.Merge();
-  table.Push(NodeParam::kShaderJob, QVariant::fromValue(job), this);
+
+  if (!push_job.isNull()) {
+    table.Push(job_type, push_job, this);
+  }
+
   return table;
 }
 
@@ -192,4 +263,28 @@ void TransitionBlock::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &job) c
   Q_UNUSED(job)
 }
 
+void TransitionBlock::SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const
+{
+  Q_UNUSED(from_samples)
+  Q_UNUSED(to_samples)
+  Q_UNUSED(out_samples)
+  Q_UNUSED(time_in)
+}
+
+double TransitionBlock::TransformCurve(double linear) const
+{
+  switch (static_cast<CurveType>(curve_input_->get_standard_value().toInt())) {
+  case kLinear:
+    break;
+  case kExponential:
+    linear *= linear;
+    break;
+  case kLogarithmic:
+    linear = qSqrt(linear);
+    break;
+  }
+
+  return linear;
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/node/block/transition/transition.h b/app/node/block/transition/transition.h
index 50d6ac204..34a6f074d 100644
--- a/app/node/block/transition/transition.h
+++ b/app/node/block/transition/transition.h
@@ -43,9 +43,9 @@ public:
   Block* connected_out_block() const;
   Block* connected_in_block() const;
 
-  double GetTotalProgress(const rational& time) const;
-  double GetOutProgress(const rational& time) const;
-  double GetInProgress(const rational& time) const;
+  double GetTotalProgress(const double &time) const;
+  double GetOutProgress(const double &time) const;
+  double GetInProgress(const double &time) const;
 
   virtual void Hash(QCryptographicHash& hash, const rational &time) const override;
 
@@ -54,13 +54,27 @@ public:
 protected:
   virtual void ShaderJobEvent(NodeValueDatabase &value, ShaderJob& job) const;
 
+  virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const;
+
+  double TransformCurve(double linear) const;
+
 private:
-  double GetInternalTransitionTime(const rational& time) const;
+  enum CurveType {
+    kLinear,
+    kExponential,
+    kLogarithmic
+  };
+
+  double GetInternalTransitionTime(const double &time) const;
+
+  void InsertTransitionTimes(AcceleratedJob* job, const double& time) const;
 
   NodeInput* out_block_input_;
 
   NodeInput* in_block_input_;
 
+  NodeInput* curve_input_;
+
   Block* connected_out_block_;
 
   Block* connected_in_block_;
diff --git a/app/node/traverser.cpp b/app/node/traverser.cpp
index d613060c8..5ba40748f 100644
--- a/app/node/traverser.cpp
+++ b/app/node/traverser.cpp
@@ -41,11 +41,7 @@ NodeValueDatabase NodeTraverser::GenerateDatabase(const Node* node, const TimeRa
     database.Insert(input, ProcessInput(input, input_time));
   }
 
-  // Insert global variables
-  NodeValueTable global;
-  global.Push(NodeParam::kFloat, range.in().toDouble(), nullptr, QStringLiteral("time_in"));
-  global.Push(NodeParam::kFloat, range.out().toDouble(), nullptr, QStringLiteral("time_out"));
-  database.Insert(QStringLiteral("global"), global);
+  AddGlobalsToDatabase(database, range);
 
   return database;
 }
@@ -156,6 +152,15 @@ QVariant NodeTraverser::GetCachedFrame(const Node *node, const rational &time)
   return QVariant();
 }
 
+void NodeTraverser::AddGlobalsToDatabase(NodeValueDatabase &db, const TimeRange& range)
+{
+  // Insert global variables
+  NodeValueTable global;
+  global.Push(NodeParam::kFloat, range.in().toDouble(), nullptr, QStringLiteral("time_in"));
+  global.Push(NodeParam::kFloat, range.out().toDouble(), nullptr, QStringLiteral("time_out"));
+  db.Insert(QStringLiteral("global"), global);
+}
+
 void NodeTraverser::PostProcessTable(const Node *node, const TimeRange &range, NodeValueTable &output_params)
 {
   bool got_cached_frame = false;
diff --git a/app/node/traverser.h b/app/node/traverser.h
index e9e1523fc..e9a377ae4 100644
--- a/app/node/traverser.h
+++ b/app/node/traverser.h
@@ -56,6 +56,8 @@ protected:
 
   virtual QVariant GetCachedFrame(const Node *node, const rational &time);
 
+  static void AddGlobalsToDatabase(NodeValueDatabase& db, const TimeRange &range);
+
 private:
   void PostProcessTable(const Node *node, const TimeRange &range, NodeValueTable &output_params);
 
diff --git a/app/render/backend/opengl/openglproxy.cpp b/app/render/backend/opengl/openglproxy.cpp
index 32c24f92d..fff23b55d 100644
--- a/app/render/backend/opengl/openglproxy.cpp
+++ b/app/render/backend/opengl/openglproxy.cpp
@@ -279,18 +279,21 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
   NodeValueMap::const_iterator it;
   for (it=job.GetValues().constBegin(); it!=job.GetValues().constEnd(); it++) {
     // See if the shader has takes this parameter as an input
-    int variable_location = shader->uniformLocation(it.key()->id());
+    int variable_location = shader->uniformLocation(it.key());
 
     if (variable_location == -1) {
       continue;
     }
 
+    // See if this value corresponds to an input (NOTE: it may not and this may be null)
+    NodeInput* corresponding_input = node->GetInputWithID(it.key());
+
     // This variable is used in the shader, let's set it
     const QVariant& value = it.value().data();
 
     NodeParam::DataType data_type = (it.value().type() != NodeParam::kNone)
         ? it.value().type()
-        : it.key()->data_type();
+        : corresponding_input->data_type();
 
     switch (data_type) {
     case NodeInput::kInt:
@@ -300,7 +303,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
       shader->setUniformValue(variable_location, value.toFloat());
       break;
     case NodeInput::kVec2:
-      if (it.key()->IsArray()) {
+      if (corresponding_input && corresponding_input->IsArray()) {
         QVector<NodeValue> nv = value.value< QVector<NodeValue> >();
         QVector<QVector2D> a(nv.size());
 
@@ -310,7 +313,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
 
         shader->setUniformValueArray(variable_location, a.constData(), a.size());
 
-        int count_location = shader->uniformLocation(QStringLiteral("%1_count").arg(it.key()->id()));
+        int count_location = shader->uniformLocation(QStringLiteral("%1_count").arg(it.key()));
         if (count_location > -1) {
           shader->setUniformValue(count_location, a.size());
         }
@@ -355,7 +358,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
       shader->setUniformValue(variable_location, textures_to_bind.size());
 
       // If this texture binding is the iterative input, set it here
-      if (it.key() == job.GetIterativeInput()) {
+      if (corresponding_input && corresponding_input == job.GetIterativeInput()) {
         iterative_input = textures_to_bind.size();
       }
 
@@ -363,7 +366,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
       textures_to_bind.append(tex_id);
 
       // Set enable flag if shader wants it
-      int enable_param_location = shader->uniformLocation(QStringLiteral("%1_enabled").arg(it.key()->id()));
+      int enable_param_location = shader->uniformLocation(QStringLiteral("%1_enabled").arg(it.key()));
       if (enable_param_location > -1) {
         shader->setUniformValue(enable_param_location,
                                 tex_id > 0);
@@ -371,7 +374,7 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
 
       if (tex_id > 0) {
         // Set texture resolution if shader wants it
-        int res_param_location = shader->uniformLocation(QStringLiteral("%1_resolution").arg(it.key()->id()));
+        int res_param_location = shader->uniformLocation(QStringLiteral("%1_resolution").arg(it.key()));
         if (res_param_location > -1) {
           shader->setUniformValue(res_param_location,
                                   static_cast<GLfloat>(texture->texture()->width() * texture->texture()->divider()),
@@ -404,19 +407,6 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
                           static_cast<GLfloat>(params.width()),
                           static_cast<GLfloat>(params.height()));
 
-  if (node->IsBlock() && static_cast<const Block*>(node)->type() == Block::kTransition) {
-    const TransitionBlock* transition_node = static_cast<const TransitionBlock*>(node);
-
-    // Provides total transition progress from 0.0 (start) - 1.0 (end)
-    shader->setUniformValue("ove_tprog_all", static_cast<GLfloat>(transition_node->GetTotalProgress(range.in())));
-
-    // Provides progress of out section from 1.0 (start) - 0.0 (end)
-    shader->setUniformValue("ove_tprog_out", static_cast<GLfloat>(transition_node->GetOutProgress(range.in())));
-
-    // Provides progress of in section from 0.0 (start) - 1.0 (end)
-    shader->setUniformValue("ove_tprog_in", static_cast<GLfloat>(transition_node->GetInProgress(range.in())));
-  }
-
   shader->release();
 
   // Create the output textures
diff --git a/app/render/backend/renderworker.cpp b/app/render/backend/renderworker.cpp
index 37de178b4..31194a105 100644
--- a/app/render/backend/renderworker.cpp
+++ b/app/render/backend/renderworker.cpp
@@ -230,9 +230,20 @@ QVariant RenderWorker::ProcessSamples(const Node *node, const TimeRange &range,
     // Update all non-sample and non-footage inputs
     NodeValueMap::const_iterator j;
     for (j=job.GetValues().constBegin(); j!=job.GetValues().constEnd(); j++) {
-      value_db.Insert(j.key(), ProcessInput(j.key(), TimeRange(this_sample_time, this_sample_time)));
+      NodeValueTable value;
+      NodeInput* corresponding_input = node->GetInputWithID(j.key());
+
+      if (corresponding_input) {
+        value = ProcessInput(corresponding_input, TimeRange(this_sample_time, this_sample_time));
+      } else {
+        value.Push(j.value());
+      }
+
+      value_db.Insert(j.key(), value);
     }
 
+    AddGlobalsToDatabase(value_db, TimeRange(this_sample_time, this_sample_time));
+
     node->ProcessSamples(value_db,
                          job.samples(),
                          output_buffer,
diff --git a/app/render/shaderinfo.h b/app/render/shaderinfo.h
index 9db03d9e0..1fa685e2b 100644
--- a/app/render/shaderinfo.h
+++ b/app/render/shaderinfo.h
@@ -8,13 +8,18 @@
 
 OLIVE_NAMESPACE_ENTER
 
-using NodeValueMap = QHash<NodeInput*, NodeValue>;
+using NodeValueMap = QHash<QString, NodeValue>;
 
 class AcceleratedJob {
 public:
   AcceleratedJob() = default;
 
   NodeValue GetValue(NodeInput* input) const
+  {
+    return value_map_.value(input->id());
+  }
+
+  NodeValue GetValue(const QString& input) const
   {
     return value_map_.value(input);
   }
@@ -31,15 +36,20 @@ public:
         values[j] = value[subparam].TakeWithMeta(subparam->data_type());
       }
 
-      value_map_.insert(input, NodeValue(NodeParam::kVec2, QVariant::fromValue(values), input->parentNode()));
+      InsertValue(input->id(), NodeValue(NodeParam::kVec2, QVariant::fromValue(values), input->parentNode()));
     } else {
-      value_map_.insert(input, value[input].TakeWithMeta(input->data_type()));
+      InsertValue(input->id(), value[input].TakeWithMeta(input->data_type()));
     }
   }
 
+  void InsertValue(const QString& input, const NodeValue& value)
+  {
+    value_map_.insert(input, value);
+  }
+
   void InsertValue(NodeInput* input, const NodeValue& value)
   {
-    value_map_.insert(input, value);
+    value_map_.insert(input->id(), value);
   }
 
   const NodeValueMap &GetValues() const
diff --git a/app/shaders/crossdissolve.frag b/app/shaders/crossdissolve.frag
index 2af4b17b4..e9461244c 100644
--- a/app/shaders/crossdissolve.frag
+++ b/app/shaders/crossdissolve.frag
@@ -1,9 +1,14 @@
 #version 150
 
+#define LINEAR_CURVE 0
+#define EXPONENTIAL_CURVE 1
+#define LOGARITHMIC_CURVE 2
+
 uniform sampler2D out_block_in;
 uniform sampler2D in_block_in;
 uniform bool out_block_in_enabled;
 uniform bool in_block_in_enabled;
+uniform int curve_in;
 
 uniform float ove_tprog_all;
 
@@ -11,15 +16,25 @@ in vec2 ove_texcoord;
 
 out vec4 fragColor;
 
+float TransformCurve(float linear) {
+    if (curve_in == EXPONENTIAL_CURVE) {
+        return linear * linear;
+    } else if (curve_in == LOGARITHMIC_CURVE) {
+        return sqrt(linear);
+    } else {
+        return linear;
+    }
+}
+
 void main(void) {
     vec4 composite = vec4(0.0);
 
     if (out_block_in_enabled) {
-        composite += texture(out_block_in, ove_texcoord) * (1.0 - ove_tprog_all);
+        composite += texture(out_block_in, ove_texcoord) * TransformCurve(1.0 - ove_tprog_all);
     }
 
     if (in_block_in_enabled) {
-        composite += texture(in_block_in, ove_texcoord) * ove_tprog_all;
+        composite += texture(in_block_in, ove_texcoord) * TransformCurve(ove_tprog_all);
     }
 
     fragColor = composite;

From 6309b8fbb7637d9ef38cfa0462f0fe685476eccc Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 17 Jul 2020 12:33:28 +1000
Subject: [PATCH 070/138] math: fixed power function

Corrected shader code and fixed bug in widget bridge that reported an
incorrect index.
---
 app/node/math/math/mathbase.cpp                      | 11 ++++++++++-
 .../nodeparamview/nodeparamviewwidgetbridge.cpp      | 12 +++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/node/math/math/mathbase.cpp b/app/node/math/math/mathbase.cpp
index b5ee9d76d..4a793af93 100644
--- a/app/node/math/math/mathbase.cpp
+++ b/app/node/math/math/mathbase.cpp
@@ -65,7 +65,16 @@ ShaderCode MathNodeBase::GetShaderCodeInternal(const QString &shader_id, NodeInp
       operation = QStringLiteral("%1 / %2");
       break;
     case kOpPower:
-      operation = QStringLiteral("pow(%1, %2)");
+      if (pairing == kPairTextureNumber) {
+        // The "number" in this operation has to be declared a vec4
+        if (type_a & NodeParam::kNumber) {
+          operation = QStringLiteral("pow(%2, vec4(%1))");
+        } else {
+          operation = QStringLiteral("pow(%1, vec4(%2))");
+        }
+      } else {
+        operation = QStringLiteral("pow(%1, %2)");
+      }
       break;
     }
 
diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
index 9950864d7..456323238 100644
--- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
+++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp
@@ -363,7 +363,17 @@ void NodeParamViewWidgetBridge::WidgetCallback()
   case NodeParam::kCombo:
   {
     // Widget is a QComboBox
-    SetInputValue(static_cast<QComboBox*>(widgets_.first())->currentIndex(), 0);
+    QComboBox* cb = static_cast<QComboBox*>(widgets_.first());
+    int index = cb->currentIndex();
+
+    // Subtract any splitters up until this point
+    for (int i=index-1; i>=0; i--) {
+      if (cb->itemData(i, Qt::AccessibleDescriptionRole).toString() == QStringLiteral("separator")) {
+        index--;
+      }
+    }
+
+    SetInputValue(index, 0);
     break;
   }
   }

From f4da255b35a40ae0f3ca0d13f65408cd8b97a951 Mon Sep 17 00:00:00 2001
From: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date: Fri, 17 Jul 2020 17:35:29 +0100
Subject: [PATCH 071/138] Attempt to fix CI build errors.

---
 .../block/transition/crossdissolve/crossdissolvetransition.h    | 2 +-
 app/window/mainwindow/mainwindow.cpp                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.h b/app/node/block/transition/crossdissolve/crossdissolvetransition.h
index 965267e83..e45d1de67 100644
--- a/app/node/block/transition/crossdissolve/crossdissolvetransition.h
+++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.h
@@ -42,7 +42,7 @@ public:
   virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
 
 protected:
-  virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const;
+  virtual void SampleJobEvent(SampleBufferPtr from_samples, SampleBufferPtr to_samples, SampleBufferPtr out_samples, double time_in) const override;
 
 };
 
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index c34ee5764..4825c9b61 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -358,7 +358,7 @@ void MainWindow::SetApplicationProgressStatus(ProgressStatus status)
       taskbar_interface_->SetProgressState(reinterpret_cast<HWND>(this->winId()), TBPF_NORMAL);
       break;
     case kProgressNone:
-      taskbar_interface_->SetProgressState(reinterpret_ cast<HWND>(this->winId()), TBPF_NOPROGRESS);
+      taskbar_interface_->SetProgressState(reinterpret_cast<HWND>(this->winId()), TBPF_NOPROGRESS);
       break;
     case kProgressError:
       taskbar_interface_->SetProgressState(reinterpret_cast<HWND>(this->winId()), TBPF_ERROR);

From d54d59fac6c63361f15d16f2688d8d5abba5568b Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 19 Jul 2020 11:33:51 +1000
Subject: [PATCH 072/138] transition: remove alpha channel requirement

---
 app/node/block/transition/transition.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/node/block/transition/transition.cpp b/app/node/block/transition/transition.cpp
index abf79edc2..0fb644e94 100644
--- a/app/node/block/transition/transition.cpp
+++ b/app/node/block/transition/transition.cpp
@@ -218,7 +218,6 @@ NodeValueTable TransitionBlock::Value(NodeValueDatabase &value) const
     job.InsertValue(out_block_input(), value);
     job.InsertValue(in_block_input(), value);
     job.InsertValue(curve_input_, value);
-    job.SetAlphaChannelRequired(true);
 
     double time = value[QStringLiteral("global")].Get(NodeParam::kFloat, QStringLiteral("time_in")).toDouble();
     InsertTransitionTimes(&job, time);

From 70b21d6c2a16787e175b82f620339ebddbccd0af Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 19 Jul 2020 12:03:31 +1000
Subject: [PATCH 073/138] renderer: always prioritize array parent over
 children

Fixes common segfault.
---
 app/render/backend/renderbackend.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index 5e1a1f018..e8e3a3f6b 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -227,8 +227,15 @@ void RenderBackend::NodeGraphChanged(NodeInput *source)
       return;
     }
 
+    // Check if the source is a member of this array, in which case it'll be copied eventually anyway
+    if (queued_input->IsArray()
+        && static_cast<NodeInputArray*>(queued_input)->sub_params().contains(source)) {
+      return;
+    }
+
     // Check if this input supersedes an already queued input
-    if (queued_input->parentNode()->OutputsTo(source, true)) {
+    if (queued_input->parentNode()->OutputsTo(source, true)
+        || (source->IsArray() && static_cast<NodeInputArray*>(source)->sub_params().contains(queued_input))) {
       // In which case, we don't need to queue it and can queue our own
       graph_update_queue_.removeAt(i);
       i--;

From 4268ccd75e384d34353161b695b49fc23c2f9421 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 22 Jul 2020 10:32:04 +1000
Subject: [PATCH 074/138] importtool: fixed broken snapping

Snap points were made before the ghost's in/outs were set resulting in
incorrect points.
---
 app/widget/timelinewidget/tool/import.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp
index 5d9150388..8a409f0ab 100644
--- a/app/widget/timelinewidget/tool/import.cpp
+++ b/app/widget/timelinewidget/tool/import.cpp
@@ -258,9 +258,6 @@ void TimelineWidget::ImportTool::FootageToGhosts(rational ghost_start, const QLi
       // Increment track count for this track type
       track_offsets[track_type]++;
 
-      snap_points_.append(ghost->In());
-      snap_points_.append(ghost->Out());
-
       ghost->setData(TimelineViewGhostItem::kAttachedFootage, QVariant::fromValue(stream));
       ghost->SetMode(Timeline::kMove);
 
@@ -277,6 +274,9 @@ void TimelineWidget::ImportTool::FootageToGhosts(rational ghost_start, const QLi
       ghost->SetIn(ghost_start);
       ghost->SetOut(ghost_start + footage_duration);
 
+      snap_points_.append(ghost->In());
+      snap_points_.append(ghost->Out());
+
       parent()->AddGhost(ghost);
     }
 

From 73769d9e8520f6b7e79954939d7fb3c8ee3dd0a2 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 22 Jul 2020 10:33:06 +1000
Subject: [PATCH 075/138] mainmenu: set snapping menu item's checked value on
 startup

Since this action handles the key press, if it's checked value is not equal
to the real value, it will be a no-op first before it "syncs" with the
real value.
---
 app/window/mainwindow/mainmenu.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp
index 004b03877..07db2641b 100644
--- a/app/window/mainwindow/mainmenu.cpp
+++ b/app/window/mainwindow/mainmenu.cpp
@@ -262,6 +262,7 @@ MainMenu::MainMenu(MainWindow *parent) :
 
   tools_snapping_item_ = tools_menu_->AddItem("snapping", Core::instance(), &Core::SetSnapping, "S");
   tools_snapping_item_->setCheckable(true);
+  tools_snapping_item_->setChecked(Core::instance()->snapping());
 
   tools_menu_->addSeparator();
 

From ce353ccbedc03b7159c01651bd644c9dcaf1ee04 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 22 Jul 2020 18:09:57 +1000
Subject: [PATCH 076/138] timeline: various work to improve timeline behavior,
 particularly when dealing with transitions

---
 app/node/block/transition/transition.cpp      |  33 +
 app/node/block/transition/transition.h        |   4 +
 app/node/node.cpp                             |   7 +-
 app/node/node.h                               |   2 +-
 app/widget/timelinewidget/timelinewidget.cpp  |  95 +--
 app/widget/timelinewidget/timelinewidget.h    |  47 +-
 app/widget/timelinewidget/tool/import.cpp     |   6 +-
 app/widget/timelinewidget/tool/pointer.cpp    | 642 ++++++++++++------
 app/widget/timelinewidget/tool/ripple.cpp     |   9 +-
 app/widget/timelinewidget/tool/rolling.cpp    |  36 +-
 app/widget/timelinewidget/tool/slide.cpp      |  94 +--
 app/widget/timelinewidget/tool/tool.cpp       |  14 +-
 app/widget/timelinewidget/undo/undo.cpp       | 177 ++++-
 app/widget/timelinewidget/undo/undo.h         |  24 +
 .../view/timelineviewghostitem.cpp            |  10 +-
 .../view/timelineviewghostitem.h              |   4 +-
 16 files changed, 737 insertions(+), 467 deletions(-)

diff --git a/app/node/block/transition/transition.cpp b/app/node/block/transition/transition.cpp
index 0fb644e94..3b339f536 100644
--- a/app/node/block/transition/transition.cpp
+++ b/app/node/block/transition/transition.cpp
@@ -256,6 +256,39 @@ NodeValueTable TransitionBlock::Value(NodeValueDatabase &value) const
   return table;
 }
 
+TransitionBlock *GetBlockTransitionInternal(Block *block, Timeline::MovementMode mode)
+{
+  // See if this block outputs to a transition
+  foreach (NodeEdgePtr edge, block->output()->edges()) {
+    Node* connected_node = edge->input()->parentNode();
+
+    if (connected_node->IsBlock()) {
+      Block* connected_block = static_cast<Block*>(connected_node);
+
+      if (connected_block->type() == Block::kTransition) {
+        TransitionBlock* connected_transition = static_cast<TransitionBlock*>(connected_block);
+
+        if ((mode == Timeline::kTrimIn && edge->input() == connected_transition->in_block_input())
+            || (mode == Timeline::kTrimOut && edge->input() == connected_transition->out_block_input())) {
+          return connected_transition;
+        }
+      }
+    }
+  }
+
+  return nullptr;
+}
+
+TransitionBlock *TransitionBlock::GetBlockInTransition(Block *block)
+{
+  return GetBlockTransitionInternal(block, Timeline::kTrimIn);
+}
+
+TransitionBlock *TransitionBlock::GetBlockOutTransition(Block *block)
+{
+  return GetBlockTransitionInternal(block, Timeline::kTrimOut);
+}
+
 void TransitionBlock::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &job) const
 {
   Q_UNUSED(value)
diff --git a/app/node/block/transition/transition.h b/app/node/block/transition/transition.h
index 34a6f074d..d8c5c6a39 100644
--- a/app/node/block/transition/transition.h
+++ b/app/node/block/transition/transition.h
@@ -51,6 +51,10 @@ public:
 
   virtual NodeValueTable Value(NodeValueDatabase &value) const override;
 
+  static TransitionBlock* GetBlockInTransition(Block* block);
+
+  static TransitionBlock* GetBlockOutTransition(Block* block);
+
 protected:
   virtual void ShaderJobEvent(NodeValueDatabase &value, ShaderJob& job) const;
 
diff --git a/app/node/node.cpp b/app/node/node.cpp
index 051575c05..ec38c7fdb 100644
--- a/app/node/node.cpp
+++ b/app/node/node.cpp
@@ -556,7 +556,7 @@ bool Node::OutputsTo(const QString &id, bool recursively) const
   return false;
 }
 
-bool Node::OutputsTo(NodeInput *input, bool recursively) const
+bool Node::OutputsTo(NodeInput *input, bool recursively, bool include_arrays) const
 {
   QList<NodeOutput*> outputs = GetOutputs();
 
@@ -566,7 +566,10 @@ bool Node::OutputsTo(NodeInput *input, bool recursively) const
 
       if (connected == input) {
         return true;
-      } else if (recursively && connected->parentNode()->OutputsTo(input, recursively)) {
+      } else if (include_arrays && input->IsArray()
+                 && static_cast<NodeInputArray*>(input)->sub_params().contains(connected)) {
+        return true;
+      } else if (recursively && connected->parentNode()->OutputsTo(input, recursively, include_arrays)) {
         return true;
       }
     }
diff --git a/app/node/node.h b/app/node/node.h
index 9260ed44f..ba05359ce 100644
--- a/app/node/node.h
+++ b/app/node/node.h
@@ -224,7 +224,7 @@ public:
   /**
    * @brief Same as OutputsTo(Node*), but for a specific node input rather than just a node.
    */
-  bool OutputsTo(NodeInput* input, bool recursively) const;
+  bool OutputsTo(NodeInput* input, bool recursively, bool include_arrays) const;
 
   /**
    * @brief Returns whether this node ever receives an input from a particular node instance
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index e8ac028bd..63163da0e 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -472,67 +472,13 @@ void TimelineWidget::SplitAtPlayhead()
   }
 }
 
-void TimelineWidget::DeleteSelectedInternal(const QList<Block *> &blocks,
-                                            bool transition_aware,
+void TimelineWidget::ReplaceBlocksWithGaps(const QList<Block *> &blocks,
                                             bool remove_from_graph,
                                             QUndoCommand *command)
 {
   foreach (Block* b, blocks) {
     TrackOutput* original_track = TrackOutput::TrackFromBlock(b);
 
-    /*if (transition_aware && b->type() == Block::kTransition) {
-      // Deleting transitions restores their in/out offsets to their attached blocks
-      TransitionBlock* transition = static_cast<TransitionBlock*>(b);
-
-      // Ripple remove transition
-      new TrackRippleRemoveBlockCommand(original_track,
-                                        transition,
-                                        command);
-
-      // Resize attached blocks to make up length
-      if (transition->connected_in_block()) {
-        new BlockResizeWithMediaInCommand(transition->connected_in_block(),
-                                          transition->connected_in_block()->length() + transition->in_offset(),
-                                          command);
-      }
-
-      if (transition->connected_out_block()) {
-        new BlockResizeCommand(transition->connected_out_block(),
-                               transition->connected_out_block()->length() + transition->out_offset(),
-                               command);
-      }
-    } else */
-
-
-    /*
-    if (b->next()) {
-
-      new TrackRippleRemoveBlockCommand(original_track, b, command);
-
-      if (b->previous() && b->previous()->type() == Block::kGap
-          && b->next() && b->next()->type() == Block::kGap) {
-
-        // Both previous AND next are blocks. We'll want to merge them together.
-        new TrackRippleRemoveBlockCommand(original_track, b->next(), command);
-
-      } else {
-
-        // Make new gap and replace old Block with it for now
-        GapBlock* gap = new GapBlock();
-        gap->set_length_and_media_out(b->length());
-
-        new NodeAddCommand(static_cast<NodeGraph*>(b->parent()),
-                           gap,
-                           command);
-
-        new TrackReplaceBlockCommand(original_track,
-                                     b,
-                                     gap,
-                                     command);
-      }
-    }
-    */
-
     new TrackReplaceBlockWithGapCommand(original_track, b, command);
 
     if (remove_from_graph) {
@@ -566,17 +512,30 @@ void TimelineWidget::DeleteSelected(bool ripple)
 
   QUndoCommand* command = new QUndoCommand();
 
-  // Replace blocks with gaps (effectively deleting them)
-  DeleteSelectedInternal(blocks_to_delete, true, true, command);
+  QList<Block*> clips_to_delete;
+  QList<TransitionBlock*> transitions_to_delete;
 
-  /*
-  // Clean each track
-  foreach (const TrackReference& track, tracks_affected) {
-    new TrackCleanGapsCommand(GetConnectedNode()->track_list(track.type()),
-                              track.index(),
-                              command);
+  foreach (Block* b, blocks_to_delete) {
+    if (b->type() == Block::kClip) {
+      clips_to_delete.append(b);
+    } else if (b->type() == Block::kTransition) {
+      transitions_to_delete.append(static_cast<TransitionBlock*>(b));
+    }
+  }
+
+  // Replace clips with gaps (effectively deleting them)
+  ReplaceBlocksWithGaps(clips_to_delete, true, command);
+
+  // For transitions, remove them but extend their attached blocks to fill their place
+  foreach (TransitionBlock* transition, transitions_to_delete) {
+    new TransitionRemoveCommand(TrackOutput::TrackFromBlock(transition),
+                                transition,
+                                command);
+
+    new NodeRemoveWithExclusiveDeps(static_cast<NodeGraph*>(GetConnectedNode()->parent()),
+                                    transition,
+                                    command);
   }
-  */
 
   // Insert ripple command now that it's all cleaned up gaps
   if (ripple) {
@@ -634,12 +593,16 @@ void TimelineWidget::ToggleLinksOnSelected()
 {
   QList<TimelineViewBlockItem*> sel = GetSelectedBlocks();
 
-  // Prioritize unlinking
-
   QList<Block*> blocks;
   bool link = true;
 
   foreach (TimelineViewBlockItem* item, sel) {
+    // Only clips can be linked
+    if (item->block()->type() != Block::kClip) {
+      continue;
+    }
+
+    // Prioritize unlinking, if any block has links, assume we're unlinking
     if (link && item->block()->HasLinks()) {
       link = false;
     }
diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h
index fbd76a47f..c3d6d5912 100644
--- a/app/widget/timelinewidget/timelinewidget.h
+++ b/app/widget/timelinewidget/timelinewidget.h
@@ -26,6 +26,7 @@
 #include <QWidget>
 
 #include "core.h"
+#include "node/block/transition/transition.h"
 #include "node/output/viewer/viewer.h"
 #include "snapservice.h"
 #include "timeline/timelinecommon.h"
@@ -189,18 +190,18 @@ private:
      * Validation is the process of ensuring that whatever movements the user is making are "valid" and "legal". This
      * function's validation ensures that no Ghost's in point ends up in a negative timecode.
      */
-    rational ValidateTimeMovement(rational movement, const QVector<TimelineViewGhostItem*> ghosts);
+    rational ValidateTimeMovement(rational movement);
 
     /**
      * @brief Validates Ghosts that are moving vertically (track-based)
      *
      * This function's validation ensures that no Ghost's track ends up in a negative (non-existent) track.
      */
-    int ValidateTrackMovement(int movement, const QVector<TimelineViewGhostItem*> ghosts);
+    int ValidateTrackMovement(int movement, const QVector<TimelineViewGhostItem *> &ghosts);
 
-    void GetGhostData(const QVector<TimelineViewGhostItem*>& ghosts, rational *earliest_point, rational *latest_point);
+    void GetGhostData(rational *earliest_point, rational *latest_point);
 
-    void InsertGapsAtGhostDestination(const QVector<TimelineViewGhostItem*>& ghosts, QUndoCommand* command);
+    void InsertGapsAtGhostDestination(QUndoCommand* command);
 
     QList<rational> snap_points_;
 
@@ -242,9 +243,9 @@ private:
     virtual void InitiateDrag(TimelineViewBlockItem* clicked_item,
                               Timeline::MovementMode trim_mode);
 
-    TimelineViewGhostItem* AddGhostFromBlock(Block *block, const TrackReference& track, Timeline::MovementMode mode);
+    TimelineViewGhostItem* AddGhostFromBlock(Block *block, const TrackReference& track, Timeline::MovementMode mode, bool trim_overwrite_allowed);
 
-    TimelineViewGhostItem* AddGhostFromNull(const rational& in, const rational& out, const TrackReference& track, Timeline::MovementMode mode);
+    TimelineViewGhostItem* AddGhostFromNull(const rational& in, const rational& out, const TrackReference& track, Timeline::MovementMode mode, bool trim_overwrite_allowed);
 
     /**
      * @brief Validates Ghosts that are getting their in points trimmed
@@ -252,7 +253,7 @@ private:
      * Assumes ghost->data() is a Block. Ensures no Ghost's in point becomes a negative timecode. Also ensures no
      * Ghost's length becomes 0 or negative.
      */
-    rational ValidateInTrimming(rational movement, const QVector<TimelineViewGhostItem*> ghosts, bool prevent_overwriting);
+    rational ValidateInTrimming(rational movement);
 
     /**
      * @brief Validates Ghosts that are getting their out points trimmed
@@ -260,10 +261,21 @@ private:
      * Assumes ghost->data() is a Block. Ensures no Ghost's in point becomes a negative timecode. Also ensures no
      * Ghost's length becomes 0 or negative.
      */
-    rational ValidateOutTrimming(rational movement, const QVector<TimelineViewGhostItem*> ghosts, bool prevent_overwriting);
+    rational ValidateOutTrimming(rational movement);
 
     virtual void ProcessDrag(const TimelineCoordinate &mouse_pos);
 
+    enum GhostMode {
+      kPointer,
+      kRolling,
+      kSlide
+    };
+
+    void InitiateDragInternal(TimelineViewBlockItem* clicked_item,
+                              Timeline::MovementMode trim_mode,
+                              GhostMode pointer_mode,
+                              bool trim_overwrite_allowed);
+
     const Timeline::MovementMode& drag_movement_mode() const
     {
       return drag_movement_mode_;
@@ -284,11 +296,6 @@ private:
       track_movement_allowed_ = e;
     }
 
-    void SetTrimOverwriteAllowed(bool e)
-    {
-      trim_overwrite_allowed_ = e;
-    }
-
     void SetGapTrimmingAllowed(bool e)
     {
       gap_trimming_allowed_ = e;
@@ -297,16 +304,21 @@ private:
   private:
     Timeline::MovementMode IsCursorInTrimHandle(TimelineViewBlockItem* block, qreal cursor_x);
 
-    void AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode);
+    void AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode, bool trim_overwrite_allowed);
 
     bool IsClipTrimmable(TimelineViewBlockItem* clip,
                          const QList<TimelineViewBlockItem*>& items,
                          const Timeline::MovementMode& mode);
 
+    void ProcessGhostsForSliding();
+
+    void ProcessGhostsForRolling();
+
+    bool AddMovingTransitionsToClipGhost(Block *block, const TrackReference &track, Timeline::MovementMode movement, const QList<TimelineViewBlockItem *> &selected_items);
+
     bool movement_allowed_;
     bool trimming_allowed_;
     bool track_movement_allowed_;
-    bool trim_overwrite_allowed_;
     bool gap_trimming_allowed_;
     bool rubberband_selecting_;
 
@@ -383,8 +395,6 @@ private:
     RollingTool(TimelineWidget* parent);
 
   protected:
-    virtual void FinishDrag(TimelineViewMouseEvent *event) override;
-
     virtual void InitiateDrag(TimelineViewBlockItem* clicked_item,
                               Timeline::MovementMode trim_mode) override;
   };
@@ -395,7 +405,6 @@ private:
     SlideTool(TimelineWidget* parent);
 
   protected:
-    virtual void FinishDrag(TimelineViewMouseEvent *event) override;
     virtual void InitiateDrag(TimelineViewBlockItem* clicked_item,
                               Timeline::MovementMode trim_mode) override;
 
@@ -455,7 +464,7 @@ private:
 
   void InsertGapsAt(const rational& time, const rational& length, QUndoCommand* command);
 
-  void DeleteSelectedInternal(const QList<Block *>& blocks, bool transition_aware, bool remove_from_graph, QUndoCommand* command);
+  void ReplaceBlocksWithGaps(const QList<Block *>& blocks, bool remove_from_graph, QUndoCommand* command);
 
   void SetBlockLinksSelected(Block *block, bool selected);
 
diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp
index 8a409f0ab..9850a6eab 100644
--- a/app/widget/timelinewidget/tool/import.cpp
+++ b/app/widget/timelinewidget/tool/import.cpp
@@ -123,14 +123,14 @@ void TimelineWidget::ImportTool::DragMove(TimelineViewMouseEvent *event)
       rational time_movement = event->GetFrame() - drag_start_.GetFrame();
       int track_movement = event->GetTrack().index() - drag_start_.GetTrack().index();
 
-      time_movement = ValidateTimeMovement(time_movement, parent()->ghost_items_);
+      time_movement = ValidateTimeMovement(time_movement);
       track_movement = ValidateTrackMovement(track_movement, parent()->ghost_items_);
 
       // If snapping is enabled, check for snap points
       if (Core::instance()->snapping()) {
         parent()->SnapPoint(snap_points_, &time_movement);
 
-        time_movement = ValidateTimeMovement(time_movement, parent()->ghost_items_);
+        time_movement = ValidateTimeMovement(time_movement);
         track_movement = ValidateTrackMovement(track_movement, parent()->ghost_items_);
       }
 
@@ -398,7 +398,7 @@ void TimelineWidget::ImportTool::DropGhosts(bool insert)
 
     // Check if we're inserting
     if (insert) {
-      InsertGapsAtGhostDestination(parent()->ghost_items_, command);
+      InsertGapsAtGhostDestination(command);
     }
 
     for (int i=0;i<parent()->ghost_items_.size();i++) {
diff --git a/app/widget/timelinewidget/tool/pointer.cpp b/app/widget/timelinewidget/tool/pointer.cpp
index 6afac6c25..9c17f4e8d 100644
--- a/app/widget/timelinewidget/tool/pointer.cpp
+++ b/app/widget/timelinewidget/tool/pointer.cpp
@@ -41,7 +41,6 @@ TimelineWidget::PointerTool::PointerTool(TimelineWidget *parent) :
   movement_allowed_(true),
   trimming_allowed_(true),
   track_movement_allowed_(true),
-  trim_overwrite_allowed_(false),
   gap_trimming_allowed_(false),
   rubberband_selecting_(false)
 {
@@ -119,31 +118,31 @@ void TimelineWidget::PointerTool::MouseMove(TimelineViewMouseEvent *event)
   if (rubberband_selecting_) {
     // Process rubberband select
     parent()->MoveRubberBandSelect(true, !(event->GetModifiers() & Qt::AltModifier));
-    return;
-  }
+  } else {
+    // Process drag
+    if (!dragging_) {
 
-  if (!dragging_) {
+      // Now that the cursor has moved, we will assume the intention is to drag
 
-    // Now that the cursor has moved, we will assume the intention is to drag
+      // Clear snap points
+      snap_points_.clear();
 
-    // Clear snap points
-    snap_points_.clear();
+      // If we're performing an action, we can initiate ghosts
+      if (drag_movement_mode_ != Timeline::kNone) {
+        InitiateDrag(clicked_item_, drag_movement_mode_);
+      }
+
+      // Set dragging to true here so no matter what, the drag isn't re-initiated until it's completed
+      dragging_ = true;
 
-    // If we're performing an action, we can initiate ghosts
-    if (drag_movement_mode_ != Timeline::kNone) {
-      InitiateDrag(clicked_item_, drag_movement_mode_);
     }
 
-    // Set dragging to true here so no matter what, the drag isn't re-initiated until it's completed
-    dragging_ = true;
+    if (dragging_ && !parent()->ghost_items_.isEmpty()) {
 
-  }
-
-  if (dragging_ && !parent()->ghost_items_.isEmpty()) {
-
-    // We're already dragging AND we have ghosts to work with
-    ProcessDrag(event->GetCoordinates());
+      // We're already dragging AND we have ghosts to work with
+      ProcessDrag(event->GetCoordinates());
 
+    }
   }
 }
 
@@ -157,10 +156,12 @@ void TimelineWidget::PointerTool::MouseRelease(TimelineViewMouseEvent *event)
   }
 
   if (dragging_) {
+    // If we were dragging, process the end of the drag
     if (!parent()->ghost_items_.isEmpty()) {
       FinishDrag(event);
     }
 
+    // Clean up
     parent()->ClearGhosts();
     snap_points_.clear();
 
@@ -193,92 +194,141 @@ void TimelineWidget::PointerTool::HoverMove(TimelineViewMouseEvent *event)
   }
 }
 
-void TimelineWidget::PointerTool::FinishDrag(TimelineViewMouseEvent *event)
+void TimelineWidget::PointerTool::InitiateDragInternal(TimelineViewBlockItem *clicked_item,
+                                                       Timeline::MovementMode trim_mode,
+                                                       GhostMode pointer_mode,
+                                                       bool trim_overwrite_allowed)
 {
-  QList<TimelineViewGhostItem*> ghosts_moving;
-  QList<Block*> blocks_moving;
-  QList<TimelineViewGhostItem*> ghosts_trimming;
-  QList<Block*> blocks_trimming;
+  // Get list of selected blocks
+  QList<TimelineViewBlockItem*> clips = parent()->GetSelectedBlocks();
 
-  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
-    if (!ghost->HasBeenAdjusted()) {
-      continue;
+  if (trim_mode == Timeline::kMove) {
+
+    // Each block type has different behavior, so we determine the type of the block that was
+    // clicked and filter out any others.
+    Block::Type clicked_block_type = clicked_item->block()->type();
+
+    // Gaps are not allowed to move, and since we only allow moving one block type at a time,
+    // dragging a gap is a no-op
+    if (clicked_block_type == Block::kGap) {
+      return;
     }
 
-    Block* b = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
+    // Create ghosts for moving
+    foreach (TimelineViewBlockItem* clip_item, clips) {
+      Block* block = clip_item->block();
 
-    if (ghost->mode() == Timeline::kMove) {
-      ghosts_moving.append(ghost);
-      blocks_moving.append(b);
-    } else if (Timeline::IsATrimMode(ghost->mode())) {
-      ghosts_trimming.append(ghost);
-      blocks_trimming.append(b);
-    }
-  }
-
-  if (blocks_moving.isEmpty() && blocks_trimming.isEmpty()) {
-    // Likely means no block was adjusted, so we can skip the rest of the processing
-    return;
-  }
-
-  // See if we're duplicated because ALT is held (only moved blocks can duplicate)
-  bool duplicate_clips = (!blocks_moving.isEmpty() && event->GetModifiers() & Qt::AltModifier);
-  bool inserting = (!blocks_moving.isEmpty() && event->GetModifiers() & Qt::ControlModifier);
-
-  QUndoCommand* command = new QUndoCommand();
-
-  for (int i=0;i<ghosts_trimming.size();i++) {
-    TimelineViewGhostItem* ghost = ghosts_trimming.at(i);
-
-    new BlockTrimCommand(parent()->GetTrackFromReference(ghost->GetAdjustedTrack()),
-                         blocks_trimming.at(i),
-                         ghost->AdjustedLength(),
-                         ghost->mode(),
-                         command);
-  }
-
-  if (!blocks_moving.isEmpty()) {
-    // If we're not duplicating, "remove" the clips and replace them with gaps
-    if (!duplicate_clips) {
-      parent()->DeleteSelectedInternal(blocks_moving, false, false, command);
-    }
-
-    if (inserting) {
-      // If we're inserting, ripple everything at the destination with gaps
-      InsertGapsAtGhostDestination(parent()->ghost_items_, command);
-    }
-
-    // Now we can re-add each clip
-    for (int i=0;i<ghosts_moving.size();i++) {
-      TimelineViewGhostItem* ghost = ghosts_moving.at(i);
-      Block* block = blocks_moving.at(i);
-
-      if (duplicate_clips) {
-        // Duplicate rather than move
-        Node* copy = block->copy();
-
-        new NodeAddCommand(static_cast<NodeGraph*>(block->parent()),
-                           copy,
-                           command);
-
-        new NodeCopyInputsCommand(block, copy, true, command);
-
-        // Place the copy instead of the original block
-        block = static_cast<Block*>(copy);
+      if (block->type() == Block::kGap) {
+        // Gaps cannot move, ignore this block
+        continue;
       }
 
-      const TrackReference& track_ref = ghost->GetAdjustedTrack();
-      new TrackPlaceBlockCommand(parent()->GetConnectedNode()->track_list(track_ref.type()),
-                                 track_ref.index(),
-                                 block,
-                                 ghost->GetAdjustedIn(),
-                                 command);
+      if (clicked_block_type == Block::kTransition && block->type() != Block::kTransition) {
+        // Transitions always slide rather than move, so if we clicked a transition, ignore any
+        // non-transitions
+        continue;
+      }
+
+      // Create ghost
+      TimelineViewGhostItem* ghost = AddGhostFromBlock(block, clip_item->Track(),
+                                                       trim_mode, trim_overwrite_allowed);
+
+      if (clicked_block_type == Block::kTransition) {
+        // Transition moves are always a slide
+        ghost->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
+      } else {
+        // Set to default behavior
+        ghost->setData(TimelineViewGhostItem::kPointerToolMode, pointer_mode);
+
+        // Include transitions (if any)
+        AddMovingTransitionsToClipGhost(block, clip_item->Track(), trim_mode, clips);
+      }
     }
 
-    // FIXME: Heavy optimization since MOST of the timeline does NOT change in this time
-  }
+    // If we slid the blocks, we must process them as such
+    if (clicked_block_type == Block::kTransition || pointer_mode == kSlide) {
+      ProcessGhostsForSliding();
+    }
 
-  Core::instance()->undo_stack()->pushIfHasChildren(command);
+  } else {
+
+    // "Multi-trim" is trimming a clip on more than one track. Only the earliest (for in trimming)
+    // or latest (for out trimming) clip on each track can be trimmed. Therefore, it's only enabled
+    // if the clicked item is the earliest/latest on its track.
+    bool multitrim_enabled = IsClipTrimmable(clicked_item, clips, trim_mode);
+
+    // Create ghosts for trimming
+    foreach (TimelineViewBlockItem* clip_item, clips) {
+      if (clip_item != clicked_item
+          && (!multitrim_enabled || !IsClipTrimmable(clip_item, clips, trim_mode))) {
+        // Either multitrim is disabled or this clip is NOT the earliest/latest in its track. We
+        // won't include it.
+        continue;
+      }
+
+      Block* block = clip_item->block();
+      Timeline::MovementMode block_mode = trim_mode;
+      bool block_trim_overwrite_allowed = trim_overwrite_allowed;
+
+      // Some tools interpret "gap trimming" as equivalent to resizing the adjacent block. In that
+      // scenario, we include the adjacent block instead.
+      if (block->type() == Block::kGap && !gap_trimming_allowed_) {
+        block = (trim_mode == Timeline::kTrimIn) ? block->previous() : block->next();
+        block_mode = FlipTrimMode(trim_mode);
+
+        // If there's no adjacent block, do nothing here
+        if (!block) {
+          continue;
+        }
+      }
+
+      // For transitions, we create a rolling edit with the attached clip
+      if (block->type() == Block::kTransition) {
+        TransitionBlock* transition = static_cast<TransitionBlock*>(block);
+        TimelineViewGhostItem* g = nullptr;
+
+        Block* previous = transition->previous();
+        Block* next = transition->next();
+
+        if (block_mode == Timeline::kTrimIn
+            && previous
+            && (previous == transition->connected_out_block() || previous->type() == Block::kGap)) {
+          g = AddGhostFromBlock(previous, clip_item->Track(), Timeline::kTrimOut, true);
+        } else if (block_mode == Timeline::kTrimOut
+                   && next
+                   && (next == transition->connected_in_block() || next->type() == Block::kGap)) {
+          g = AddGhostFromBlock(next, clip_item->Track(), Timeline::kTrimIn, true);
+        }
+
+        if (g) {
+          g->setData(TimelineViewGhostItem::kPointerToolMode, kRolling);
+          block_trim_overwrite_allowed = true;
+        }
+      }
+
+      // Create ghost for this block
+      TimelineViewGhostItem* ghost = AddGhostFromBlock(block, clip_item->Track(), block_mode, block_trim_overwrite_allowed);
+
+      if (block->type() == Block::kTransition) {
+
+        // If this is a transition, set to rolling as above
+        ghost->setData(TimelineViewGhostItem::kPointerToolMode, kRolling);
+
+      } else {
+
+        // For trimmed clips, we also "move" the transitions if any are attached
+        if (AddMovingTransitionsToClipGhost(block, clip_item->Track(), trim_mode, clips)) {
+          ghost->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
+        } else {
+          ghost->setData(TimelineViewGhostItem::kPointerToolMode, kPointer);
+        }
+      }
+    }
+
+    if (pointer_mode == kRolling) {
+      ProcessGhostsForRolling();
+    }
+  }
 }
 
 void TimelineWidget::PointerTool::ProcessDrag(const TimelineCoordinate &mouse_pos)
@@ -292,17 +342,17 @@ void TimelineWidget::PointerTool::ProcessDrag(const TimelineCoordinate &mouse_po
   rational time_movement = mouse_pos.GetFrame() - drag_start_.GetFrame();
 
   // Validate movement (enforce all ghosts moving in legal ways)
-  time_movement = ValidateTimeMovement(time_movement, parent()->ghost_items_);
-  time_movement = ValidateInTrimming(time_movement, parent()->ghost_items_, !trim_overwrite_allowed_);
-  time_movement = ValidateOutTrimming(time_movement, parent()->ghost_items_, !trim_overwrite_allowed_);
+  time_movement = ValidateTimeMovement(time_movement);
+  time_movement = ValidateInTrimming(time_movement);
+  time_movement = ValidateOutTrimming(time_movement);
 
   // Perform snapping if enabled (adjusts time_movement if it's close to any potential snap points)
   if (Core::instance()->snapping()) {
     parent()->SnapPoint(snap_points_, &time_movement);
 
-    time_movement = ValidateTimeMovement(time_movement, parent()->ghost_items_);
-    time_movement = ValidateInTrimming(time_movement, parent()->ghost_items_, !trim_overwrite_allowed_);
-    time_movement = ValidateOutTrimming(time_movement, parent()->ghost_items_, !trim_overwrite_allowed_);
+    time_movement = ValidateTimeMovement(time_movement);
+    time_movement = ValidateInTrimming(time_movement);
+    time_movement = ValidateOutTrimming(time_movement);
   }
 
   // Validate ghosts that are being moved (clips from other track types do NOT get moved)
@@ -357,6 +407,140 @@ void TimelineWidget::PointerTool::ProcessDrag(const TimelineCoordinate &mouse_po
                      parent());
 }
 
+struct GhostBlockPair {
+  TimelineViewGhostItem* ghost;
+  Block* block;
+};
+
+void TimelineWidget::PointerTool::FinishDrag(TimelineViewMouseEvent *event)
+{
+  QList<GhostBlockPair> blocks_moving;
+  QList<GhostBlockPair> blocks_sliding;
+  QList<GhostBlockPair> blocks_trimming;
+
+  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
+    if (ghost->HasBeenAdjusted()) {
+      Block* b = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
+
+      if (ghost->mode() == Timeline::kMove) {
+        if (ghost->data(TimelineViewGhostItem::kPointerToolMode) == kSlide) {
+          blocks_sliding.append({ghost, b});
+        } else {
+          blocks_moving.append({ghost, b});
+        }
+      } else if (Timeline::IsATrimMode(ghost->mode())) {
+        blocks_trimming.append({ghost, b});
+      }
+    }
+  }
+
+  if (blocks_moving.isEmpty()
+      && blocks_trimming.isEmpty()
+      && blocks_sliding.isEmpty()) {
+    // No blocks were adjusted, so nothing to do
+    return;
+  }
+
+  // See if we're duplicated because ALT is held (only moved blocks can duplicate)
+  bool duplicate_clips = (!blocks_moving.isEmpty() && event->GetModifiers() & Qt::AltModifier);
+  bool inserting = (!blocks_moving.isEmpty() && event->GetModifiers() & Qt::ControlModifier);
+
+  // Slide info
+  QVector<TrackSlideCommand::BlockSlideInfo> slide_info;
+
+  QUndoCommand* command = new QUndoCommand();
+
+  foreach (const GhostBlockPair& p, blocks_trimming) {
+    TimelineViewGhostItem* ghost = p.ghost;
+
+    GhostMode m = static_cast<GhostMode>(ghost->data(TimelineViewGhostItem::kPointerToolMode).toInt());
+
+    switch (m) {
+    case kPointer:
+    case kRolling:
+      if (m != kRolling || ghost->mode() == drag_movement_mode()) {
+        BlockTrimCommand* c = new BlockTrimCommand(parent()->GetTrackFromReference(ghost->GetAdjustedTrack()),
+                                                   p.block,
+                                                   ghost->AdjustedLength(),
+                                                   ghost->mode(),
+                                                   command);
+
+        if (m == kRolling) {
+          c->SetAllowNonGapTrimming(true);
+        }
+      }
+      break;
+    case kSlide:
+      slide_info.append({parent()->GetTrackFromReference(ghost->Track()),
+                         p.block,
+                         ghost->mode(),
+                         ghost->AdjustedLength(),
+                         ghost->Length()});
+      break;
+    }
+  }
+
+  if (!blocks_moving.isEmpty()) {
+    // If we're not duplicating, "remove" the clips and replace them with gaps
+    if (!duplicate_clips) {
+      QList<Block*> blocks_to_delete;
+
+      foreach (const GhostBlockPair& p, blocks_moving) {
+        blocks_to_delete.append(p.block);
+      }
+
+      parent()->ReplaceBlocksWithGaps(blocks_to_delete, false, command);
+    }
+
+    if (inserting) {
+      // If we're inserting, ripple everything at the destination with gaps
+      InsertGapsAtGhostDestination(command);
+    }
+
+    // Now we can re-add each clip
+    foreach (const GhostBlockPair& p, blocks_moving) {
+      Block* block = p.block;
+
+      if (duplicate_clips) {
+        // Duplicate rather than move
+        Node* copy = block->copy();
+
+        new NodeAddCommand(static_cast<NodeGraph*>(block->parent()),
+                           copy,
+                           command);
+
+        new NodeCopyInputsCommand(block, copy, true, command);
+
+        // Place the copy instead of the original block
+        block = static_cast<Block*>(copy);
+      }
+
+      const TrackReference& track_ref = p.ghost->GetAdjustedTrack();
+      new TrackPlaceBlockCommand(parent()->GetConnectedNode()->track_list(track_ref.type()),
+                                 track_ref.index(),
+                                 block,
+                                 p.ghost->GetAdjustedIn(),
+                                 command);
+    }
+  }
+
+  if (!blocks_sliding.isEmpty()) {
+    foreach (const GhostBlockPair& p, blocks_sliding) {
+      slide_info.append({parent()->GetTrackFromReference(p.ghost->Track()),
+                         p.block,
+                         p.ghost->mode(),
+                         p.ghost->GetAdjustedIn(),
+                         p.ghost->In()});
+    }
+  }
+
+  if (!slide_info.isEmpty()) {
+    new TrackSlideCommand(slide_info, command);
+  }
+
+  Core::instance()->undo_stack()->pushIfHasChildren(command);
+}
+
 Timeline::MovementMode TimelineWidget::PointerTool::IsCursorInTrimHandle(TimelineViewBlockItem *block, qreal cursor_x)
 {
   double kTrimHandle = QFontMetricsWidth(parent()->fontMetrics(), "H");
@@ -378,73 +562,22 @@ Timeline::MovementMode TimelineWidget::PointerTool::IsCursorInTrimHandle(Timelin
 void TimelineWidget::PointerTool::InitiateDrag(TimelineViewBlockItem* clicked_item,
                                                Timeline::MovementMode trim_mode)
 {
-  // Get list of selected blocks
-  QList<TimelineViewBlockItem*> clips = parent()->GetSelectedBlocks();
-
-  if (trim_mode == Timeline::kMove) {
-
-    // Create ghosts for moving
-    foreach (TimelineViewBlockItem* clip_item, clips) {
-
-      // Gaps are not allowed to move, so we ignore those here
-      if (clip_item->block()->type() == Block::kGap) {
-        continue;
-      }
-
-      AddGhostFromBlock(clip_item->block(), clip_item->Track(), trim_mode);
-    }
-
-  } else {
-
-    // "Multi-trim" is trimming a clip on more than one track. Only the earliest (for in trimming)
-    // or latest (for out trimming) clip on each track can be trimmed. Therefore, it's only enabled
-    // if the clicked item is the earliest/latest on its track.
-    bool multitrim_enabled = IsClipTrimmable(clicked_item, clips, trim_mode);
-
-    // Create ghosts for trimming
-    foreach (TimelineViewBlockItem* clip_item, clips) {
-      if (clip_item != clicked_item
-          && (!multitrim_enabled || !IsClipTrimmable(clip_item, clips, trim_mode))) {
-        // Either multitrim is disabled or this clip is NOT the earliest/latest in its track. We
-        // won't include it.
-        continue;
-      }
-
-      Block* block = clip_item->block();
-      Timeline::MovementMode block_mode = trim_mode;
-
-      // Some tools interpret "gap trimming" as equivalent to resizing the adjacent block. In that
-      // scenario, we include the adjacent block instead.
-      if (block->type() == Block::kGap && !gap_trimming_allowed_) {
-        block = (trim_mode == Timeline::kTrimIn) ? block->previous() : block->next();
-        block_mode = FlipTrimMode(trim_mode);
-
-        // If there's no adjacent block, do nothing here
-        if (!block) {
-          continue;
-        }
-      }
-
-      // Create ghost for this block
-      AddGhostFromBlock(block, clip_item->Track(), block_mode);
-    }
-
-  }
+  InitiateDragInternal(clicked_item, trim_mode, kPointer, false);
 }
 
-TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromBlock(Block* block, const TrackReference& track, Timeline::MovementMode mode)
+TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromBlock(Block* block, const TrackReference& track, Timeline::MovementMode mode, bool trim_overwrite_allowed)
 {
   TimelineViewGhostItem* ghost = TimelineViewGhostItem::FromBlock(block,
                                                                   track,
                                                                   parent()->GetTrackY(track),
                                                                   parent()->GetTrackHeight(track));
 
-  AddGhostInternal(ghost, mode);
+  AddGhostInternal(ghost, mode, trim_overwrite_allowed);
 
   return ghost;
 }
 
-TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromNull(const rational &in, const rational &out, const TrackReference& track, Timeline::MovementMode mode)
+TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromNull(const rational &in, const rational &out, const TrackReference& track, Timeline::MovementMode mode, bool trim_overwrite_allowed)
 {
   TimelineViewGhostItem* ghost = new TimelineViewGhostItem();
 
@@ -453,14 +586,15 @@ TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromNull(const ratio
   ghost->SetTrack(track);
   ghost->SetYCoords(parent()->GetTrackY(track), parent()->GetTrackHeight(track));
 
-  AddGhostInternal(ghost, mode);
+  AddGhostInternal(ghost, mode, trim_overwrite_allowed);
 
   return ghost;
 }
 
-void TimelineWidget::PointerTool::AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode)
+void TimelineWidget::PointerTool::AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode, bool trim_overwrite_allowed)
 {
   ghost->SetMode(mode);
+  ghost->setData(TimelineViewGhostItem::kTrimOverwriteAllowed, trim_overwrite_allowed);
 
   // Prepare snap points (optimizes snapping for later)
   switch (mode) {
@@ -497,11 +631,145 @@ bool TimelineWidget::PointerTool::IsClipTrimmable(TimelineViewBlockItem* clip,
   return true;
 }
 
-rational TimelineWidget::PointerTool::ValidateInTrimming(rational movement,
-                                                         const QVector<TimelineViewGhostItem *> ghosts,
-                                                         bool prevent_overwriting)
+struct TrackBlockListPair {
+  TrackReference track;
+  QList<Block*> blocks;
+};
+
+void TimelineWidget::PointerTool::ProcessGhostsForSliding()
 {
-  foreach (TimelineViewGhostItem* ghost, ghosts) {
+  // Sort blocks into tracks
+  QList<TrackBlockListPair> blocks_per_track;
+  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
+    Block* b = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
+    bool found = false;
+
+    for (int i=0;i<blocks_per_track.size();i++) {
+      if (blocks_per_track.at(i).track == ghost->Track()) {
+        blocks_per_track[i].blocks.append(b);
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      blocks_per_track.append({ghost->Track(), {b}});
+    }
+  }
+
+  // Make contiguous runs of blocks per each track
+  foreach (const TrackBlockListPair& p, blocks_per_track) {
+    // Blocks must be merged if any are non-adjacent
+    const TrackReference& track = p.track;
+    const QList<Block*>& blocks = p.blocks;
+
+    Block* earliest_block = blocks.first();
+    Block* latest_block = blocks.first();
+
+    // Find the earliest and latest selected blocks
+    for (int j=1;j<blocks.size();j++) {
+      Block* compare = blocks.at(j);
+
+      if (compare->in() < earliest_block->in()) {
+        earliest_block = compare;
+      }
+
+      if (compare->in() > latest_block->in()) {
+        latest_block = compare;
+      }
+    }
+
+    // Add any blocks between these blocks that aren't already in the list
+    if (earliest_block != latest_block) {
+      Block* b = earliest_block;
+      while ((b = b->next()) != latest_block) {
+        if (!blocks.contains(b)) {
+          TimelineViewGhostItem* g = AddGhostFromBlock(b, track, Timeline::kMove, true);
+          g->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
+        }
+      }
+    }
+
+    // Add surrounding blocks that will be trimming instead of moving
+    if (earliest_block->previous()) {
+      TimelineViewGhostItem* g = AddGhostFromBlock(earliest_block->previous(), track, Timeline::kTrimOut, true);
+      g->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
+    }
+
+    if (latest_block->next()) {
+      TimelineViewGhostItem* g = AddGhostFromBlock(latest_block->next(), track, Timeline::kTrimIn, true);
+      g->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
+    }
+  }
+}
+
+void TimelineWidget::PointerTool::ProcessGhostsForRolling()
+{
+  // For each ghost, we make an equivalent Ghost on the next/previous block
+  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
+    Block* ghost_block = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
+
+    if (ghost->mode() == Timeline::kTrimIn && ghost_block->previous()) {
+      // Add an extra Ghost for the previous block
+      AddGhostFromBlock(ghost_block->previous(), ghost->Track(), Timeline::kTrimOut, true);
+    } else if (ghost->mode() == Timeline::kTrimOut && ghost_block->next()) {
+      AddGhostFromBlock(ghost_block->next(), ghost->Track(), Timeline::kTrimIn, true);
+    }
+  }
+}
+
+bool TimelineWidget::PointerTool::AddMovingTransitionsToClipGhost(Block* block,
+                                                                  const TrackReference& track,
+                                                                  Timeline::MovementMode movement,
+                                                                  const QList<TimelineViewBlockItem*>& selected_items)
+{
+  // Assume block is a clip and see if it has any transitions
+  TransitionBlock* transitions[2];
+
+  if (movement == Timeline::kMove || movement == Timeline::kTrimOut) {
+    transitions[0] = TransitionBlock::GetBlockOutTransition(block);
+  } else {
+    transitions[0] = nullptr;
+  }
+
+  if (movement == Timeline::kMove || movement == Timeline::kTrimIn) {
+    transitions[1] = TransitionBlock::GetBlockInTransition(block);
+  } else {
+    transitions[1] = nullptr;
+  }
+
+  bool ret = false;
+
+  for (int i=0;i<2;i++) {
+    if (!transitions[i]) {
+      continue;
+    }
+
+    bool found = false;
+
+    foreach (TimelineViewBlockItem* item, selected_items) {
+      if (item->block() == transitions[i]) {
+        // Do nothing
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      TimelineViewGhostItem* transition_ghost = AddGhostFromBlock(transitions[i], track,
+                                                                  Timeline::kMove, false);
+      transition_ghost->setData(TimelineViewGhostItem::kPointerToolMode, kPointer);
+
+      ret = true;
+    }
+  }
+
+  return ret;
+}
+
+rational TimelineWidget::PointerTool::ValidateInTrimming(rational movement)
+{
+  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
     if (ghost->mode() != Timeline::kTrimIn) {
       continue;
     }
@@ -516,29 +784,7 @@ rational TimelineWidget::PointerTool::ValidateInTrimming(rational movement,
     }
 
     if (block) {
-      /* FIXME: Rewrite transition logic
-      if (block->type() == Block::kTransition) {
-        // For transitions, validate with the attached block
-        TransitionBlock* transition = static_cast<TransitionBlock*>(block);
-
-        if (transition->connected_in_block() && transition->connected_out_block()) {
-          // Here, we try to get the latest earliest point for both the in and out blocks, we do in here and out will
-          // be calculated later
-          earliest_in = GetEarliestPointForClip(transition->connected_in_block());
-
-          // We set the block to the out block since that will be before the in block and will be the one we use to
-          // prevent overwriting since we're trimming the in side of this transition
-          block = transition->connected_out_block();
-
-          latest_in = transition->in() + transition->out_offset();
-        } else {
-          // Use whatever block is attached
-          block = transition->connected_in_block() ? transition->connected_in_block() : transition->connected_out_block();
-        }
-      }
-      */
-
-      if (prevent_overwriting) {
+      if (!ghost->data(TimelineViewGhostItem::kTrimOverwriteAllowed).toBool()) {
         // Look for a Block in the way
         Block* prev = block->previous();
         while (prev != nullptr) {
@@ -566,11 +812,9 @@ rational TimelineWidget::PointerTool::ValidateInTrimming(rational movement,
   return movement;
 }
 
-rational TimelineWidget::PointerTool::ValidateOutTrimming(rational movement,
-                                                          const QVector<TimelineViewGhostItem *> ghosts,
-                                                          bool prevent_overwriting)
+rational TimelineWidget::PointerTool::ValidateOutTrimming(rational movement)
 {
-  foreach (TimelineViewGhostItem* ghost, ghosts) {
+  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
     if (ghost->mode() != Timeline::kTrimOut) {
       continue;
     }
@@ -588,27 +832,7 @@ rational TimelineWidget::PointerTool::ValidateOutTrimming(rational movement,
 
     // Ripple tool creates block-less ghosts and creates gaps with them later
     if (block) {
-      /* FIXME: Rewrite transition logic
-      if (block->type() == Block::kTransition) {
-        // For transitions, validate with the attached block
-        TransitionBlock* transition = static_cast<TransitionBlock*>(block);
-
-        if (transition->connected_in_block() && transition->connected_out_block()) {
-          // We set the block to the out block since that will be before the in block and will be the one we use to
-          // prevent overwriting since we're trimming the in side of this transition
-
-          // FIXME: At some point we may add some better logic to `latest_out` akin to the logic in ValidateInTrimming
-          //        which is why this hasn't yet been collapsed into the ternary below.
-          block = transition->connected_in_block();
-
-          earliest_out = transition->out() - transition->in_offset();
-        } else {
-          block = transition->connected_in_block() ? transition->connected_in_block() : transition->connected_out_block();
-        }
-      }
-      */
-
-      if (prevent_overwriting) {
+      if (!ghost->data(TimelineViewGhostItem::kTrimOverwriteAllowed).toBool()) {
         // Determine if there's a block in the way
         Block* next = block->next();
         while (next != nullptr) {
diff --git a/app/widget/timelinewidget/tool/ripple.cpp b/app/widget/timelinewidget/tool/ripple.cpp
index 9fb88ff40..a03303b1a 100644
--- a/app/widget/timelinewidget/tool/ripple.cpp
+++ b/app/widget/timelinewidget/tool/ripple.cpp
@@ -29,14 +29,13 @@ TimelineWidget::RippleTool::RippleTool(TimelineWidget* parent) :
   PointerTool(parent)
 {
   SetMovementAllowed(false);
-  SetTrimOverwriteAllowed(true);
   SetGapTrimmingAllowed(true);
 }
 
 void TimelineWidget::RippleTool::InitiateDrag(TimelineViewBlockItem *clicked_item,
                                               Timeline::MovementMode trim_mode)
 {
-  PointerTool::InitiateDrag(clicked_item, trim_mode);
+  InitiateDragInternal(clicked_item, trim_mode, kPointer, true);
 
   if (parent()->ghost_items_.isEmpty()) {
     return;
@@ -86,16 +85,16 @@ void TimelineWidget::RippleTool::InitiateDrag(TimelineViewBlockItem *clicked_ite
 
         if (block_before_ripple->type() == Block::kGap) {
           // If this Block is already a Gap, ghost it now
-          ghost = AddGhostFromBlock(block_before_ripple, track_ref, trim_mode);
+          ghost = AddGhostFromBlock(block_before_ripple, track_ref, trim_mode, true);
         } else if (block_before_ripple->next()) {
           // Assuming this block is NOT at the end of the track (i.e. next != null)
 
           // We're going to create a gap after it. If next is a gap, we can just use that
           if (block_before_ripple->next()->type() == Block::kGap) {
-            ghost = AddGhostFromBlock(block_before_ripple->next(), track_ref, trim_mode);
+            ghost = AddGhostFromBlock(block_before_ripple->next(), track_ref, trim_mode, true);
           } else {
             // If next is NOT a gap, we'll need to create one, for which we'll use a null ghost
-            ghost = AddGhostFromNull(block_before_ripple->out(), block_before_ripple->out(), track_ref, trim_mode);
+            ghost = AddGhostFromNull(block_before_ripple->out(), block_before_ripple->out(), track_ref, trim_mode, true);
             ghost->setData(TimelineViewGhostItem::kReferenceBlock, Node::PtrToValue(block_before_ripple));
           }
         }
diff --git a/app/widget/timelinewidget/tool/rolling.cpp b/app/widget/timelinewidget/tool/rolling.cpp
index 6baf25316..8f9f132c9 100644
--- a/app/widget/timelinewidget/tool/rolling.cpp
+++ b/app/widget/timelinewidget/tool/rolling.cpp
@@ -29,47 +29,13 @@ TimelineWidget::RollingTool::RollingTool(TimelineWidget* parent) :
   PointerTool(parent)
 {
   SetMovementAllowed(false);
-  SetTrimOverwriteAllowed(true);
   SetGapTrimmingAllowed(true);
 }
 
 void TimelineWidget::RollingTool::InitiateDrag(TimelineViewBlockItem *clicked_item,
                                                Timeline::MovementMode trim_mode)
 {
-  PointerTool::InitiateDrag(clicked_item, trim_mode);
-
-  // For each ghost, we make an equivalent Ghost on the next/previous block
-  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
-    Block* ghost_block = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
-
-    if (ghost->mode() == Timeline::kTrimIn && ghost_block->previous()) {
-      // Add an extra Ghost for the previous block
-      AddGhostFromBlock(ghost_block->previous(), ghost->Track(), Timeline::kTrimOut);
-    } else if (ghost->mode() == Timeline::kTrimOut && ghost_block->next()) {
-      AddGhostFromBlock(ghost_block->next(), ghost->Track(), Timeline::kTrimIn);
-    }
-  }
-}
-
-void TimelineWidget::RollingTool::FinishDrag(TimelineViewMouseEvent *event)
-{
-  QUndoCommand* command = new QUndoCommand();
-
-  // Find earliest point to ripple around
-  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
-    if (ghost->mode() == drag_movement_mode()) {
-      Block* b = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
-
-      BlockTrimCommand* c = new BlockTrimCommand(parent()->GetTrackFromReference(ghost->Track()),
-                                                 b,
-                                                 ghost->AdjustedLength(),
-                                                 drag_movement_mode(),
-                                                 command);
-      c->SetAllowNonGapTrimming(true);
-    }
-  }
-
-  Core::instance()->undo_stack()->pushIfHasChildren(command);
+  InitiateDragInternal(clicked_item, trim_mode, kRolling, true);
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/timelinewidget/tool/slide.cpp b/app/widget/timelinewidget/tool/slide.cpp
index 26423f335..f9bd8f357 100644
--- a/app/widget/timelinewidget/tool/slide.cpp
+++ b/app/widget/timelinewidget/tool/slide.cpp
@@ -30,105 +30,13 @@ TimelineWidget::SlideTool::SlideTool(TimelineWidget* parent) :
 {
   SetTrimmingAllowed(false);
   SetTrackMovementAllowed(false);
-  SetTrimOverwriteAllowed(true);
   SetGapTrimmingAllowed(true);
 }
 
-struct TrackBlockListPair {
-  TrackReference track;
-  QList<Block*> blocks;
-};
-
 void TimelineWidget::SlideTool::InitiateDrag(TimelineViewBlockItem *clicked_item,
                                              Timeline::MovementMode trim_mode)
 {
-  PointerTool::InitiateDrag(clicked_item, trim_mode);
-
-  // Sort blocks into tracks
-  QList<TrackBlockListPair> blocks_per_track;
-  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
-    Block* b = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
-    bool found = false;
-
-    for (int i=0;i<blocks_per_track.size();i++) {
-      if (blocks_per_track.at(i).track == ghost->Track()) {
-        blocks_per_track[i].blocks.append(b);
-        found = true;
-        break;
-      }
-    }
-
-    if (!found) {
-      blocks_per_track.append({ghost->Track(), {b}});
-    }
-  }
-
-  // Make contiguous runs of blocks per each track
-  foreach (const TrackBlockListPair& p, blocks_per_track) {
-    // Blocks must be merged if any are non-adjacent
-    const TrackReference& track = p.track;
-    const QList<Block*>& blocks = p.blocks;
-
-    Block* earliest_block = blocks.first();
-    Block* latest_block = blocks.first();
-
-    // Find the earliest and latest selected blocks
-    for (int j=1;j<blocks.size();j++) {
-      Block* compare = blocks.at(j);
-
-      if (compare->in() < earliest_block->in()) {
-        earliest_block = compare;
-      }
-
-      if (compare->in() > latest_block->in()) {
-        latest_block = compare;
-      }
-    }
-
-    // Add any blocks between these blocks that aren't already in the list
-    if (earliest_block != latest_block) {
-      Block* b = earliest_block;
-      while ((b = b->next()) != latest_block) {
-        if (!blocks.contains(b)) {
-          AddGhostFromBlock(b, track, Timeline::kMove);
-        }
-      }
-    }
-
-    // Add surrounding blocks that will be trimming instead of moving
-    if (earliest_block->previous()) {
-      AddGhostFromBlock(earliest_block->previous(), track, Timeline::kTrimOut);
-    }
-
-    if (latest_block->next()) {
-      AddGhostFromBlock(latest_block->next(), track, Timeline::kTrimIn);
-    }
-  }
-}
-
-void TimelineWidget::SlideTool::FinishDrag(TimelineViewMouseEvent *event)
-{
-  Q_UNUSED(event)
-
-  QVector<TrackSlideCommand::BlockSlideInfo> info;
-
-  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
-    if (!ghost->HasBeenAdjusted()) {
-      continue;
-    }
-
-    Block* b = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
-
-    info.append({parent()->GetTrackFromReference(ghost->Track()),
-                 b,
-                 ghost->mode(),
-                 ghost->mode() == Timeline::kMove ? ghost->GetAdjustedIn() : ghost->AdjustedLength(),
-                 ghost->mode() == Timeline::kMove ? ghost->In() : ghost->Length()});
-  }
-
-  if (!info.isEmpty()) {
-    Core::instance()->undo_stack()->push(new TrackSlideCommand(info));
-  }
+  InitiateDragInternal(clicked_item, trim_mode, kSlide, true);
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/timelinewidget/tool/tool.cpp b/app/widget/timelinewidget/tool/tool.cpp
index 51f9425ce..502755acb 100644
--- a/app/widget/timelinewidget/tool/tool.cpp
+++ b/app/widget/timelinewidget/tool/tool.cpp
@@ -73,9 +73,9 @@ TimelineViewBlockItem *TimelineWidget::Tool::GetItemAtScenePos(const TimelineCoo
   return nullptr;
 }
 
-rational TimelineWidget::Tool::ValidateTimeMovement(rational movement, const QVector<TimelineViewGhostItem *> ghosts)
+rational TimelineWidget::Tool::ValidateTimeMovement(rational movement)
 {
-  foreach (TimelineViewGhostItem* ghost, ghosts) {
+  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
     if (ghost->mode() != Timeline::kMove) {
       continue;
     }
@@ -106,7 +106,7 @@ rational TimelineWidget::Tool::ValidateTimeMovement(rational movement, const QVe
   return movement;
 }
 
-int TimelineWidget::Tool::ValidateTrackMovement(int movement, const QVector<TimelineViewGhostItem *> ghosts)
+int TimelineWidget::Tool::ValidateTrackMovement(int movement, const QVector<TimelineViewGhostItem*>& ghosts)
 {
   foreach (TimelineViewGhostItem* ghost, ghosts) {
     if (ghost->mode() != Timeline::kMove) {
@@ -115,7 +115,7 @@ int TimelineWidget::Tool::ValidateTrackMovement(int movement, const QVector<Time
 
     if (!ghost->CanMoveTracks()) {
 
-      movement = 0;
+      return 0;
 
     } else if (ghost->Track().index() + movement < 0) {
 
@@ -128,7 +128,7 @@ int TimelineWidget::Tool::ValidateTrackMovement(int movement, const QVector<Time
   return movement;
 }
 
-void TimelineWidget::Tool::GetGhostData(const QVector<TimelineViewGhostItem *> &ghosts, rational *earliest_point, rational *latest_point)
+void TimelineWidget::Tool::GetGhostData(rational *earliest_point, rational *latest_point)
 {
   rational ep = RATIONAL_MAX;
   rational lp = RATIONAL_MIN;
@@ -147,11 +147,11 @@ void TimelineWidget::Tool::GetGhostData(const QVector<TimelineViewGhostItem *> &
   }
 }
 
-void TimelineWidget::Tool::InsertGapsAtGhostDestination(const QVector<TimelineViewGhostItem *> &ghosts, QUndoCommand *command)
+void TimelineWidget::Tool::InsertGapsAtGhostDestination(QUndoCommand *command)
 {
   rational earliest_point, latest_point;
 
-  GetGhostData(ghosts, &earliest_point, &latest_point);
+  GetGhostData(&earliest_point, &latest_point);
 
   parent()->InsertGapsAt(earliest_point, latest_point - earliest_point, command);
 }
diff --git a/app/widget/timelinewidget/undo/undo.cpp b/app/widget/timelinewidget/undo/undo.cpp
index ce66be641..bbad9ffcd 100644
--- a/app/widget/timelinewidget/undo/undo.cpp
+++ b/app/widget/timelinewidget/undo/undo.cpp
@@ -416,12 +416,9 @@ BlockSplitCommand::BlockSplitCommand(TrackOutput* track, Block *block, rational
   new_block_->setParent(&memory_manager_);
 
   // Determine if the block outputs to an "out" transition
-  foreach (NodeEdgePtr edge, block_->output()->edges()) {
-    if (edge->input()->parentNode()->IsBlock()
-        && static_cast<Block*>(edge->input()->parentNode())->type() == Block::kTransition
-        && edge->input() == static_cast<TransitionBlock*>(edge->input()->parentNode())->out_block_input()) {
-      transitions_to_move_.append(edge->input());
-    }
+  TransitionBlock* transition = TransitionBlock::GetBlockOutTransition(block_);
+  if (transition) {
+    transitions_to_move_.append(transition->out_block_input());
   }
 }
 
@@ -925,11 +922,23 @@ void BlockTrimCommand::redo_internal()
 
   track_->EndOperation();
 
+  if (block_->type() == Block::kTransition) {
+    // Whole transition needs to be invalidated
+    invalidate_range = TimeRange(block_->in(), block_->out());
+  }
+
   track_->InvalidateCache(invalidate_range, track_->block_input(), track_->block_input());
 }
 
 void BlockTrimCommand::undo_internal()
 {
+  TimeRange invalidate_range;
+
+  if (block_->type() == Block::kTransition) {
+    // Whole transition needs to be invalidated
+    invalidate_range = TimeRange(block_->in(), block_->out());
+  }
+
   track_->BeginOperation();
 
   // Will be POSITIVE if trimming shorter and NEGATIVE if trimming longer
@@ -969,14 +978,18 @@ void BlockTrimCommand::undo_internal()
     }
   }
 
-  TimeRange invalidate_range;
-
   if (mode_ == Timeline::kTrimIn) {
     block_->set_length_and_media_in(old_length_);
-    invalidate_range = TimeRange(block_->in(), block_->in() + trim_diff);
+
+    if (block_->type() != Block::kTransition) {
+      invalidate_range = TimeRange(block_->in(), block_->in() + trim_diff);
+    }
   } else {
     block_->set_length_and_media_out(old_length_);
-    invalidate_range = TimeRange(block_->out(), block_->out() - trim_diff);
+
+    if (block_->type() != Block::kTransition) {
+      invalidate_range = TimeRange(block_->out(), block_->out() - trim_diff);
+    }
   }
 
   track_->EndOperation();
@@ -1144,29 +1157,58 @@ void TrackSlideCommand::undo_internal()
 
 void TrackSlideCommand::slide_internal(bool undo)
 {
-  QMap<TrackOutput*, TimeRangeList> invalidate_ranges;
+  QMap<TrackOutput*, TimeRange> invalidate_ranges;
 
   // Make sure all movement blocks' old positions are invalidated
   foreach (const BlockSlideInfo& info, blocks_) {
     if (info.mode == Timeline::kMove) {
-      invalidate_ranges[info.track].InsertTimeRange(TimeRange(info.block->in(),
-                                                              info.block->out()));
+      invalidate_ranges.insert(info.track,
+                               TimeRange(info.block->in(),
+                                         info.block->out()));
     }
   }
 
   // Perform trims
-  foreach (const BlockSlideInfo& info, blocks_) {
+  int iterator = undo ? blocks_.size() - 1 : 0;
+  int limit = undo ? -1 : blocks_.size();
+
+  while (iterator != limit) {
+    const BlockSlideInfo& info = blocks_.at(iterator);
+
     info.track->BeginOperation();
 
     if (info.mode == Timeline::kTrimIn || info.mode == Timeline::kTrimOut) {
-      rational new_len = undo ? info.old_time : info.new_time;
+      qDebug() << "Trimming block as part of a slide operation:" << info.old_time << info.new_time;
+      if (info.new_time.isNull()) {
+        // Assume this was a gap that was reduced to nothing
+        // On undo, restore it, on redo, remove it
+        if (undo) {
+          Block* next = removed_block_next.takeLast();
+          static_cast<NodeGraph*>(info.track->parent())->AddNode(info.block);
 
-      if (info.mode == Timeline::kTrimIn) {
-        info.block->set_length_and_media_in(new_len);
+          if (next) {
+            info.track->InsertBlockBefore(info.block, next);
+          } else {
+            info.track->AppendBlock(info.block);
+          }
+        } else {
+          removed_block_next.append(info.block->next());
+          info.track->RippleRemoveBlock(info.block);
+          TakeNodeFromParentGraph(info.block, &memory_manager_);
+        }
       } else {
-        info.block->set_length_and_media_out(new_len);
+        rational new_len = undo ? info.old_time : info.new_time;
+
+        if (info.mode == Timeline::kTrimIn) {
+          info.block->set_length_and_media_in(new_len);
+        } else {
+          info.block->set_length_and_media_out(new_len);
+        }
       }
-    } else if (!undo && info.mode == Timeline::kMove && !info.block->previous()) {
+    } else if (!undo
+               && info.mode == Timeline::kMove
+               && !info.block->previous()
+               && info.new_time > info.old_time) {
       // If this is a moving block and there was nothing before it to offset its time correctly,
       // insert a gap here
       GapBlock* gap = new GapBlock();
@@ -1177,6 +1219,12 @@ void TrackSlideCommand::slide_internal(bool undo)
     }
 
     info.track->EndOperation();
+
+    if (undo) {
+      iterator--;
+    } else {
+      iterator++;
+    }
   }
 
   if (undo) {
@@ -1198,16 +1246,16 @@ void TrackSlideCommand::slide_internal(bool undo)
   // Make sure all movement blocks' new positions are invalidated
   foreach (const BlockSlideInfo& info, blocks_) {
     if (info.mode == Timeline::kMove) {
-      invalidate_ranges[info.track].InsertTimeRange(TimeRange(info.block->in(),
-                                                              info.block->out()));
+      TimeRange& range = invalidate_ranges[info.track];
+
+      range.set_range(qMin(range.in(), info.block->in()),
+                      qMax(range.out(), info.block->out()));
     }
   }
 
-  QMap<TrackOutput*, TimeRangeList>::const_iterator i;
+  QMap<TrackOutput*, TimeRange>::const_iterator i;
   for (i=invalidate_ranges.constBegin(); i!=invalidate_ranges.constEnd(); i++) {
-    foreach (const TimeRange& r, i.value()) {
-      i.key()->InvalidateCache(r, i.key()->block_input(), i.key()->block_input());
-    }
+    i.key()->InvalidateCache(i.value(), i.key()->block_input(), i.key()->block_input());
   }
 }
 
@@ -1588,4 +1636,83 @@ void TrackListInsertGaps::undo_internal()
   }
 }
 
+TransitionRemoveCommand::TransitionRemoveCommand(TrackOutput* track, TransitionBlock *block, QUndoCommand* parent) :
+  UndoCommand(parent),
+  track_(track),
+  block_(block),
+  out_block_(block_->connected_out_block()),
+  in_block_(block_->connected_in_block())
+{
+  // Can't remove a transition in this way unless it's connected to at least one other block
+  Q_ASSERT(out_block_ || in_block_);
+}
+
+Project *TransitionRemoveCommand::GetRelevantProject() const
+{
+  return static_cast<Sequence*>(track_->parent())->project();
+}
+
+void TransitionRemoveCommand::redo_internal()
+{
+  track_->BeginOperation();
+
+  TimeRange invalidate_range(block_->in(), block_->out());
+
+  if (in_block_) {
+    in_block_->set_length_and_media_in(in_block_->length() + block_->in_offset());
+  }
+
+  if (out_block_) {
+    out_block_->set_length_and_media_out(out_block_->length() + block_->out_offset());
+  }
+
+  if (in_block_) {
+    NodeParam::DisconnectEdge(in_block_->output(), block_->in_block_input());
+  }
+
+  if (out_block_) {
+    NodeParam::DisconnectEdge(out_block_->output(), block_->out_block_input());
+  }
+
+  track_->RippleRemoveBlock(block_);
+
+  track_->EndOperation();
+
+  track_->InvalidateCache(invalidate_range, track_->block_input(), track_->block_input());
+}
+
+void TransitionRemoveCommand::undo_internal()
+{
+  track_->BeginOperation();
+
+  if (in_block_) {
+    track_->InsertBlockBefore(block_, in_block_);
+  } else {
+    track_->InsertBlockAfter(block_, out_block_);
+  }
+
+  if (in_block_) {
+    NodeParam::ConnectEdge(in_block_->output(), block_->in_block_input());
+  }
+
+  if (out_block_) {
+    NodeParam::ConnectEdge(out_block_->output(), block_->out_block_input());
+  }
+
+  // These if statements must be separated because in_offset and out_offset report different things
+  // if only one block is connected vs two. So we have to connect the blocks first before we have
+  // an accurate return value from these offset functions.
+  if (in_block_) {
+    in_block_->set_length_and_media_in(in_block_->length() - block_->in_offset());
+  }
+
+  if (out_block_) {
+    out_block_->set_length_and_media_out(out_block_->length() - block_->out_offset());
+  }
+
+  track_->EndOperation();
+
+  track_->InvalidateCache(TimeRange(block_->in(), block_->out()), track_->block_input(), track_->block_input());
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/timelinewidget/undo/undo.h b/app/widget/timelinewidget/undo/undo.h
index e69665e38..14ada4d5a 100644
--- a/app/widget/timelinewidget/undo/undo.h
+++ b/app/widget/timelinewidget/undo/undo.h
@@ -25,6 +25,7 @@
 
 #include "node/block/block.h"
 #include "node/block/gap/gap.h"
+#include "node/block/transition/transition.h"
 #include "node/output/track/track.h"
 #include "node/output/track/tracklist.h"
 #include "timeline/timelinepoints.h"
@@ -574,6 +575,9 @@ private:
 
   QVector<BlockSlideInfo> blocks_;
   QList<GapBlock*> added_gaps_;
+  QList<Block*> removed_block_next;
+
+  QObject memory_manager_;
 
 };
 
@@ -606,6 +610,26 @@ private:
 
 };
 
+class TransitionRemoveCommand : public UndoCommand {
+public:
+  TransitionRemoveCommand(TrackOutput *track, TransitionBlock* block, QUndoCommand *parent = nullptr);
+
+  virtual Project* GetRelevantProject() const override;
+
+protected:
+  virtual void redo_internal() override;
+  virtual void undo_internal() override;
+
+private:
+  TrackOutput* track_;
+
+  TransitionBlock* block_;
+
+  Block* out_block_;
+  Block* in_block_;
+
+};
+
 OLIVE_NAMESPACE_EXIT
 
 #endif // TIMELINEUNDOABLE_H
diff --git a/app/widget/timelinewidget/view/timelineviewghostitem.cpp b/app/widget/timelinewidget/view/timelineviewghostitem.cpp
index 6a3fe415d..e407cc8e9 100644
--- a/app/widget/timelinewidget/view/timelineviewghostitem.cpp
+++ b/app/widget/timelinewidget/view/timelineviewghostitem.cpp
@@ -46,8 +46,16 @@ TimelineViewGhostItem *TimelineViewGhostItem::FromBlock(Block *block, const Trac
   ghost->SetYCoords(y, height);
   ghost->setData(kAttachedBlock, Node::PtrToValue(block));
 
-  if (block->type() == Block::kClip) {
+  switch (block->type()) {
+  case Block::kClip:
     ghost->can_have_zero_length_ = false;
+    break;
+  case Block::kTransition:
+    ghost->can_have_zero_length_ = false;
+    ghost->SetCanMoveTracks(false);
+    break;
+  case Block::kGap:
+    break;
   }
 
   return ghost;
diff --git a/app/widget/timelinewidget/view/timelineviewghostitem.h b/app/widget/timelinewidget/view/timelineviewghostitem.h
index 373562900..f61cb2030 100644
--- a/app/widget/timelinewidget/view/timelineviewghostitem.h
+++ b/app/widget/timelinewidget/view/timelineviewghostitem.h
@@ -38,7 +38,9 @@ public:
   enum DataType {
     kAttachedBlock,
     kReferenceBlock,
-    kAttachedFootage
+    kAttachedFootage,
+    kTrimOverwriteAllowed,
+    kPointerToolMode
   };
 
   TimelineViewGhostItem(QGraphicsItem* parent = nullptr);

From c76b25a17ac49f5ed4827fa7df3a0a3679273ee3 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 23 Jul 2020 01:29:04 +1000
Subject: [PATCH 077/138] timeline: tools don't need to call move in the
 release function

I had thought that the cursor may still have moved between the last
mouseMoveEvent and the mouseReleaseEvent, but that turns out to be false
making it completely unnecessary to call move functions in the release
function.
---
 app/widget/timelinewidget/tool/add.cpp        | 2 --
 app/widget/timelinewidget/tool/transition.cpp | 2 --
 2 files changed, 4 deletions(-)

diff --git a/app/widget/timelinewidget/tool/add.cpp b/app/widget/timelinewidget/tool/add.cpp
index 58b4e44de..f488bbfca 100644
--- a/app/widget/timelinewidget/tool/add.cpp
+++ b/app/widget/timelinewidget/tool/add.cpp
@@ -89,8 +89,6 @@ void TimelineWidget::AddTool::MouseMove(TimelineViewMouseEvent *event)
 
 void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event)
 {
-  MouseMove(event);
-
   const TrackReference& track = ghost_->Track();
 
   if (ghost_) {
diff --git a/app/widget/timelinewidget/tool/transition.cpp b/app/widget/timelinewidget/tool/transition.cpp
index 3b8f0ae40..d3f4d6a74 100644
--- a/app/widget/timelinewidget/tool/transition.cpp
+++ b/app/widget/timelinewidget/tool/transition.cpp
@@ -106,8 +106,6 @@ void TimelineWidget::TransitionTool::MouseMove(TimelineViewMouseEvent *event)
 
 void TimelineWidget::TransitionTool::MouseRelease(TimelineViewMouseEvent *event)
 {
-  MouseMove(event);
-
   const TrackReference& track = ghost_->Track();
 
   if (ghost_) {

From 023ded1fb56456eed31cae1a05041bd9d21ec92b Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 23 Jul 2020 18:37:57 +1000
Subject: [PATCH 078/138] timeline: overhauled pointer tool again

Allows dynamic switching between pointer/roll/slide since occasionally this
behavior is interchangeable. Fixes a lot of transition behavior (but not
all of it).
---
 app/timeline/trackreference.cpp               |   8 +
 app/timeline/trackreference.h                 |   4 +
 app/widget/timelinewidget/timelinewidget.cpp  |   6 +-
 app/widget/timelinewidget/timelinewidget.h    |  16 +-
 app/widget/timelinewidget/tool/pointer.cpp    | 531 +++++++++---------
 app/widget/timelinewidget/tool/ripple.cpp     |   8 +-
 app/widget/timelinewidget/tool/rolling.cpp    |   2 +-
 app/widget/timelinewidget/tool/slide.cpp      |   2 +-
 app/widget/timelinewidget/tool/tool.cpp       |  17 -
 app/widget/timelinewidget/undo/undo.cpp       | 183 +++---
 app/widget/timelinewidget/undo/undo.h         |  27 +-
 .../view/timelineviewghostitem.h              |   5 +-
 12 files changed, 406 insertions(+), 403 deletions(-)

diff --git a/app/timeline/trackreference.cpp b/app/timeline/trackreference.cpp
index 8360d0fd8..6c046df7a 100644
--- a/app/timeline/trackreference.cpp
+++ b/app/timeline/trackreference.cpp
@@ -49,4 +49,12 @@ bool TrackReference::operator==(const TrackReference &ref) const
   return type_ == ref.type_ && index_ == ref.index_;
 }
 
+uint qHash(const TrackReference &r, uint seed)
+{
+  // Not super efficient, but couldn't think of any better way to ensure a different hash each time
+  return ::qHash(QStringLiteral("%1:%2").arg(QString::number(r.type()),
+                                             QString::number(r.index())),
+                 seed);
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/timeline/trackreference.h b/app/timeline/trackreference.h
index 4aea1e3c2..842985168 100644
--- a/app/timeline/trackreference.h
+++ b/app/timeline/trackreference.h
@@ -36,6 +36,8 @@ public:
 
   const int& index() const;
 
+  bool operator<(const TrackReference& ref) const;
+
   bool operator==(const TrackReference& ref) const;
 
 private:
@@ -44,6 +46,8 @@ private:
   int index_;
 };
 
+uint qHash(const TrackReference& r, uint seed);
+
 OLIVE_NAMESPACE_EXIT
 
 #endif // TRACKREFERENCE_H
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index 63163da0e..3a89da8fc 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -523,9 +523,6 @@ void TimelineWidget::DeleteSelected(bool ripple)
     }
   }
 
-  // Replace clips with gaps (effectively deleting them)
-  ReplaceBlocksWithGaps(clips_to_delete, true, command);
-
   // For transitions, remove them but extend their attached blocks to fill their place
   foreach (TransitionBlock* transition, transitions_to_delete) {
     new TransitionRemoveCommand(TrackOutput::TrackFromBlock(transition),
@@ -537,6 +534,9 @@ void TimelineWidget::DeleteSelected(bool ripple)
                                     command);
   }
 
+  // Replace clips with gaps (effectively deleting them)
+  ReplaceBlocksWithGaps(clips_to_delete, true, command);
+
   // Insert ripple command now that it's all cleaned up gaps
   if (ripple) {
     TimeRangeList range_list;
diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h
index c3d6d5912..7b957c67c 100644
--- a/app/widget/timelinewidget/timelinewidget.h
+++ b/app/widget/timelinewidget/timelinewidget.h
@@ -243,9 +243,9 @@ private:
     virtual void InitiateDrag(TimelineViewBlockItem* clicked_item,
                               Timeline::MovementMode trim_mode);
 
-    TimelineViewGhostItem* AddGhostFromBlock(Block *block, const TrackReference& track, Timeline::MovementMode mode, bool trim_overwrite_allowed);
+    TimelineViewGhostItem* AddGhostFromBlock(Block *block, const TrackReference& track, Timeline::MovementMode mode, bool check_if_exists = false);
 
-    TimelineViewGhostItem* AddGhostFromNull(const rational& in, const rational& out, const TrackReference& track, Timeline::MovementMode mode, bool trim_overwrite_allowed);
+    TimelineViewGhostItem* AddGhostFromNull(const rational& in, const rational& out, const TrackReference& track, Timeline::MovementMode mode);
 
     /**
      * @brief Validates Ghosts that are getting their in points trimmed
@@ -265,16 +265,10 @@ private:
 
     virtual void ProcessDrag(const TimelineCoordinate &mouse_pos);
 
-    enum GhostMode {
-      kPointer,
-      kRolling,
-      kSlide
-    };
-
     void InitiateDragInternal(TimelineViewBlockItem* clicked_item,
                               Timeline::MovementMode trim_mode,
-                              GhostMode pointer_mode,
-                              bool trim_overwrite_allowed);
+                              bool dont_roll_trims,
+                              bool allow_nongap_rolling, bool slide_instead_of_moving);
 
     const Timeline::MovementMode& drag_movement_mode() const
     {
@@ -304,7 +298,7 @@ private:
   private:
     Timeline::MovementMode IsCursorInTrimHandle(TimelineViewBlockItem* block, qreal cursor_x);
 
-    void AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode, bool trim_overwrite_allowed);
+    void AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode);
 
     bool IsClipTrimmable(TimelineViewBlockItem* clip,
                          const QList<TimelineViewBlockItem*>& items,
diff --git a/app/widget/timelinewidget/tool/pointer.cpp b/app/widget/timelinewidget/tool/pointer.cpp
index 9c17f4e8d..85e1884f5 100644
--- a/app/widget/timelinewidget/tool/pointer.cpp
+++ b/app/widget/timelinewidget/tool/pointer.cpp
@@ -194,10 +194,17 @@ void TimelineWidget::PointerTool::HoverMove(TimelineViewMouseEvent *event)
   }
 }
 
+void SetGhostToSlideMode(TimelineViewGhostItem* g)
+{
+  g->SetCanMoveTracks(false);
+  g->setData(TimelineViewGhostItem::kGhostIsSliding, true);
+}
+
 void TimelineWidget::PointerTool::InitiateDragInternal(TimelineViewBlockItem *clicked_item,
                                                        Timeline::MovementMode trim_mode,
-                                                       GhostMode pointer_mode,
-                                                       bool trim_overwrite_allowed)
+                                                       bool dont_roll_trims,
+                                                       bool allow_nongap_rolling,
+                                                       bool slide_instead_of_moving)
 {
   // Get list of selected blocks
   QList<TimelineViewBlockItem*> clips = parent()->GetSelectedBlocks();
@@ -214,42 +221,108 @@ void TimelineWidget::PointerTool::InitiateDragInternal(TimelineViewBlockItem *cl
       return;
     }
 
-    // Create ghosts for moving
-    foreach (TimelineViewBlockItem* clip_item, clips) {
-      Block* block = clip_item->block();
+    // Determine if this move is a slide, which is determined by either
+    bool clips_are_sliding = (slide_instead_of_moving || clicked_block_type == Block::kTransition);
 
-      if (block->type() == Block::kGap) {
-        // Gaps cannot move, ignore this block
-        continue;
+    if (clips_are_sliding) {
+      // This is a slide. What we do here is move clips within their own track, between the clips
+      // that they're already next to. We don't allow changing tracks or changing the order of
+      // blocks.
+      //
+      // For slides to be legal, we make all blocks "contiguous". This means that only one series
+      // of blocks can move at a time and prevents.
+
+      QHash<TrackReference, Block*> earliest_block_on_track;
+      QHash<TrackReference, Block*> latest_block_on_track;
+
+      foreach (TimelineViewBlockItem* item, clips) {
+        Block* this_block = item->block();
+        const TrackReference& track = item->Track();
+
+        Block* current_earliest = earliest_block_on_track.value(track, nullptr);
+        if (!current_earliest || this_block->in() < current_earliest->in()) {
+          earliest_block_on_track.insert(track, item->block());
+        }
+
+        Block* current_latest = latest_block_on_track.value(track, nullptr);
+        if (!current_latest || this_block->out() > current_earliest->out()) {
+          latest_block_on_track.insert(track, item->block());
+        }
       }
 
-      if (clicked_block_type == Block::kTransition && block->type() != Block::kTransition) {
-        // Transitions always slide rather than move, so if we clicked a transition, ignore any
-        // non-transitions
-        continue;
+      QHash<TrackReference, Block*>::const_iterator i;
+      for (i=earliest_block_on_track.constBegin(); i!=earliest_block_on_track.constEnd(); i++) {
+        // Make a contiguous stream
+        const TrackReference& track = i.key();
+        Block* earliest = i.value();
+        Block* latest = latest_block_on_track.value(i.key());
+
+        // First we add the block that's out trimming, the one prior to the earliest
+        TimelineViewGhostItem* earliest_ghost;
+        if (earliest->previous()) {
+          earliest_ghost = AddGhostFromBlock(earliest->previous(), track, Timeline::kTrimOut);
+        } else {
+          earliest_ghost = AddGhostFromNull(earliest->in(), earliest->in(), track, Timeline::kTrimOut);
+        }
+        SetGhostToSlideMode(earliest_ghost);
+
+        // Then we add the block that's in trimming, the one after the latest
+        if (latest->next()) {
+          TimelineViewGhostItem* latest_ghost = AddGhostFromBlock(latest->next(), track, Timeline::kTrimIn);
+          SetGhostToSlideMode(latest_ghost);
+        }
+
+        // Finally, we add all of the moving blocks in between
+        Block* b = nullptr;
+        do {
+          // On first run-through, set to earliest only. From then on, set to the next of the last
+          // in the loop.
+          if (b) {
+            b = b->next();
+          } else {
+            b = earliest;
+          }
+
+          TimelineViewGhostItem* between_ghost = AddGhostFromBlock(b, track, Timeline::kMove);
+          SetGhostToSlideMode(between_ghost);
+        } while (b != latest);
       }
+    } else {
+      // Prepare for a standard pointer move
+      foreach (TimelineViewBlockItem* clip_item, clips) {
+        Block* block = clip_item->block();
 
-      // Create ghost
-      TimelineViewGhostItem* ghost = AddGhostFromBlock(block, clip_item->Track(),
-                                                       trim_mode, trim_overwrite_allowed);
+        if (block->type() == Block::kGap || block->type() == Block::kTransition) {
+          // Gaps cannot move, and we handle transitions further down
+          continue;
+        }
 
-      if (clicked_block_type == Block::kTransition) {
-        // Transition moves are always a slide
-        ghost->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
-      } else {
-        // Set to default behavior
-        ghost->setData(TimelineViewGhostItem::kPointerToolMode, pointer_mode);
+        // Create ghost
+        TimelineViewGhostItem* ghost = AddGhostFromBlock(block,
+                                                         clip_item->Track(),
+                                                         trim_mode);
+        Q_UNUSED(ghost)
 
-        // Include transitions (if any)
-        AddMovingTransitionsToClipGhost(block, clip_item->Track(), trim_mode, clips);
+        // Add transitions if this has any
+        TransitionBlock* opening_transition = TransitionBlock::GetBlockInTransition(block);
+        TransitionBlock* closing_transition = TransitionBlock::GetBlockOutTransition(block);
+
+        if (opening_transition) {
+          TimelineViewGhostItem* ot_ghost = AddGhostFromBlock(opening_transition,
+                                                              clip_item->Track(),
+                                                              trim_mode);
+          Q_UNUSED(ot_ghost)
+        }
+
+        if (closing_transition) {
+          TimelineViewGhostItem* cl_ghost = AddGhostFromBlock(closing_transition,
+                                                              clip_item->Track(),
+                                                              trim_mode);
+          Q_UNUSED(cl_ghost)
+        }
       }
     }
 
-    // If we slid the blocks, we must process them as such
-    if (clicked_block_type == Block::kTransition || pointer_mode == kSlide) {
-      ProcessGhostsForSliding();
-    }
-
   } else {
 
     // "Multi-trim" is trimming a clip on more than one track. Only the earliest (for in trimming)
@@ -267,66 +340,88 @@ void TimelineWidget::PointerTool::InitiateDragInternal(TimelineViewBlockItem *cl
       }
 
       Block* block = clip_item->block();
-      Timeline::MovementMode block_mode = trim_mode;
-      bool block_trim_overwrite_allowed = trim_overwrite_allowed;
-
-      // Some tools interpret "gap trimming" as equivalent to resizing the adjacent block. In that
-      // scenario, we include the adjacent block instead.
-      if (block->type() == Block::kGap && !gap_trimming_allowed_) {
-        block = (trim_mode == Timeline::kTrimIn) ? block->previous() : block->next();
-        block_mode = FlipTrimMode(trim_mode);
-
-        // If there's no adjacent block, do nothing here
-        if (!block) {
-          continue;
-        }
-      }
-
-      // For transitions, we create a rolling edit with the attached clip
-      if (block->type() == Block::kTransition) {
-        TransitionBlock* transition = static_cast<TransitionBlock*>(block);
-        TimelineViewGhostItem* g = nullptr;
-
-        Block* previous = transition->previous();
-        Block* next = transition->next();
-
-        if (block_mode == Timeline::kTrimIn
-            && previous
-            && (previous == transition->connected_out_block() || previous->type() == Block::kGap)) {
-          g = AddGhostFromBlock(previous, clip_item->Track(), Timeline::kTrimOut, true);
-        } else if (block_mode == Timeline::kTrimOut
-                   && next
-                   && (next == transition->connected_in_block() || next->type() == Block::kGap)) {
-          g = AddGhostFromBlock(next, clip_item->Track(), Timeline::kTrimIn, true);
-        }
-
-        if (g) {
-          g->setData(TimelineViewGhostItem::kPointerToolMode, kRolling);
-          block_trim_overwrite_allowed = true;
-        }
-      }
 
       // Create ghost for this block
-      TimelineViewGhostItem* ghost = AddGhostFromBlock(block, clip_item->Track(), block_mode, block_trim_overwrite_allowed);
+      TimelineViewGhostItem* ghost = AddGhostFromBlock(block, clip_item->Track(), trim_mode);
 
-      if (block->type() == Block::kTransition) {
+      // If this side of the clip has a transition, we treat it more like a slide for that
+      // transition than a trim/roll
+      bool treat_trim_as_slide = false;
 
-        // If this is a transition, set to rolling as above
-        ghost->setData(TimelineViewGhostItem::kPointerToolMode, kRolling);
+      if (block->type() == Block::kClip) {
+        // See if this clip has a transition attached, and move it with the trim if so
+        TransitionBlock* connected_transition;
 
-      } else {
-
-        // For trimmed clips, we also "move" the transitions if any are attached
-        if (AddMovingTransitionsToClipGhost(block, clip_item->Track(), trim_mode, clips)) {
-          ghost->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
+        // Get appropriate transition for the side of the clip
+        if (trim_mode == Timeline::kTrimIn) {
+          connected_transition = TransitionBlock::GetBlockInTransition(block);
         } else {
-          ghost->setData(TimelineViewGhostItem::kPointerToolMode, kPointer);
+          connected_transition = TransitionBlock::GetBlockOutTransition(block);
+        }
+
+        if (connected_transition) {
+          // We found a transition, we'll make this a "slide" action
+          TimelineViewGhostItem* transition_ghost = AddGhostFromBlock(connected_transition, clip_item->Track(), Timeline::kMove);
+
+          // This will in effect be a slide with the transition moving between two other blocks
+          SetGhostToSlideMode(ghost);
+          SetGhostToSlideMode(transition_ghost);
+          treat_trim_as_slide = true;
+
+          // Further processing will apply to this transition rather than the clip
+          block = connected_transition;
         }
       }
-    }
 
-    if (pointer_mode == kRolling) {
-      ProcessGhostsForRolling();
+      // Standard pointer trimming in reality is a "roll" edit with an adjacent gap (one that may
+      // or may not exist already)
+      if (!dont_roll_trims) {
+        Block* adjacent = nullptr;
+
+        // Determine which block is adjacent
+        if (trim_mode == Timeline::kTrimIn) {
+          adjacent = block->previous();
+        } else {
+          adjacent = block->next();
+        }
+
+        // See if we can roll the adjacent or if we'll need to create our own gap
+        if (block->type() != Block::kGap
+            && !allow_nongap_rolling && adjacent && adjacent->type() != Block::kGap
+            && !(block->type() == Block::kTransition
+                 && ((trim_mode == Timeline::kTrimIn && static_cast<TransitionBlock*>(block)->connected_out_block() == adjacent)
+                     || (trim_mode == Timeline::kTrimOut && static_cast<TransitionBlock*>(block)->connected_in_block() == adjacent)))) {
+          adjacent = nullptr;
+        }
+
+        Timeline::MovementMode flipped_mode = FlipTrimMode(trim_mode);
+        TimelineViewGhostItem* adjacent_ghost;
+
+        if (adjacent) {
+          adjacent_ghost = AddGhostFromBlock(adjacent, clip_item->Track(), flipped_mode);
+        } else if (trim_mode == Timeline::kTrimIn || block->next()) {
+          rational null_ghost_pos = (trim_mode == Timeline::kTrimIn) ? block->in() : block->out();
+
+          adjacent_ghost = AddGhostFromNull(null_ghost_pos, null_ghost_pos, clip_item->Track(), flipped_mode);
+        } else {
+          adjacent_ghost = nullptr;
+        }
+
+        // If we have an adjacent block (for any reason), this is a roll edit and the adjacent is
+        // expected to fill the remaining space (no gap needs to be created)
+        ghost->setData(TimelineViewGhostItem::kTrimIsARollEdit, static_cast<bool>(adjacent));
+
+        if (adjacent_ghost) {
+          if (treat_trim_as_slide) {
+            // We're sliding a transition rather than a pure trim/roll
+            SetGhostToSlideMode(adjacent_ghost);
+          } else if (block->type() == Block::kGap) {
+            ghost->setData(TimelineViewGhostItem::kTrimShouldBeIgnored, true);
+          } else {
+            adjacent_ghost->setData(TimelineViewGhostItem::kTrimShouldBeIgnored, true);
+          }
+        }
+      }
     }
   }
 }
@@ -418,16 +513,15 @@ void TimelineWidget::PointerTool::FinishDrag(TimelineViewMouseEvent *event)
   QList<GhostBlockPair> blocks_sliding;
   QList<GhostBlockPair> blocks_trimming;
 
+  // Sort ghosts depending on which ones are trimming, which are moving, and which are sliding
   foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
     if (ghost->HasBeenAdjusted()) {
       Block* b = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
 
-      if (ghost->mode() == Timeline::kMove) {
-        if (ghost->data(TimelineViewGhostItem::kPointerToolMode) == kSlide) {
-          blocks_sliding.append({ghost, b});
-        } else {
-          blocks_moving.append({ghost, b});
-        }
+      if (ghost->data(TimelineViewGhostItem::kGhostIsSliding).toBool()) {
+        blocks_sliding.append({ghost, b});
+      } else if (ghost->mode() == Timeline::kMove) {
+        blocks_moving.append({ghost, b});
       } else if (Timeline::IsATrimMode(ghost->mode())) {
         blocks_trimming.append({ghost, b});
       }
@@ -441,46 +535,28 @@ void TimelineWidget::PointerTool::FinishDrag(TimelineViewMouseEvent *event)
     return;
   }
 
-  // See if we're duplicated because ALT is held (only moved blocks can duplicate)
-  bool duplicate_clips = (!blocks_moving.isEmpty() && event->GetModifiers() & Qt::AltModifier);
-  bool inserting = (!blocks_moving.isEmpty() && event->GetModifiers() & Qt::ControlModifier);
-
-  // Slide info
-  QVector<TrackSlideCommand::BlockSlideInfo> slide_info;
-
   QUndoCommand* command = new QUndoCommand();
 
   foreach (const GhostBlockPair& p, blocks_trimming) {
     TimelineViewGhostItem* ghost = p.ghost;
 
-    GhostMode m = static_cast<GhostMode>(ghost->data(TimelineViewGhostItem::kPointerToolMode).toInt());
+    if (!ghost->data(TimelineViewGhostItem::kTrimShouldBeIgnored).toBool()) {
+      // Must be an ordinary trim/roll
+      BlockTrimCommand* c = new BlockTrimCommand(parent()->GetTrackFromReference(ghost->GetAdjustedTrack()),
+                                                 p.block,
+                                                 ghost->AdjustedLength(),
+                                                 ghost->mode(),
+                                                 command);
 
-    switch (m) {
-    case kPointer:
-    case kRolling:
-      if (m != kRolling || ghost->mode() == drag_movement_mode()) {
-        BlockTrimCommand* c = new BlockTrimCommand(parent()->GetTrackFromReference(ghost->GetAdjustedTrack()),
-                                                   p.block,
-                                                   ghost->AdjustedLength(),
-                                                   ghost->mode(),
-                                                   command);
-
-        if (m == kRolling) {
-          c->SetAllowNonGapTrimming(true);
-        }
-      }
-      break;
-    case kSlide:
-      slide_info.append({parent()->GetTrackFromReference(ghost->Track()),
-                         p.block,
-                         ghost->mode(),
-                         ghost->AdjustedLength(),
-                         ghost->Length()});
-      break;
+      c->SetTrimIsARollEdit(ghost->data(TimelineViewGhostItem::kTrimIsARollEdit).toBool());
     }
   }
 
   if (!blocks_moving.isEmpty()) {
+    // See if we're duplicated because ALT is held (only moved blocks can duplicate)
+    bool duplicate_clips = (event->GetModifiers() & Qt::AltModifier);
+    bool inserting = (event->GetModifiers() & Qt::ControlModifier);
+
     // If we're not duplicating, "remove" the clips and replace them with gaps
     if (!duplicate_clips) {
       QList<Block*> blocks_to_delete;
@@ -525,17 +601,61 @@ void TimelineWidget::PointerTool::FinishDrag(TimelineViewMouseEvent *event)
   }
 
   if (!blocks_sliding.isEmpty()) {
-    foreach (const GhostBlockPair& p, blocks_sliding) {
-      slide_info.append({parent()->GetTrackFromReference(p.ghost->Track()),
-                         p.block,
-                         p.ghost->mode(),
-                         p.ghost->GetAdjustedIn(),
-                         p.ghost->In()});
-    }
-  }
+    // Assume that the blocks are contiguous per track as set up in InitiateGhostsInternal()
 
-  if (!slide_info.isEmpty()) {
-    new TrackSlideCommand(slide_info, command);
+    // All we need to do is sort them by track and order them
+    QHash<TrackReference, QList<Block*> > slide_info;
+    QHash<TrackReference, Block*> in_adjacents;
+    QHash<TrackReference, Block*> out_adjacents;
+    rational movement;
+
+    foreach (const GhostBlockPair& p, blocks_sliding) {
+      const TrackReference& track = p.ghost->Track();
+
+      switch (p.ghost->mode()) {
+      case Timeline::kNone:
+        break;
+      case Timeline::kMove:
+      {
+        // These all should have moved uniformly, so as long as this is set, it should be fine
+        movement = p.ghost->InAdjustment();
+
+        QList<Block*>& blocks_on_this_track = slide_info[track];
+        bool inserted = false;
+
+        for (int i=0;i<blocks_on_this_track.size();i++) {
+          if (blocks_on_this_track.at(i)->in() > p.block->in()) {
+            blocks_on_this_track.insert(i, p.block);
+            inserted = true;
+            break;
+          }
+        }
+
+        if (!inserted) {
+          blocks_on_this_track.append(p.block);
+        }
+        break;
+      }
+      case Timeline::kTrimIn:
+        out_adjacents.insert(track, p.block);
+        break;
+      case Timeline::kTrimOut:
+        in_adjacents.insert(track, p.block);
+        break;
+      }
+    }
+
+    if (!movement.isNull()) {
+      QHash<TrackReference, QList<Block*> >::const_iterator i;
+      for (i=slide_info.constBegin(); i!=slide_info.constEnd(); i++) {
+        new TrackSlideCommand(parent()->GetTrackFromReference(i.key()),
+                              i.value(),
+                              in_adjacents.value(i.key()),
+                              out_adjacents.value(i.key()),
+                              movement,
+                              command);
+      }
+    }
   }
 
   Core::instance()->undo_stack()->pushIfHasChildren(command);
@@ -562,22 +682,38 @@ Timeline::MovementMode TimelineWidget::PointerTool::IsCursorInTrimHandle(Timelin
 void TimelineWidget::PointerTool::InitiateDrag(TimelineViewBlockItem* clicked_item,
                                                Timeline::MovementMode trim_mode)
 {
-  InitiateDragInternal(clicked_item, trim_mode, kPointer, false);
+  InitiateDragInternal(clicked_item, trim_mode, false, false, false);
 }
 
-TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromBlock(Block* block, const TrackReference& track, Timeline::MovementMode mode, bool trim_overwrite_allowed)
+//#define HIDE_GAP_GHOSTS
+
+TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromBlock(Block* block, const TrackReference& track, Timeline::MovementMode mode, bool check_if_exists)
 {
+  if (check_if_exists) {
+    foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
+      if (Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock)) == block) {
+        return ghost;
+      }
+    }
+  }
+
   TimelineViewGhostItem* ghost = TimelineViewGhostItem::FromBlock(block,
                                                                   track,
                                                                   parent()->GetTrackY(track),
                                                                   parent()->GetTrackHeight(track));
 
-  AddGhostInternal(ghost, mode, trim_overwrite_allowed);
+#ifdef HIDE_GAP_GHOSTS
+  if (block->type() == Block::kGap) {
+    ghost->SetInvisible(true);
+  }
+#endif
+
+  AddGhostInternal(ghost, mode);
 
   return ghost;
 }
 
-TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromNull(const rational &in, const rational &out, const TrackReference& track, Timeline::MovementMode mode, bool trim_overwrite_allowed)
+TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromNull(const rational &in, const rational &out, const TrackReference& track, Timeline::MovementMode mode)
 {
   TimelineViewGhostItem* ghost = new TimelineViewGhostItem();
 
@@ -586,15 +722,18 @@ TimelineViewGhostItem* TimelineWidget::PointerTool::AddGhostFromNull(const ratio
   ghost->SetTrack(track);
   ghost->SetYCoords(parent()->GetTrackY(track), parent()->GetTrackHeight(track));
 
-  AddGhostInternal(ghost, mode, trim_overwrite_allowed);
+#ifdef HIDE_GAP_GHOSTS
+  ghost->SetInvisible(true);
+#endif
+
+  AddGhostInternal(ghost, mode);
 
   return ghost;
 }
 
-void TimelineWidget::PointerTool::AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode, bool trim_overwrite_allowed)
+void TimelineWidget::PointerTool::AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode)
 {
   ghost->SetMode(mode);
-  ghost->setData(TimelineViewGhostItem::kTrimOverwriteAllowed, trim_overwrite_allowed);
 
   // Prepare snap points (optimizes snapping for later)
   switch (mode) {
@@ -631,93 +770,6 @@ bool TimelineWidget::PointerTool::IsClipTrimmable(TimelineViewBlockItem* clip,
   return true;
 }
 
-struct TrackBlockListPair {
-  TrackReference track;
-  QList<Block*> blocks;
-};
-
-void TimelineWidget::PointerTool::ProcessGhostsForSliding()
-{
-  // Sort blocks into tracks
-  QList<TrackBlockListPair> blocks_per_track;
-  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
-    Block* b = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
-    bool found = false;
-
-    for (int i=0;i<blocks_per_track.size();i++) {
-      if (blocks_per_track.at(i).track == ghost->Track()) {
-        blocks_per_track[i].blocks.append(b);
-        found = true;
-        break;
-      }
-    }
-
-    if (!found) {
-      blocks_per_track.append({ghost->Track(), {b}});
-    }
-  }
-
-  // Make contiguous runs of blocks per each track
-  foreach (const TrackBlockListPair& p, blocks_per_track) {
-    // Blocks must be merged if any are non-adjacent
-    const TrackReference& track = p.track;
-    const QList<Block*>& blocks = p.blocks;
-
-    Block* earliest_block = blocks.first();
-    Block* latest_block = blocks.first();
-
-    // Find the earliest and latest selected blocks
-    for (int j=1;j<blocks.size();j++) {
-      Block* compare = blocks.at(j);
-
-      if (compare->in() < earliest_block->in()) {
-        earliest_block = compare;
-      }
-
-      if (compare->in() > latest_block->in()) {
-        latest_block = compare;
-      }
-    }
-
-    // Add any blocks between these blocks that aren't already in the list
-    if (earliest_block != latest_block) {
-      Block* b = earliest_block;
-      while ((b = b->next()) != latest_block) {
-        if (!blocks.contains(b)) {
-          TimelineViewGhostItem* g = AddGhostFromBlock(b, track, Timeline::kMove, true);
-          g->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
-        }
-      }
-    }
-
-    // Add surrounding blocks that will be trimming instead of moving
-    if (earliest_block->previous()) {
-      TimelineViewGhostItem* g = AddGhostFromBlock(earliest_block->previous(), track, Timeline::kTrimOut, true);
-      g->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
-    }
-
-    if (latest_block->next()) {
-      TimelineViewGhostItem* g = AddGhostFromBlock(latest_block->next(), track, Timeline::kTrimIn, true);
-      g->setData(TimelineViewGhostItem::kPointerToolMode, kSlide);
-    }
-  }
-}
-
-void TimelineWidget::PointerTool::ProcessGhostsForRolling()
-{
-  // For each ghost, we make an equivalent Ghost on the next/previous block
-  foreach (TimelineViewGhostItem* ghost, parent()->ghost_items_) {
-    Block* ghost_block = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
-
-    if (ghost->mode() == Timeline::kTrimIn && ghost_block->previous()) {
-      // Add an extra Ghost for the previous block
-      AddGhostFromBlock(ghost_block->previous(), ghost->Track(), Timeline::kTrimOut, true);
-    } else if (ghost->mode() == Timeline::kTrimOut && ghost_block->next()) {
-      AddGhostFromBlock(ghost_block->next(), ghost->Track(), Timeline::kTrimIn, true);
-    }
-  }
-}
-
 bool TimelineWidget::PointerTool::AddMovingTransitionsToClipGhost(Block* block,
                                                                   const TrackReference& track,
                                                                   Timeline::MovementMode movement,
@@ -757,8 +809,9 @@ bool TimelineWidget::PointerTool::AddMovingTransitionsToClipGhost(Block* block,
 
     if (!found) {
       TimelineViewGhostItem* transition_ghost = AddGhostFromBlock(transitions[i], track,
-                                                                  Timeline::kMove, false);
-      transition_ghost->setData(TimelineViewGhostItem::kPointerToolMode, kPointer);
+                                                                  Timeline::kMove);
+
+      Q_UNUSED(transition_ghost)
 
       ret = true;
     }
@@ -774,8 +827,6 @@ rational TimelineWidget::PointerTool::ValidateInTrimming(rational movement)
       continue;
     }
 
-    Block* block = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
-
     rational earliest_in = RATIONAL_MIN;
     rational latest_in = ghost->Out();
 
@@ -783,23 +834,6 @@ rational TimelineWidget::PointerTool::ValidateInTrimming(rational movement)
       latest_in -= parent()->timebase();
     }
 
-    if (block) {
-      if (!ghost->data(TimelineViewGhostItem::kTrimOverwriteAllowed).toBool()) {
-        // Look for a Block in the way
-        Block* prev = block->previous();
-        while (prev != nullptr) {
-          if (prev->type() == Block::kClip) {
-            earliest_in = qMax(earliest_in, prev->out());
-            break;
-          }
-          prev = prev->previous();
-        }
-
-        // Limit in point at 0 on the timeline
-        earliest_in = qMax(rational(), earliest_in);
-      }
-    }
-
     // Clamp adjusted value between the earliest and latest values
     rational adjusted = ghost->In() + movement;
     rational clamped = clamp(adjusted, earliest_in, latest_in);
@@ -819,8 +853,6 @@ rational TimelineWidget::PointerTool::ValidateOutTrimming(rational movement)
       continue;
     }
 
-    Block* block = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
-
     // Determine earliest and latest out points
     rational earliest_out = ghost->In();
 
@@ -830,21 +862,6 @@ rational TimelineWidget::PointerTool::ValidateOutTrimming(rational movement)
 
     rational latest_out = RATIONAL_MAX;
 
-    // Ripple tool creates block-less ghosts and creates gaps with them later
-    if (block) {
-      if (!ghost->data(TimelineViewGhostItem::kTrimOverwriteAllowed).toBool()) {
-        // Determine if there's a block in the way
-        Block* next = block->next();
-        while (next != nullptr) {
-          if (next->type() == Block::kClip) {
-            latest_out = qMin(latest_out, next->in());
-            break;
-          }
-          next = next->next();
-        }
-      }
-    }
-
     // Clamp adjusted value between the earliest and latest values
     rational adjusted = ghost->Out() + movement;
     rational clamped = clamp(adjusted, earliest_out, latest_out);
diff --git a/app/widget/timelinewidget/tool/ripple.cpp b/app/widget/timelinewidget/tool/ripple.cpp
index a03303b1a..919c0d908 100644
--- a/app/widget/timelinewidget/tool/ripple.cpp
+++ b/app/widget/timelinewidget/tool/ripple.cpp
@@ -35,7 +35,7 @@ TimelineWidget::RippleTool::RippleTool(TimelineWidget* parent) :
 void TimelineWidget::RippleTool::InitiateDrag(TimelineViewBlockItem *clicked_item,
                                               Timeline::MovementMode trim_mode)
 {
-  InitiateDragInternal(clicked_item, trim_mode, kPointer, true);
+  InitiateDragInternal(clicked_item, trim_mode, true, true, false);
 
   if (parent()->ghost_items_.isEmpty()) {
     return;
@@ -85,16 +85,16 @@ void TimelineWidget::RippleTool::InitiateDrag(TimelineViewBlockItem *clicked_ite
 
         if (block_before_ripple->type() == Block::kGap) {
           // If this Block is already a Gap, ghost it now
-          ghost = AddGhostFromBlock(block_before_ripple, track_ref, trim_mode, true);
+          ghost = AddGhostFromBlock(block_before_ripple, track_ref, trim_mode);
         } else if (block_before_ripple->next()) {
           // Assuming this block is NOT at the end of the track (i.e. next != null)
 
           // We're going to create a gap after it. If next is a gap, we can just use that
           if (block_before_ripple->next()->type() == Block::kGap) {
-            ghost = AddGhostFromBlock(block_before_ripple->next(), track_ref, trim_mode, true);
+            ghost = AddGhostFromBlock(block_before_ripple->next(), track_ref, trim_mode);
           } else {
             // If next is NOT a gap, we'll need to create one, for which we'll use a null ghost
-            ghost = AddGhostFromNull(block_before_ripple->out(), block_before_ripple->out(), track_ref, trim_mode, true);
+            ghost = AddGhostFromNull(block_before_ripple->out(), block_before_ripple->out(), track_ref, trim_mode);
             ghost->setData(TimelineViewGhostItem::kReferenceBlock, Node::PtrToValue(block_before_ripple));
           }
         }
diff --git a/app/widget/timelinewidget/tool/rolling.cpp b/app/widget/timelinewidget/tool/rolling.cpp
index 8f9f132c9..2aa55e43e 100644
--- a/app/widget/timelinewidget/tool/rolling.cpp
+++ b/app/widget/timelinewidget/tool/rolling.cpp
@@ -35,7 +35,7 @@ TimelineWidget::RollingTool::RollingTool(TimelineWidget* parent) :
 void TimelineWidget::RollingTool::InitiateDrag(TimelineViewBlockItem *clicked_item,
                                                Timeline::MovementMode trim_mode)
 {
-  InitiateDragInternal(clicked_item, trim_mode, kRolling, true);
+  InitiateDragInternal(clicked_item, trim_mode, false, true, false);
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/timelinewidget/tool/slide.cpp b/app/widget/timelinewidget/tool/slide.cpp
index f9bd8f357..c64d9ec43 100644
--- a/app/widget/timelinewidget/tool/slide.cpp
+++ b/app/widget/timelinewidget/tool/slide.cpp
@@ -36,7 +36,7 @@ TimelineWidget::SlideTool::SlideTool(TimelineWidget* parent) :
 void TimelineWidget::SlideTool::InitiateDrag(TimelineViewBlockItem *clicked_item,
                                              Timeline::MovementMode trim_mode)
 {
-  InitiateDragInternal(clicked_item, trim_mode, kSlide, true);
+  InitiateDragInternal(clicked_item, trim_mode, false, true, true);
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/timelinewidget/tool/tool.cpp b/app/widget/timelinewidget/tool/tool.cpp
index 502755acb..04ce25b32 100644
--- a/app/widget/timelinewidget/tool/tool.cpp
+++ b/app/widget/timelinewidget/tool/tool.cpp
@@ -80,23 +80,6 @@ rational TimelineWidget::Tool::ValidateTimeMovement(rational movement)
       continue;
     }
 
-    Block* block = Node::ValueToPtr<Block>(ghost->data(TimelineViewGhostItem::kAttachedBlock));
-
-    if (block && block->type() == Block::kTransition) {
-      TransitionBlock* transition = static_cast<TransitionBlock*>(block);
-
-      // Dual transitions are only allowed to move so that neither of their offsets are < 0
-      if (transition->connected_in_block() && transition->connected_out_block()) {
-        if (movement > transition->out_offset()) {
-          movement = transition->out_offset();
-        }
-
-        if (movement < -transition->in_offset()) {
-          movement = -transition->in_offset();
-        }
-      }
-    }
-
     // Prevents any ghosts from going below 0:00:00 time
     if (ghost->In() + movement < 0) {
       movement = -ghost->In();
diff --git a/app/widget/timelinewidget/undo/undo.cpp b/app/widget/timelinewidget/undo/undo.cpp
index bbad9ffcd..d3603911e 100644
--- a/app/widget/timelinewidget/undo/undo.cpp
+++ b/app/widget/timelinewidget/undo/undo.cpp
@@ -842,7 +842,7 @@ BlockTrimCommand::BlockTrimCommand(TrackOutput* track, Block *block, rational ne
   adjacent_(nullptr),
   we_created_adjacent_(false),
   we_deleted_adjacent_(false),
-  allow_nongap_trimming_(false)
+  trim_is_a_roll_edit_(false)
 {
 }
 
@@ -872,7 +872,7 @@ void BlockTrimCommand::redo_internal()
 
   if (trim_diff > rational()) {
     // If trimming SHORTER, we'll need to create/modify a gap
-    if (adjacent_ && (adjacent_->type() == Block::kGap || allow_nongap_trimming_)) {
+    if (adjacent_ && (adjacent_->type() == Block::kGap || trim_is_a_roll_edit_)) {
 
       // A gap (or equivalent) exists, simply increase the size of it
       if (mode_ == Timeline::kTrimIn) {
@@ -1134,15 +1134,22 @@ void TrackReplaceBlockWithGapCommand::undo_internal()
   track_->InvalidateCache(invalidate_range, track_->block_input(), track_->block_input());
 }
 
-TrackSlideCommand::TrackSlideCommand(const QVector<TrackSlideCommand::BlockSlideInfo> &blocks, QUndoCommand *parent) :
+TrackSlideCommand::TrackSlideCommand(TrackOutput* track, const QList<Block*>& moving_blocks, Block *in_adjacent, Block *out_adjacent, const rational& movement, QUndoCommand* parent) :
   UndoCommand(parent),
-  blocks_(blocks)
+  track_(track),
+  blocks_(moving_blocks),
+  movement_(movement),
+  we_created_in_adjacent_(false),
+  in_adjacent_(in_adjacent),
+  we_created_out_adjacent_(false),
+  out_adjacent_(out_adjacent)
 {
+  Q_ASSERT(!movement_.isNull());
 }
 
 Project *TrackSlideCommand::GetRelevantProject() const
 {
-  return static_cast<Sequence*>(blocks_.first().track->parent())->project();
+  return static_cast<Sequence*>(track_->parent())->project();
 }
 
 void TrackSlideCommand::redo_internal()
@@ -1157,106 +1164,98 @@ void TrackSlideCommand::undo_internal()
 
 void TrackSlideCommand::slide_internal(bool undo)
 {
-  QMap<TrackOutput*, TimeRange> invalidate_ranges;
-
   // Make sure all movement blocks' old positions are invalidated
-  foreach (const BlockSlideInfo& info, blocks_) {
-    if (info.mode == Timeline::kMove) {
-      invalidate_ranges.insert(info.track,
-                               TimeRange(info.block->in(),
-                                         info.block->out()));
-    }
-  }
+  TimeRange invalidate_range(blocks_.first()->in(), blocks_.last()->out());
 
-  // Perform trims
-  int iterator = undo ? blocks_.size() - 1 : 0;
-  int limit = undo ? -1 : blocks_.size();
-
-  while (iterator != limit) {
-    const BlockSlideInfo& info = blocks_.at(iterator);
-
-    info.track->BeginOperation();
-
-    if (info.mode == Timeline::kTrimIn || info.mode == Timeline::kTrimOut) {
-      qDebug() << "Trimming block as part of a slide operation:" << info.old_time << info.new_time;
-      if (info.new_time.isNull()) {
-        // Assume this was a gap that was reduced to nothing
-        // On undo, restore it, on redo, remove it
-        if (undo) {
-          Block* next = removed_block_next.takeLast();
-          static_cast<NodeGraph*>(info.track->parent())->AddNode(info.block);
-
-          if (next) {
-            info.track->InsertBlockBefore(info.block, next);
-          } else {
-            info.track->AppendBlock(info.block);
-          }
-        } else {
-          removed_block_next.append(info.block->next());
-          info.track->RippleRemoveBlock(info.block);
-          TakeNodeFromParentGraph(info.block, &memory_manager_);
-        }
-      } else {
-        rational new_len = undo ? info.old_time : info.new_time;
-
-        if (info.mode == Timeline::kTrimIn) {
-          info.block->set_length_and_media_in(new_len);
-        } else {
-          info.block->set_length_and_media_out(new_len);
-        }
-      }
-    } else if (!undo
-               && info.mode == Timeline::kMove
-               && !info.block->previous()
-               && info.new_time > info.old_time) {
-      // If this is a moving block and there was nothing before it to offset its time correctly,
-      // insert a gap here
-      GapBlock* gap = new GapBlock();
-      gap->set_length_and_media_out(info.new_time);
-      static_cast<NodeGraph*>(info.block->parent())->AddNode(gap);
-      info.track->PrependBlock(gap);
-      added_gaps_.append(gap);
-    }
-
-    info.track->EndOperation();
-
-    if (undo) {
-      iterator--;
-    } else {
-      iterator++;
-    }
-  }
+  track_->BeginOperation();
 
   if (undo) {
-    // If undoing, remove added gaps
-    foreach (GapBlock* gap, added_gaps_) {
-      TrackOutput* track = TrackOutput::TrackFromBlock(gap);
 
-      track->BeginOperation();
+    // Undo code
+    if (we_created_in_adjacent_) {
+      // This is a gap we made, we can just delete it entirely
+      track_->RippleRemoveBlock(in_adjacent_);
+      delete TakeNodeFromParentGraph(in_adjacent_);
+      we_created_in_adjacent_ = false;
+      in_adjacent_ = nullptr;
+    } else if (in_adjacent_->parent() == &memory_manager_) {
+      // This is a gap we removed, we can re-insert it now
+      static_cast<NodeGraph*>(track_->parent())->AddNode(in_adjacent_);
+      track_->InsertBlockBefore(in_adjacent_, blocks_.first());
+    } else {
+      // We must have just resized this block
+      in_adjacent_->set_length_and_media_out(in_adjacent_->length() - movement_);
+    }
 
-      track->RippleRemoveBlock(gap);
-      delete TakeNodeFromParentGraph(gap);
+    if (we_created_out_adjacent_) {
+      // This is a gap we made, we can just delete it entirely
+      track_->RippleRemoveBlock(out_adjacent_);
+      delete TakeNodeFromParentGraph(out_adjacent_);
+      we_created_out_adjacent_ = false;
+      out_adjacent_ = nullptr;
+    } else if (out_adjacent_) {
+      // We may not have created an out adjacent if this was the last clip in the track so we have
+      // to check here
+      if (out_adjacent_->parent() == &memory_manager_) {
+        // This is a gap we removed, we can re-insert it now
+        static_cast<NodeGraph*>(track_->parent())->AddNode(out_adjacent_);
+        track_->InsertBlockAfter(out_adjacent_, blocks_.last());
+      } else {
+        // We must have just resized this block
+        out_adjacent_->set_length_and_media_in(out_adjacent_->length() + movement_);
+      }
+    }
 
-      track->EndOperation();
+  } else {
+
+    // Redo code
+    if (!in_adjacent_) {
+      // For any slide operation to have occurred at all with no in_adjacent, a gap will need to
+      // be created
+      GapBlock* gap = new GapBlock();
+      gap->set_length_and_media_out(movement_);
+      static_cast<NodeGraph*>(track_->parent())->AddNode(gap);
+      track_->InsertBlockBefore(gap, blocks_.first());
+      we_created_in_adjacent_ = true;
+      in_adjacent_ = gap;
+    } else if (-movement_ == in_adjacent_->length()) {
+      // Remove in adjacent entirely
+      track_->RippleRemoveBlock(in_adjacent_);
+      TakeNodeFromParentGraph(in_adjacent_, &memory_manager_);
+    } else {
+      // Resize in adjacent
+      in_adjacent_->set_length_and_media_out(in_adjacent_->length() + movement_);
+    }
+
+    if (!out_adjacent_) {
+      // For any slide operation to have occurred at all with no out_adjacent, a gap will need to
+      // be created UNLESS this is at the end of the track already
+      if (blocks_.last()->next()) {
+        GapBlock* gap = new GapBlock();
+        gap->set_length_and_media_out(-movement_);
+        static_cast<NodeGraph*>(track_->parent())->AddNode(gap);
+        track_->InsertBlockAfter(gap, blocks_.last());
+        we_created_out_adjacent_ = true;
+        out_adjacent_ = gap;
+      }
+    } else if (movement_ == out_adjacent_->length()) {
+      // Remove out adjacent entirely
+      track_->RippleRemoveBlock(out_adjacent_);
+      TakeNodeFromParentGraph(out_adjacent_, &memory_manager_);
+    } else {
+      // Resize out adjacent
+      out_adjacent_->set_length_and_media_in(out_adjacent_->length() - movement_);
     }
 
-    added_gaps_.clear();
   }
 
+  track_->EndOperation();
+
   // Make sure all movement blocks' new positions are invalidated
-  foreach (const BlockSlideInfo& info, blocks_) {
-    if (info.mode == Timeline::kMove) {
-      TimeRange& range = invalidate_ranges[info.track];
+  invalidate_range.set_range(qMin(invalidate_range.in(), blocks_.first()->in()),
+                             qMax(invalidate_range.out(), blocks_.last()->out()));
 
-      range.set_range(qMin(range.in(), info.block->in()),
-                      qMax(range.out(), info.block->out()));
-    }
-  }
-
-  QMap<TrackOutput*, TimeRange>::const_iterator i;
-  for (i=invalidate_ranges.constBegin(); i!=invalidate_ranges.constEnd(); i++) {
-    i.key()->InvalidateCache(i.value(), i.key()->block_input(), i.key()->block_input());
-  }
+  track_->InvalidateCache(invalidate_range, track_->block_input(), track_->block_input());
 }
 
 TrackListRippleRemoveAreaCommand::TrackListRippleRemoveAreaCommand(TrackList *list, rational in, rational out, QUndoCommand *parent) :
diff --git a/app/widget/timelinewidget/undo/undo.h b/app/widget/timelinewidget/undo/undo.h
index 14ada4d5a..4193bb66d 100644
--- a/app/widget/timelinewidget/undo/undo.h
+++ b/app/widget/timelinewidget/undo/undo.h
@@ -71,9 +71,9 @@ public:
 
   virtual Project* GetRelevantProject() const override;
 
-  void SetAllowNonGapTrimming(bool e)
+  void SetTrimIsARollEdit(bool e)
   {
-    allow_nongap_trimming_ = e;
+    trim_is_a_roll_edit_ = e;
   }
 
 protected:
@@ -91,7 +91,7 @@ private:
   bool we_created_adjacent_;
   bool we_deleted_adjacent_;
 
-  bool allow_nongap_trimming_;
+  bool trim_is_a_roll_edit_;
 
   QObject memory_manager_;
 
@@ -554,15 +554,7 @@ private:
 
 class TrackSlideCommand : public UndoCommand {
 public:
-  struct BlockSlideInfo {
-    TrackOutput* track;
-    Block* block;
-    Timeline::MovementMode mode;
-    rational new_time;
-    rational old_time;
-  };
-
-  TrackSlideCommand(const QVector<BlockSlideInfo>& blocks, QUndoCommand* parent = nullptr);
+  TrackSlideCommand(TrackOutput* track, const QList<Block*>& moving_blocks, Block* in_adjacent, Block* out_adjacent, const rational& movement, QUndoCommand* parent = nullptr);
 
   virtual Project* GetRelevantProject() const override;
 
@@ -573,9 +565,14 @@ protected:
 private:
   void slide_internal(bool undo);
 
-  QVector<BlockSlideInfo> blocks_;
-  QList<GapBlock*> added_gaps_;
-  QList<Block*> removed_block_next;
+  TrackOutput* track_;
+  QList<Block*> blocks_;
+  rational movement_;
+
+  bool we_created_in_adjacent_;
+  Block* in_adjacent_;
+  bool we_created_out_adjacent_;
+  Block* out_adjacent_;
 
   QObject memory_manager_;
 
diff --git a/app/widget/timelinewidget/view/timelineviewghostitem.h b/app/widget/timelinewidget/view/timelineviewghostitem.h
index f61cb2030..160cdb4fb 100644
--- a/app/widget/timelinewidget/view/timelineviewghostitem.h
+++ b/app/widget/timelinewidget/view/timelineviewghostitem.h
@@ -39,8 +39,9 @@ public:
     kAttachedBlock,
     kReferenceBlock,
     kAttachedFootage,
-    kTrimOverwriteAllowed,
-    kPointerToolMode
+    kGhostIsSliding,
+    kTrimIsARollEdit,
+    kTrimShouldBeIgnored
   };
 
   TimelineViewGhostItem(QGraphicsItem* parent = nullptr);

From 867e3729f40528ccb0d0c5dec2766fdcaca78816 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 23 Jul 2020 18:45:59 +1000
Subject: [PATCH 079/138] renderer: check array parents/children when
 traversing the graph for duplicates

Fixes bug where nodes would be updated out of order and segfault if they
no longer existed.
---
 app/render/backend/renderbackend.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index e8e3a3f6b..aa891e722 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -222,7 +222,7 @@ void RenderBackend::NodeGraphChanged(NodeInput *source)
     }
 
     // Check if this dependency graph is already queued
-    if (source->parentNode()->OutputsTo(queued_input, true)) {
+    if (source->parentNode()->OutputsTo(queued_input, true, true)) {
       // In which case, no further copy is necessary
       return;
     }
@@ -234,7 +234,7 @@ void RenderBackend::NodeGraphChanged(NodeInput *source)
     }
 
     // Check if this input supersedes an already queued input
-    if (queued_input->parentNode()->OutputsTo(source, true)
+    if (queued_input->parentNode()->OutputsTo(source, true, true)
         || (source->IsArray() && static_cast<NodeInputArray*>(source)->sub_params().contains(queued_input))) {
       // In which case, we don't need to queue it and can queue our own
       graph_update_queue_.removeAt(i);
@@ -400,6 +400,7 @@ void RenderBackend::CopyNodeInputValue(NodeInput *input)
 {
   // Find our copy of this parameter
   Node* our_copy_node = copy_map_.value(input->parentNode());
+  Q_ASSERT(our_copy_node);
   NodeInput* our_copy = our_copy_node->GetInputWithID(input->id());
 
   // Copy the standard/keyframe values between these two inputs

From ce486f6b8432029ff804f5ffe9e263ff6bbf1f7a Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 23 Jul 2020 18:46:47 +1000
Subject: [PATCH 080/138] cache: null check on saving frames

Includes a warning since I'm not sure yet if this is problematic behavior
or not yet.
---
 app/render/framehashcache.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/render/framehashcache.cpp b/app/render/framehashcache.cpp
index 58f18a957..34437fe9b 100644
--- a/app/render/framehashcache.cpp
+++ b/app/render/framehashcache.cpp
@@ -193,7 +193,11 @@ void FrameHashCache::SaveCacheFrame(const QByteArray& hash,
 
 void FrameHashCache::SaveCacheFrame(const QByteArray &hash, FramePtr frame)
 {
-  SaveCacheFrame(hash, frame->data(), frame->video_params(), frame->linesize_bytes());
+  if (frame) {
+    SaveCacheFrame(hash, frame->data(), frame->video_params(), frame->linesize_bytes());
+  } else {
+    qWarning() << "Attempted to save a NULL frame to the cache. This may or may not be desirable.";
+  }
 }
 
 FramePtr FrameHashCache::LoadCacheFrame(const QByteArray &hash)

From e570abb556a19e4139f8d31a882cc85ddb03c4c6 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 23 Jul 2020 20:07:11 +1000
Subject: [PATCH 081/138] sequencedialog: split off the preset code for use
 elsewhere (particularly the export dialog)

---
 app/codec/encoder.cpp                         |   4 -
 app/dialog/sequence/CMakeLists.txt            |   1 +
 app/dialog/sequence/presetmanager.h           | 237 ++++++++++++++
 app/dialog/sequence/sequence.cpp              |   4 +-
 .../sequence/sequencedialogparametertab.cpp   |  14 +-
 .../sequence/sequencedialogpresettab.cpp      | 309 ++++++------------
 app/dialog/sequence/sequencedialogpresettab.h |  39 ++-
 app/dialog/sequence/sequencepreset.h          | 130 +++++++-
 8 files changed, 495 insertions(+), 243 deletions(-)
 create mode 100644 app/dialog/sequence/presetmanager.h

diff --git a/app/codec/encoder.cpp b/app/codec/encoder.cpp
index 388278525..64dee8e6b 100644
--- a/app/codec/encoder.cpp
+++ b/app/codec/encoder.cpp
@@ -160,8 +160,6 @@ void EncodingParams::SetExportLength(const rational &export_length)
 
 void EncodingParams::Save(QXmlStreamWriter *writer) const
 {
-  writer->writeStartElement(QStringLiteral("encode"));
-
   writer->writeTextElement(QStringLiteral("filename"), filename_);
 
   writer->writeStartElement(QStringLiteral("video"));
@@ -211,8 +209,6 @@ void EncodingParams::Save(QXmlStreamWriter *writer) const
   }
 
   writer->writeEndElement(); // audio
-
-  writer->writeEndElement(); // encode
 }
 
 Encoder* Encoder::CreateFromID(const QString &id, const EncodingParams& params)
diff --git a/app/dialog/sequence/CMakeLists.txt b/app/dialog/sequence/CMakeLists.txt
index 39e521400..d4a05877d 100644
--- a/app/dialog/sequence/CMakeLists.txt
+++ b/app/dialog/sequence/CMakeLists.txt
@@ -16,6 +16,7 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
+  dialog/sequence/presetmanager.h
   dialog/sequence/sequence.h
   dialog/sequence/sequence.cpp
   dialog/sequence/sequencedialogparametertab.h
diff --git a/app/dialog/sequence/presetmanager.h b/app/dialog/sequence/presetmanager.h
new file mode 100644
index 000000000..6836e724e
--- /dev/null
+++ b/app/dialog/sequence/presetmanager.h
@@ -0,0 +1,237 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef PRESETMANAGER_H
+#define PRESETMANAGER_H
+
+#include <QCoreApplication>
+#include <QDir>
+#include <QFile>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QObject>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+
+#include "common/define.h"
+#include "common/filefunctions.h"
+#include "common/xmlutils.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class Preset
+{
+public:
+  Preset() = default;
+
+  const QString& GetName() const
+  {
+    return name_;
+  }
+
+  void SetName(const QString& s)
+  {
+    name_ = s;
+  }
+
+  virtual void Load(QXmlStreamReader* reader) = 0;
+
+  virtual void Save(QXmlStreamWriter* writer) const = 0;
+
+private:
+  QString name_;
+
+};
+
+using PresetPtr = std::shared_ptr<Preset>;
+
+template <typename T>
+class PresetManager
+{
+public:
+  PresetManager(QWidget* parent, const QString& preset_name) :
+    preset_name_(preset_name),
+    parent_(parent)
+  {
+    // Load custom preset data from file
+    QFile preset_file(GetCustomPresetFilename());
+    if (preset_file.open(QFile::ReadOnly)) {
+      QXmlStreamReader reader(&preset_file);
+
+      while (XMLReadNextStartElement(&reader)) {
+        if (reader.name() == QStringLiteral("presets")) {
+          while (XMLReadNextStartElement(&reader)) {
+            if (reader.name() == QStringLiteral("preset")) {
+              PresetPtr p = std::make_shared<T>();
+
+              p->Load(&reader);
+
+              custom_preset_data_.append(p);
+            } else {
+              reader.skipCurrentElement();
+            }
+          }
+        } else {
+          reader.skipCurrentElement();
+        }
+      }
+
+      preset_file.close();
+    }
+  }
+
+  ~PresetManager()
+  {
+    // Save custom presets to disk
+    QFile preset_file(GetCustomPresetFilename());
+    if (preset_file.open(QFile::WriteOnly)) {
+      QXmlStreamWriter writer(&preset_file);
+      writer.setAutoFormatting(true);
+
+      writer.writeStartDocument();
+
+      writer.writeStartElement(QStringLiteral("presets"));
+
+      foreach (PresetPtr p, custom_preset_data_) {
+        writer.writeStartElement(QStringLiteral("preset"));
+
+        p->Save(&writer);
+
+        writer.writeEndElement(); // preset
+      }
+
+      writer.writeEndElement(); // presets
+
+      writer.writeEndDocument();
+
+      preset_file.close();
+    }
+  }
+
+  QString GetPresetName(QString start) const
+  {
+    bool ok;
+
+    forever {
+      start = QInputDialog::getText(parent_,
+                                    QCoreApplication::translate("PresetManager", "Save Preset"),
+                                    QCoreApplication::translate("PresetManager", "Set preset name:"),
+                                    QLineEdit::Normal,
+                                    start,
+                                    &ok);
+
+      if (!ok) {
+        // Dialog cancelled - leave function entirely
+        return QString();
+      }
+
+      if (start.isEmpty()) {
+        // No preset name entered, start loop over
+        QMessageBox::critical(parent_,
+                              QCoreApplication::translate("PresetManager", "Invalid preset name"),
+                              QCoreApplication::translate("PresetManager", "You must enter a preset name"),
+                              QMessageBox::Ok);
+      } else {
+        break;
+      }
+    }
+
+    return start;
+  }
+
+  bool SavePreset(PresetPtr preset)
+  {
+    QString preset_name;
+    int existing_preset;
+
+    forever {
+      preset_name = GetPresetName(preset_name);
+
+      if (preset_name.isEmpty()) {
+        // Dialog cancelled - leave function entirely
+        return false;
+      }
+
+      existing_preset = -1;
+      for (int i=0; i<custom_preset_data_.size(); i++) {
+        if (custom_preset_data_.at(i)->GetName() == preset_name) {
+          existing_preset = i;
+          break;
+        }
+      }
+
+      if (existing_preset == -1
+          || QMessageBox::question(parent_,
+                                   QCoreApplication::translate("PresetManager", "Preset exists"),
+                                   QCoreApplication::translate("PresetManager",
+                                                               "A preset with this name already exists. "
+                                                               "Would you like to replace it?")) == QMessageBox::Yes) {
+        break;
+      }
+    }
+
+    preset->SetName(preset_name);
+
+    if (existing_preset >= 0) {
+      custom_preset_data_.replace(existing_preset, preset);
+      return false;
+    } else {
+      custom_preset_data_.append(preset);
+      return true;
+    }
+  }
+
+  QString GetCustomPresetFilename() const
+  {
+    return QDir(FileFunctions::GetConfigurationLocation()).filePath(preset_name_);
+  }
+
+  PresetPtr GetPreset(int index)
+  {
+    return custom_preset_data_.at(index);
+  }
+
+  void DeletePreset(int index)
+  {
+    custom_preset_data_.removeAt(index);
+  }
+
+  int GetNumberOfPresets() const
+  {
+    return custom_preset_data_.size();
+  }
+
+  const QVector<PresetPtr>& GetPresetData() const
+  {
+    return custom_preset_data_;
+  }
+
+private:
+  QVector<PresetPtr> custom_preset_data_;
+
+  QString preset_name_;
+
+  QWidget* parent_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // PRESETMANAGER_H
diff --git a/app/dialog/sequence/sequence.cpp b/app/dialog/sequence/sequence.cpp
index 69d79a66e..7dd12122b 100644
--- a/app/dialog/sequence/sequence.cpp
+++ b/app/dialog/sequence/sequence.cpp
@@ -68,8 +68,8 @@ SequenceDialog::SequenceDialog(Sequence* s, Type t, QWidget* parent) :
   // Set up dialog buttons
   QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
   buttons->setCenterButtons(true);
-  connect(buttons, SIGNAL(accepted()), this, SLOT(accept()));
-  connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
+  connect(buttons, &QDialogButtonBox::accepted, this, &SequenceDialog::accept);
+  connect(buttons, &QDialogButtonBox::rejected, this, &SequenceDialog::reject);
   layout->addWidget(buttons);
 
   // Set window title based on type
diff --git a/app/dialog/sequence/sequencedialogparametertab.cpp b/app/dialog/sequence/sequencedialogparametertab.cpp
index 83c5fda9b..1c8742675 100644
--- a/app/dialog/sequence/sequencedialogparametertab.cpp
+++ b/app/dialog/sequence/sequencedialogparametertab.cpp
@@ -185,13 +185,13 @@ PixelFormat::Format SequenceDialogParameterTab::GetSelectedPreviewFormat() const
 
 void SequenceDialogParameterTab::PresetChanged(const SequencePreset &preset)
 {
-  video_width_field_->SetValue(preset.width);
-  video_height_field_->SetValue(preset.height);
-  video_frame_rate_field_->setCurrentIndex(frame_rate_list_.indexOf(preset.frame_rate));
-  audio_sample_rate_field_->setCurrentIndex(sample_rate_list_.indexOf(preset.sample_rate));
-  audio_channels_field_->setCurrentIndex(channel_layout_list_.indexOf(preset.channel_layout));
-  preview_resolution_field_->setCurrentIndex(divider_list_.indexOf(preset.preview_divider));
-  preview_format_field_->setCurrentIndex(preview_format_list_.indexOf(preset.preview_format));
+  video_width_field_->SetValue(preset.width());
+  video_height_field_->SetValue(preset.height());
+  video_frame_rate_field_->setCurrentIndex(frame_rate_list_.indexOf(preset.frame_rate()));
+  audio_sample_rate_field_->setCurrentIndex(sample_rate_list_.indexOf(preset.sample_rate()));
+  audio_channels_field_->setCurrentIndex(channel_layout_list_.indexOf(preset.channel_layout()));
+  preview_resolution_field_->setCurrentIndex(divider_list_.indexOf(preset.preview_divider()));
+  preview_format_field_->setCurrentIndex(preview_format_list_.indexOf(preset.preview_format()));
 }
 
 void SequenceDialogParameterTab::SavePresetClicked()
diff --git a/app/dialog/sequence/sequencedialogpresettab.cpp b/app/dialog/sequence/sequencedialogpresettab.cpp
index cfb0406fa..8bf6837dd 100644
--- a/app/dialog/sequence/sequencedialogpresettab.cpp
+++ b/app/dialog/sequence/sequencedialogpresettab.cpp
@@ -1,3 +1,23 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
 #include "sequencedialogpresettab.h"
 
 #include <QDir>
@@ -21,7 +41,8 @@ const int kDataPresetIsCustomRole = Qt::UserRole + 1;
 const int kDataPresetDataRole = Qt::UserRole + 2;
 
 SequenceDialogPresetTab::SequenceDialogPresetTab(QWidget* parent) :
-  QWidget(parent)
+  QWidget(parent),
+  PresetManager<SequencePreset>(this, QStringLiteral("sequencepresets"))
 {
   QVBoxLayout* outer_layout = new QVBoxLayout(this);
   outer_layout->setMargin(0);
@@ -48,123 +69,17 @@ SequenceDialogPresetTab::SequenceDialogPresetTab(QWidget* parent) :
   preset_tree_->addTopLevelItem(CreateSDPresetFolder(tr("PAL"), 720, 576, rational(25, 1), 1));
 
   // Load custom presets
-  QFile preset_file(GetCustomPresetFilename());
-  if (preset_file.open(QFile::ReadOnly)) {
-    QXmlStreamReader reader(&preset_file);
-
-    while (XMLReadNextStartElement(&reader)) {
-      if (reader.name() == QStringLiteral("presets")) {
-        while (XMLReadNextStartElement(&reader)) {
-          if (reader.name() == QStringLiteral("preset")) {
-            SequencePreset p;
-
-            while (XMLReadNextStartElement(&reader)) {
-              if (reader.name() == QStringLiteral("name")) {
-                p.name = reader.readElementText();
-              } else if (reader.name() == QStringLiteral("width")) {
-                p.width = reader.readElementText().toInt();
-              } else if (reader.name() == QStringLiteral("height")) {
-                p.height = reader.readElementText().toInt();
-              } else if (reader.name() == QStringLiteral("framerate")) {
-                p.frame_rate = rational::fromString(reader.readElementText());
-              } else if (reader.name() == QStringLiteral("samplerate")) {
-                p.sample_rate = reader.readElementText().toInt();
-              } else if (reader.name() == QStringLiteral("chlayout")) {
-                p.channel_layout = reader.readElementText().toULongLong();
-              } else if (reader.name() == QStringLiteral("divider")) {
-                p.preview_divider = reader.readElementText().toInt();
-              } else if (reader.name() == QStringLiteral("format")) {
-                p.preview_format = static_cast<PixelFormat::Format>(reader.readElementText().toInt());
-              } else {
-                reader.skipCurrentElement();
-              }
-            }
-
-            AddItem(my_presets_folder_, p, true);
-          } else {
-            reader.skipCurrentElement();
-          }
-        }
-      } else {
-        reader.skipCurrentElement();
-      }
-    }
-
-    preset_file.close();
-  }
-}
-
-SequenceDialogPresetTab::~SequenceDialogPresetTab()
-{
-  // Save custom presets to disk
-  QFile preset_file(GetCustomPresetFilename());
-  if (preset_file.open(QFile::WriteOnly)) {
-    QXmlStreamWriter writer(&preset_file);
-    writer.setAutoFormatting(true);
-
-    writer.writeStartDocument();
-
-    writer.writeStartElement(QStringLiteral("presets"));
-
-    foreach (const SequencePreset& p, custom_preset_data_) {
-      writer.writeStartElement(QStringLiteral("preset"));
-
-      writer.writeTextElement(QStringLiteral("name"), p.name);
-      writer.writeTextElement(QStringLiteral("width"), QString::number(p.width));
-      writer.writeTextElement(QStringLiteral("height"), QString::number(p.height));
-      writer.writeTextElement(QStringLiteral("framerate"), p.frame_rate.toString());
-      writer.writeTextElement(QStringLiteral("samplerate"), QString::number(p.sample_rate));
-      writer.writeTextElement(QStringLiteral("chlayout"), QString::number(p.channel_layout));
-      writer.writeTextElement(QStringLiteral("divider"), QString::number(p.preview_divider));
-      writer.writeTextElement(QStringLiteral("format"), QString::number(p.preview_format));
-
-      writer.writeEndElement(); // preset
-    }
-
-    writer.writeEndElement(); // presets
-
-    writer.writeEndDocument();
-
-    preset_file.close();
+  for (int i=0;i<GetNumberOfPresets();i++) {
+    AddCustomItem(my_presets_folder_, GetPreset(i), i);
   }
 }
 
 void SequenceDialogPresetTab::SaveParametersAsPreset(SequencePreset preset)
 {
-  QString preset_name;
-  int existing_preset;
+  PresetPtr preset_ptr = std::make_shared<SequencePreset>(preset);
 
-  forever {
-    preset_name = GetPresetName(preset_name);
-
-    if (preset_name.isEmpty()) {
-      // Dialog cancelled - leave function entirely
-      return;
-    }
-
-    existing_preset = -1;
-    for (int i=0; i<custom_preset_data_.size(); i++) {
-      if (custom_preset_data_.at(i).name == preset_name) {
-        existing_preset = i;
-        break;
-      }
-    }
-
-    if (existing_preset == -1
-        || QMessageBox::question(this,
-                                 tr("Preset exists"),
-                                 tr("A preset with this name already exists. "
-                                    "Would you like to replace it?")) == QMessageBox::Yes) {
-      break;
-    }
-  }
-
-  preset.name = preset_name;
-
-  if (existing_preset >= 0) {
-    custom_preset_data_.replace(existing_preset, preset);
-  } else {
-    AddItem(my_presets_folder_, preset, true);
+  if (SavePreset(preset_ptr)) {
+    AddCustomItem(my_presets_folder_, preset_ptr, GetNumberOfPresets() - 1);
   }
 }
 
@@ -179,46 +94,46 @@ QTreeWidgetItem* SequenceDialogPresetTab::CreateFolder(const QString &name)
 QTreeWidgetItem *SequenceDialogPresetTab::CreateHDPresetFolder(const QString &name, int width, int height, int divider)
 {
   QTreeWidgetItem* parent = CreateFolder(name);
-  AddItem(parent, {tr("%1 23.976 FPS").arg(name),
-                   width,
-                   height,
-                   rational(24000, 1001),
-                   48000,
-                   AV_CH_LAYOUT_STEREO,
-                   divider,
-                   PixelFormat::PIX_FMT_RGBA16F});
-  AddItem(parent, {tr("%1 25 FPS").arg(name),
-                   width,
-                   height,
-                   rational(25, 1),
-                   48000,
-                   AV_CH_LAYOUT_STEREO,
-                   divider,
-                   PixelFormat::PIX_FMT_RGBA16F});
-  AddItem(parent, {tr("%1 29.97 FPS").arg(name),
-                   width,
-                   height,
-                   rational(30000, 1001),
-                   48000,
-                   AV_CH_LAYOUT_STEREO,
-                   divider,
-                   PixelFormat::PIX_FMT_RGBA16F});
-  AddItem(parent, {tr("%1 50 FPS").arg(name),
-                   width,
-                   height,
-                   rational(50, 1),
-                   48000,
-                   AV_CH_LAYOUT_STEREO,
-                   divider,
-                   PixelFormat::PIX_FMT_RGBA16F});
-  AddItem(parent, {tr("%1 59.94 FPS").arg(name),
-                   width,
-                   height,
-                   rational(60000, 1001),
-                   48000,
-                   AV_CH_LAYOUT_STEREO,
-                   divider,
-                   PixelFormat::PIX_FMT_RGBA16F});
+  AddStandardItem(parent, SequencePreset::Create(tr("%1 23.976 FPS").arg(name),
+                                                 width,
+                                                 height,
+                                                 rational(24000, 1001),
+                                                 48000,
+                                                 AV_CH_LAYOUT_STEREO,
+                                                 divider,
+                                                 PixelFormat::PIX_FMT_RGBA16F));
+  AddStandardItem(parent, SequencePreset::Create(tr("%1 25 FPS").arg(name),
+                                                 width,
+                                                 height,
+                                                 rational(25, 1),
+                                                 48000,
+                                                 AV_CH_LAYOUT_STEREO,
+                                                 divider,
+                                                 PixelFormat::PIX_FMT_RGBA16F));
+  AddStandardItem(parent, SequencePreset::Create(tr("%1 29.97 FPS").arg(name),
+                                                 width,
+                                                 height,
+                                                 rational(30000, 1001),
+                                                 48000,
+                                                 AV_CH_LAYOUT_STEREO,
+                                                 divider,
+                                                 PixelFormat::PIX_FMT_RGBA16F));
+  AddStandardItem(parent, SequencePreset::Create(tr("%1 50 FPS").arg(name),
+                                                 width,
+                                                 height,
+                                                 rational(50, 1),
+                                                 48000,
+                                                 AV_CH_LAYOUT_STEREO,
+                                                 divider,
+                                                 PixelFormat::PIX_FMT_RGBA16F));
+  AddStandardItem(parent, SequencePreset::Create(tr("%1 59.94 FPS").arg(name),
+                                                 width,
+                                                 height,
+                                                 rational(60000, 1001),
+                                                 48000,
+                                                 AV_CH_LAYOUT_STEREO,
+                                                 divider,
+                                                 PixelFormat::PIX_FMT_RGBA16F));
   return parent;
 }
 
@@ -226,54 +141,25 @@ QTreeWidgetItem *SequenceDialogPresetTab::CreateSDPresetFolder(const QString &na
 {
   QTreeWidgetItem* parent = CreateFolder(name);
   preset_tree_->addTopLevelItem(parent);
-  AddItem(parent, {tr("%1 Standard").arg(name),
-                   width,
-                   height,
-                   frame_rate,
-                   48000,
-                   AV_CH_LAYOUT_STEREO,
-                   divider,
-                   PixelFormat::PIX_FMT_RGBA16F});
-  AddItem(parent, {tr("%1 Widescreen").arg(name),
-                   width,
-                   height,
-                   frame_rate,
-                   48000,
-                   AV_CH_LAYOUT_STEREO,
-                   divider,
-                   PixelFormat::PIX_FMT_RGBA16F});
+  AddStandardItem(parent, SequencePreset::Create(tr("%1 Standard").arg(name),
+                                                 width,
+                                                 height,
+                                                 frame_rate,
+                                                 48000,
+                                                 AV_CH_LAYOUT_STEREO,
+                                                 divider,
+                                                 PixelFormat::PIX_FMT_RGBA16F));
+  AddStandardItem(parent, SequencePreset::Create(tr("%1 Widescreen").arg(name),
+                                                 width,
+                                                 height,
+                                                 frame_rate,
+                                                 48000,
+                                                 AV_CH_LAYOUT_STEREO,
+                                                 divider,
+                                                 PixelFormat::PIX_FMT_RGBA16F));
   return parent;
 }
 
-QString SequenceDialogPresetTab::GetPresetName(QString start)
-{
-  bool ok;
-
-  forever {
-    start = QInputDialog::getText(this,
-                                        tr("Save Preset"),
-                                        tr("Set preset name:"),
-                                        QLineEdit::Normal,
-                                        start,
-                                        &ok);
-
-    if (!ok) {
-      // Dialog cancelled - leave function entirely
-      return QString();
-    }
-
-    if (start.isEmpty()) {
-      // No preset name entered, start loop over
-      QMessageBox::critical(this, tr("Invalid preset name"),
-                            tr("You must enter a preset name"), QMessageBox::Ok);
-    } else {
-      break;
-    }
-  }
-
-  return start;
-}
-
 QTreeWidgetItem *SequenceDialogPresetTab::GetSelectedItem()
 {
   QList<QTreeWidgetItem*> selected_items = preset_tree_->selectedItems();
@@ -298,23 +184,28 @@ QTreeWidgetItem *SequenceDialogPresetTab::GetSelectedCustomPreset()
   return nullptr;
 }
 
-QString SequenceDialogPresetTab::GetCustomPresetFilename()
+void SequenceDialogPresetTab::AddStandardItem(QTreeWidgetItem *folder, PresetPtr preset, const QString& description)
 {
-  return QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("presets"));
+  int index = default_preset_data_.size();
+  default_preset_data_.append(preset);
+  AddItemInternal(folder, preset, false, index, description);
 }
 
-void SequenceDialogPresetTab::AddItem(QTreeWidgetItem *folder, const SequencePreset& preset, bool is_custom, const QString &description)
+void SequenceDialogPresetTab::AddCustomItem(QTreeWidgetItem *folder, PresetPtr preset, int index, const QString &description)
+{
+  AddItemInternal(folder, preset, true, index, description);
+}
+
+void SequenceDialogPresetTab::AddItemInternal(QTreeWidgetItem *folder, PresetPtr preset, bool is_custom, int index, const QString &description)
 {
   QTreeWidgetItem* item = new QTreeWidgetItem();
-  item->setText(0, preset.name);
+
+  item->setText(0, preset->GetName());
   item->setIcon(0, icon::Video);
   item->setToolTip(0, description);
   item->setData(0, kDataIsPreset, true);
   item->setData(0, kDataPresetIsCustomRole, is_custom);
-
-  QList<SequencePreset>& list = is_custom ? custom_preset_data_ : default_preset_data_;
-  item->setData(0, kDataPresetDataRole, list.size());
-  list.append(preset);
+  item->setData(0, kDataPresetDataRole, index);
 
   folder->addChild(item);
 }
@@ -326,11 +217,11 @@ void SequenceDialogPresetTab::SelectedItemChanged(QTreeWidgetItem* current, QTre
   if (current->data(0, kDataIsPreset).toBool()) {
     int preset_index = current->data(0, kDataPresetDataRole).toInt();
 
-    const SequencePreset& preset_data = (current->data(0, kDataPresetIsCustomRole).toBool())
-        ? custom_preset_data_.at(preset_index)
+    PresetPtr preset_data = (current->data(0, kDataPresetIsCustomRole).toBool())
+        ? GetPreset(preset_index)
         : default_preset_data_.at(preset_index);
 
-    emit PresetChanged(preset_data);
+    emit PresetChanged(*static_cast<SequencePreset*>(preset_data.get()));
   }
 }
 
@@ -375,7 +266,7 @@ void SequenceDialogPresetTab::DeleteSelectedPreset()
     }
 
     // Remove the preset
-    custom_preset_data_.removeAt(preset_index);
+    DeletePreset(preset_index);
 
     // Delete the item
     delete sel;
diff --git a/app/dialog/sequence/sequencedialogpresettab.h b/app/dialog/sequence/sequencedialogpresettab.h
index 3f426fa79..df5ba5596 100644
--- a/app/dialog/sequence/sequencedialogpresettab.h
+++ b/app/dialog/sequence/sequencedialogpresettab.h
@@ -1,3 +1,23 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
 #ifndef SEQUENCEDIALOGPRESETTAB_H
 #define SEQUENCEDIALOGPRESETTAB_H
 
@@ -5,18 +25,17 @@
 #include <QTreeWidget>
 #include <QWidget>
 
+#include "presetmanager.h"
 #include "sequencepreset.h"
 
 OLIVE_NAMESPACE_ENTER
 
-class SequenceDialogPresetTab : public QWidget
+class SequenceDialogPresetTab : public QWidget, public PresetManager<SequencePreset>
 {
   Q_OBJECT
 public:
   SequenceDialogPresetTab(QWidget* parent = nullptr);
 
-  virtual ~SequenceDialogPresetTab() override;
-
 public slots:
   void SaveParametersAsPreset(SequencePreset preset);
 
@@ -32,24 +51,20 @@ private:
 
   QTreeWidgetItem *CreateSDPresetFolder(const QString& name, int width, int height, const rational &frame_rate, int divider);
 
-  QString GetPresetName(QString start);
-
   QTreeWidgetItem* GetSelectedItem();
   QTreeWidgetItem* GetSelectedCustomPreset();
 
-  static QString GetCustomPresetFilename();
+  void AddStandardItem(QTreeWidgetItem* folder, PresetPtr preset, const QString &description = QString());
 
-  void AddItem(QTreeWidgetItem* folder,
-               const SequencePreset& preset,
-               bool is_custom = false,
-               const QString& description = QString());
+  void AddCustomItem(QTreeWidgetItem* folder, PresetPtr preset, int index, const QString& description = QString());
+
+  void AddItemInternal(QTreeWidgetItem* folder, PresetPtr preset, bool is_custom, int index, const QString& description = QString());
 
   QTreeWidget* preset_tree_;
 
   QTreeWidgetItem* my_presets_folder_;
 
-  QList<SequencePreset> default_preset_data_;
-  QList<SequencePreset> custom_preset_data_;
+  QList<PresetPtr> default_preset_data_;
 
 private slots:
   void SelectedItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
diff --git a/app/dialog/sequence/sequencepreset.h b/app/dialog/sequence/sequencepreset.h
index fb4ba9ab2..4b0dc776e 100644
--- a/app/dialog/sequence/sequencepreset.h
+++ b/app/dialog/sequence/sequencepreset.h
@@ -21,20 +21,132 @@
 #ifndef SEQUENCEPARAM_H
 #define SEQUENCEPARAM_H
 
+#include <QXmlStreamWriter>
+
 #include "common/rational.h"
+#include "common/xmlutils.h"
+#include "dialog/sequence/presetmanager.h"
 #include "render/pixelformat.h"
 
 OLIVE_NAMESPACE_ENTER
 
-struct SequencePreset {
-  QString name;
-  int width;
-  int height;
-  rational frame_rate;
-  int sample_rate;
-  uint64_t channel_layout;
-  int preview_divider;
-  PixelFormat::Format preview_format;
+class SequencePreset : public Preset {
+public:
+  SequencePreset() = default;
+
+  SequencePreset(const QString& name,
+                 int width,
+                 int height,
+                 const rational& frame_rate,
+                 int sample_rate,
+                 uint64_t channel_layout,
+                 int preview_divider,
+                 PixelFormat::Format preview_format) :
+    width_(width),
+    height_(height),
+    frame_rate_(frame_rate),
+    sample_rate_(sample_rate),
+    channel_layout_(channel_layout),
+    preview_divider_(preview_divider),
+    preview_format_(preview_format)
+  {
+    SetName(name);
+  }
+
+  static PresetPtr Create(const QString& name,
+                          int width,
+                          int height,
+                          const rational& frame_rate,
+                          int sample_rate,
+                          uint64_t channel_layout,
+                          int preview_divider,
+                          PixelFormat::Format preview_format)
+  {
+    return std::make_shared<SequencePreset>(name, width, height, frame_rate, sample_rate,
+                                            channel_layout, preview_divider, preview_format);
+  }
+
+  virtual void Load(QXmlStreamReader* reader) override
+  {
+    while (XMLReadNextStartElement(reader)) {
+      if (reader->name() == QStringLiteral("name")) {
+        SetName(reader->readElementText());
+      } else if (reader->name() == QStringLiteral("width")) {
+        width_ = reader->readElementText().toInt();
+      } else if (reader->name() == QStringLiteral("height")) {
+        height_ = reader->readElementText().toInt();
+      } else if (reader->name() == QStringLiteral("framerate")) {
+        frame_rate_ = rational::fromString(reader->readElementText());
+      } else if (reader->name() == QStringLiteral("samplerate")) {
+        sample_rate_ = reader->readElementText().toInt();
+      } else if (reader->name() == QStringLiteral("chlayout")) {
+        channel_layout_ = reader->readElementText().toULongLong();
+      } else if (reader->name() == QStringLiteral("divider")) {
+        preview_divider_ = reader->readElementText().toInt();
+      } else if (reader->name() == QStringLiteral("format")) {
+        preview_format_ = static_cast<PixelFormat::Format>(reader->readElementText().toInt());
+      } else {
+        reader->skipCurrentElement();
+      }
+    }
+  }
+
+  virtual void Save(QXmlStreamWriter* writer) const override
+  {
+    writer->writeTextElement(QStringLiteral("name"), GetName());
+    writer->writeTextElement(QStringLiteral("width"), QString::number(width_));
+    writer->writeTextElement(QStringLiteral("height"), QString::number(height_));
+    writer->writeTextElement(QStringLiteral("framerate"), frame_rate_.toString());
+    writer->writeTextElement(QStringLiteral("samplerate"), QString::number(sample_rate_));
+    writer->writeTextElement(QStringLiteral("chlayout"), QString::number(channel_layout_));
+    writer->writeTextElement(QStringLiteral("divider"), QString::number(preview_divider_));
+    writer->writeTextElement(QStringLiteral("format"), QString::number(preview_format_));
+  }
+
+  int width() const
+  {
+    return width_;
+  }
+
+  int height() const
+  {
+    return height_;
+  }
+
+  const rational& frame_rate() const
+  {
+    return frame_rate_;
+  }
+
+  int sample_rate() const
+  {
+    return sample_rate_;
+  }
+
+  uint64_t channel_layout() const
+  {
+    return channel_layout_;
+  }
+
+  int preview_divider() const
+  {
+    return preview_divider_;
+  }
+
+  PixelFormat::Format preview_format() const
+  {
+    return preview_format_;
+  }
+
+private:
+  int width_;
+  int height_;
+  rational frame_rate_;
+  int sample_rate_;
+  uint64_t channel_layout_;
+  int preview_divider_;
+  PixelFormat::Format preview_format_;
+
 };
 
 OLIVE_NAMESPACE_EXIT

From 86b66004b083fc711ba37e886e8e7f5a505a9128 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 23 Jul 2020 23:11:00 +1000
Subject: [PATCH 082/138] ui: removed last of the widget proxies

---
 app/timeline/timelinecommon.h                 |  3 ++
 app/ui/style/olive-dark/style.css             | 12 -----
 app/ui/style/olive-light/style.css            | 15 ------
 app/widget/timelinewidget/view/CMakeLists.txt |  2 -
 .../timelinewidget/view/timelineplayhead.cpp  | 54 -------------------
 .../timelinewidget/view/timelineplayhead.h    | 52 ------------------
 .../timelinewidget/view/timelineviewbase.cpp  | 14 ++++-
 .../timelinewidget/view/timelineviewbase.h    |  3 --
 app/widget/timeruler/seekablewidget.h         | 13 -----
 app/widget/timeruler/timeruler.cpp            |  2 +-
 app/widget/viewer/audiowaveformview.cpp       |  3 +-
 11 files changed, 19 insertions(+), 154 deletions(-)
 delete mode 100644 app/widget/timelinewidget/view/timelineplayhead.cpp
 delete mode 100644 app/widget/timelinewidget/view/timelineplayhead.h

diff --git a/app/timeline/timelinecommon.h b/app/timeline/timelinecommon.h
index ba059e258..8bd042de0 100644
--- a/app/timeline/timelinecommon.h
+++ b/app/timeline/timelinecommon.h
@@ -56,6 +56,9 @@ public:
 
 };
 
+// FIXME: Hardcoded (but that might be okay here)
+#define PLAYHEAD_COLOR Qt::red
+
 OLIVE_NAMESPACE_EXIT
 
 #endif // TIMELINECOMMON_H
diff --git a/app/ui/style/olive-dark/style.css b/app/ui/style/olive-dark/style.css
index bf3fef323..96be8d2ef 100644
--- a/app/ui/style/olive-dark/style.css
+++ b/app/ui/style/olive-dark/style.css
@@ -22,15 +22,3 @@
 QPushButton:checked {
   background: #191919;
 }
-
-/* Node styling */
-NodeViewItemWidget {
-  qproperty-titlebarColor: #4040a0;
-  qproperty-borderColor: #000000;
-}
-
-/* Timeline playhead styling */
-TimelinePlayhead {
-  qproperty-playheadColor: #ff0000;
-  qproperty-playheadHighlightColor: rgba(255, 255, 255, 0.2);
-}
diff --git a/app/ui/style/olive-light/style.css b/app/ui/style/olive-light/style.css
index 300445ac7..bab366ba1 100644
--- a/app/ui/style/olive-light/style.css
+++ b/app/ui/style/olive-light/style.css
@@ -17,18 +17,3 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ***/
-
-/* Hack that forces checked QPushButtons to use dark color */
-
-
-/* Node styling */
-NodeViewItemWidget {
-  qproperty-titlebarColor: #a0a0ff;
-  qproperty-borderColor: #000000;
-}
-
-/* Timeline playhead styling */
-TimelinePlayhead {
-  qproperty-playheadColor: #ff0000;
-  qproperty-playheadHighlightColor: rgba(0, 0, 0, 0.25);
-}
diff --git a/app/widget/timelinewidget/view/CMakeLists.txt b/app/widget/timelinewidget/view/CMakeLists.txt
index c2da0eead..5a57efbc1 100644
--- a/app/widget/timelinewidget/view/CMakeLists.txt
+++ b/app/widget/timelinewidget/view/CMakeLists.txt
@@ -18,8 +18,6 @@ set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
   widget/timelinewidget/view/handmovableview.h
   widget/timelinewidget/view/handmovableview.cpp
-  widget/timelinewidget/view/timelineplayhead.h
-  widget/timelinewidget/view/timelineplayhead.cpp
   widget/timelinewidget/view/timelineview.h
   widget/timelinewidget/view/timelineview.cpp
   widget/timelinewidget/view/timelineviewmouseevent.h
diff --git a/app/widget/timelinewidget/view/timelineplayhead.cpp b/app/widget/timelinewidget/view/timelineplayhead.cpp
deleted file mode 100644
index f15e9cf2d..000000000
--- a/app/widget/timelinewidget/view/timelineplayhead.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/***
-
-  Olive - Non-Linear Video Editor
-  Copyright (C) 2019 Olive Team
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-***/
-
-#include "timelineplayhead.h"
-
-#include <QPainter>
-
-const QColor &TimelinePlayhead::GetPlayheadColor() const
-{
-  return playhead_color_;
-}
-
-const QColor &TimelinePlayhead::GetPlayheadHighlightColor() const
-{
-  return playhead_highlight_color_;
-}
-
-void TimelinePlayhead::SetPlayheadColor(QColor c)
-{
-  playhead_color_ = c;
-}
-
-void TimelinePlayhead::SetPlayheadHighlightColor(QColor c)
-{
-  playhead_highlight_color_ = c;
-}
-
-void TimelinePlayhead::Draw(QPainter* painter, const QRectF& playhead_rect) const
-{
-  painter->setPen(Qt::NoPen);
-  painter->setBrush(GetPlayheadHighlightColor());
-  painter->drawRect(playhead_rect);
-
-  painter->setPen(GetPlayheadColor());
-  painter->setBrush(Qt::NoBrush);
-  painter->drawLine(QLineF(playhead_rect.topLeft(), playhead_rect.bottomLeft()));
-}
diff --git a/app/widget/timelinewidget/view/timelineplayhead.h b/app/widget/timelinewidget/view/timelineplayhead.h
deleted file mode 100644
index 15b2f0031..000000000
--- a/app/widget/timelinewidget/view/timelineplayhead.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/***
-
-  Olive - Non-Linear Video Editor
-  Copyright (C) 2019 Olive Team
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-***/
-
-#ifndef TIMELINEPLAYHEADSTYLE_H
-#define TIMELINEPLAYHEADSTYLE_H
-
-#include <QWidget>
-
-/**
- * @brief A QWidget proxy for TimeRuler and TimelinePlayheadItem to allow them to share CSS values
- *
- * To allow Qt CSS customization (which is only available to QWidgets) to be accessed by TimeRuler
- */
-class TimelinePlayhead : public QWidget
-{
-  Q_OBJECT
-  Q_PROPERTY(QColor playheadColor READ GetPlayheadColor WRITE SetPlayheadColor DESIGNABLE true)
-  Q_PROPERTY(QColor playheadHighlightColor READ GetPlayheadHighlightColor WRITE SetPlayheadHighlightColor DESIGNABLE true)
-public:
-  TimelinePlayhead() = default;
-
-  const QColor& GetPlayheadColor() const;
-  const QColor& GetPlayheadHighlightColor() const;
-
-  void SetPlayheadColor(QColor c);
-  void SetPlayheadHighlightColor(QColor c);
-
-  void Draw(QPainter *painter, const QRectF &rect) const;
-
-private:
-  QColor playhead_color_;
-  QColor playhead_highlight_color_;
-};
-
-#endif // TIMELINEPLAYHEADSTYLE_H
diff --git a/app/widget/timelinewidget/view/timelineviewbase.cpp b/app/widget/timelinewidget/view/timelineviewbase.cpp
index a5acb99e1..d0eb9e4c3 100644
--- a/app/widget/timelinewidget/view/timelineviewbase.cpp
+++ b/app/widget/timelinewidget/view/timelineviewbase.cpp
@@ -132,7 +132,19 @@ void TimelineViewBase::drawForeground(QPainter *painter, const QRectF &rect)
     playhead_scene_left_ = GetPlayheadX();
     playhead_scene_right_ = playhead_scene_left_ + width;
 
-    playhead_style_.Draw(painter, QRectF(playhead_scene_left_, rect.top(), width, rect.height()));
+    QRectF playhead_rect(playhead_scene_left_, rect.top(), width, rect.height());
+
+    // Get playhead highlight color
+    QColor highlight = palette().text().color();
+    highlight.setAlpha(128);
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(highlight);
+    painter->drawRect(playhead_rect);
+
+    // FIXME: Hardcoded...
+    painter->setPen(PLAYHEAD_COLOR);
+    painter->setBrush(Qt::NoBrush);
+    painter->drawLine(QLineF(playhead_rect.topLeft(), playhead_rect.bottomLeft()));
   }
 
   if (snapped_) {
diff --git a/app/widget/timelinewidget/view/timelineviewbase.h b/app/widget/timelinewidget/view/timelineviewbase.h
index d24af659e..f8da914e7 100644
--- a/app/widget/timelinewidget/view/timelineviewbase.h
+++ b/app/widget/timelinewidget/view/timelineviewbase.h
@@ -25,7 +25,6 @@
 
 #include "core.h"
 #include "handmovableview.h"
-#include "timelineplayhead.h"
 #include "widget/timelinewidget/snapservice.h"
 #include "widget/timelinewidget/timelinescaledobject.h"
 
@@ -101,8 +100,6 @@ private:
 
   int64_t playhead_;
 
-  TimelinePlayhead playhead_style_;
-
   double playhead_scene_left_;
   double playhead_scene_right_;
 
diff --git a/app/widget/timeruler/seekablewidget.h b/app/widget/timeruler/seekablewidget.h
index 0abfa3e53..eabd1ccaf 100644
--- a/app/widget/timeruler/seekablewidget.h
+++ b/app/widget/timeruler/seekablewidget.h
@@ -24,7 +24,6 @@
 #include "common/rational.h"
 #include "timeline/timelinepoints.h"
 #include "widget/timelinewidget/snapservice.h"
-#include "widget/timelinewidget/view/timelineplayhead.h"
 #include "widget/timelinewidget/timelinescaledobject.h"
 
 OLIVE_NAMESPACE_ENTER
@@ -80,16 +79,6 @@ protected:
     return playhead_width_;
   }
 
-  inline const QColor& GetPlayheadColor() const
-  {
-    return style_.GetPlayheadColor();
-  }
-
-  inline const QColor& GetPlayheadHighlightColor() const
-  {
-    return style_.GetPlayheadHighlightColor();
-  }
-
 signals:
   /**
    * @brief Signal emitted whenever the time changes on this ruler, either by user or programmatically
@@ -99,8 +88,6 @@ signals:
 private:
   int64_t time_;
 
-  TimelinePlayhead style_;
-
   TimelinePoints* timeline_points_;
 
   int scroll_;
diff --git a/app/widget/timeruler/timeruler.cpp b/app/widget/timeruler/timeruler.cpp
index b79b8121b..a95e82582 100644
--- a/app/widget/timeruler/timeruler.cpp
+++ b/app/widget/timeruler/timeruler.cpp
@@ -281,7 +281,7 @@ void TimeRuler::paintEvent(QPaintEvent *)
   // Draw the playhead if it's on screen at the moment
   int playhead_pos = UnitToScreen(GetTime());
   p.setPen(Qt::NoPen);
-  p.setBrush(GetPlayheadColor());
+  p.setBrush(PLAYHEAD_COLOR);
   DrawPlayhead(&p, playhead_pos, line_bottom);
 }
 
diff --git a/app/widget/viewer/audiowaveformview.cpp b/app/widget/viewer/audiowaveformview.cpp
index cc58e740a..18193fc1f 100644
--- a/app/widget/viewer/audiowaveformview.cpp
+++ b/app/widget/viewer/audiowaveformview.cpp
@@ -26,6 +26,7 @@
 
 #include "common/clamp.h"
 #include "config/config.h"
+#include "timeline/timelinecommon.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -130,7 +131,7 @@ void AudioWaveformView::paintEvent(QPaintEvent *event)
   p.drawPixmap(0, 0, cached_waveform_);
 
   // Draw playhead
-  p.setPen(GetPlayheadColor());
+  p.setPen(PLAYHEAD_COLOR);
 
   int playhead_x = UnitToScreen(GetTime());
   p.drawLine(playhead_x, 0, playhead_x, height());

From 5235975d6d60947bf32611ab0bf9ef71ee55d9a6 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 24 Jul 2020 14:42:34 +1000
Subject: [PATCH 083/138] export: allow selecting output pixel format

---
 app/codec/encoder.cpp                         | 10 ++++
 app/codec/encoder.h                           |  3 +
 app/codec/exportcodec.cpp                     | 50 ++++++++++++++++
 app/codec/exportcodec.h                       |  2 +
 app/codec/ffmpeg/ffmpegencoder.cpp            |  8 ++-
 app/dialog/export/export.cpp                  | 25 ++------
 app/dialog/export/export.h                    |  2 -
 .../export/exportadvancedvideodialog.cpp      | 59 ++++++++++++-------
 app/dialog/export/exportadvancedvideodialog.h | 27 ++++++++-
 app/dialog/export/exportvideotab.cpp          | 36 +++++++++--
 app/dialog/export/exportvideotab.h            | 16 ++++-
 11 files changed, 183 insertions(+), 55 deletions(-)

diff --git a/app/codec/encoder.cpp b/app/codec/encoder.cpp
index 64dee8e6b..ea3750720 100644
--- a/app/codec/encoder.cpp
+++ b/app/codec/encoder.cpp
@@ -88,6 +88,11 @@ void EncodingParams::set_video_threads(const int &threads)
   video_threads_ = threads;
 }
 
+void EncodingParams::set_video_pix_fmt(const QString &s)
+{
+  video_pix_fmt_ = s;
+}
+
 const QString &EncodingParams::filename() const
 {
   return filename_;
@@ -133,6 +138,11 @@ const int &EncodingParams::video_threads() const
   return video_threads_;
 }
 
+const QString &EncodingParams::video_pix_fmt() const
+{
+  return video_pix_fmt_;
+}
+
 bool EncodingParams::audio_enabled() const
 {
   return audio_enabled_;
diff --git a/app/codec/encoder.h b/app/codec/encoder.h
index 260c735a3..412306388 100644
--- a/app/codec/encoder.h
+++ b/app/codec/encoder.h
@@ -51,6 +51,7 @@ public:
   void set_video_max_bit_rate(const int64_t& rate);
   void set_video_buffer_size(const int64_t& sz);
   void set_video_threads(const int& threads);
+  void set_video_pix_fmt(const QString& s);
 
   const QString& filename() const;
 
@@ -62,6 +63,7 @@ public:
   const int64_t& video_max_bit_rate() const;
   const int64_t& video_buffer_size() const;
   const int& video_threads() const;
+  const QString& video_pix_fmt() const;
 
   bool audio_enabled() const;
   const ExportCodec::Codec &audio_codec() const;
@@ -83,6 +85,7 @@ private:
   int64_t video_max_bit_rate_;
   int64_t video_buffer_size_;
   int video_threads_;
+  QString video_pix_fmt_;
 
   bool audio_enabled_;
   ExportCodec::Codec audio_codec_;
diff --git a/app/codec/exportcodec.cpp b/app/codec/exportcodec.cpp
index c68ff33ae..bd819e204 100644
--- a/app/codec/exportcodec.cpp
+++ b/app/codec/exportcodec.cpp
@@ -20,6 +20,11 @@
 
 #include "exportcodec.h"
 
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavutil/pixdesc.h>
+}
+
 OLIVE_NAMESPACE_ENTER
 
 QString ExportCodec::GetCodecName(ExportCodec::Codec c)
@@ -77,4 +82,49 @@ bool ExportCodec::IsCodecAStillImage(ExportCodec::Codec c)
   return false;
 }
 
+QStringList ExportCodec::GetPixelFormatsForCodec(ExportCodec::Codec c)
+{
+  QStringList pix_fmts;
+
+  AVCodec* codec_info;
+
+  switch (c) {
+  case kCodecH264:
+    codec_info = avcodec_find_encoder(AV_CODEC_ID_H264);
+    break;
+  case kCodecDNxHD:
+    codec_info = avcodec_find_encoder(AV_CODEC_ID_DNXHD);
+    break;
+  case kCodecProRes:
+    codec_info = avcodec_find_encoder(AV_CODEC_ID_PRORES);
+    break;
+  case kCodecH265:
+    codec_info = avcodec_find_encoder(AV_CODEC_ID_HEVC);
+    break;
+  case kCodecOpenEXR:
+  case kCodecPNG:
+  case kCodecTIFF:
+    // FIXME: Add these in (these will most likely use an OIIOEncoder which doesn't exist yet)
+    codec_info = nullptr;
+    break;
+  case kCodecMP2:
+  case kCodecMP3:
+  case kCodecAAC:
+  case kCodecPCM:
+  case kCodecCount:
+    // These are audio or invalid codecs and therefore have no pixel formats
+    codec_info = nullptr;
+    break;
+  }
+
+  if (codec_info) {
+    for (int i=0; codec_info->pix_fmts[i]!=-1; i++) {
+      const char* pix_fmt_name = av_get_pix_fmt_name(codec_info->pix_fmts[i]);
+      pix_fmts.append(pix_fmt_name);
+    }
+  }
+
+  return pix_fmts;
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/codec/exportcodec.h b/app/codec/exportcodec.h
index 7fc4f5898..d7a41124b 100644
--- a/app/codec/exportcodec.h
+++ b/app/codec/exportcodec.h
@@ -51,6 +51,8 @@ public:
 
   static bool IsCodecAStillImage(Codec c);
 
+  static QStringList GetPixelFormatsForCodec(Codec c);
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/codec/ffmpeg/ffmpegencoder.cpp b/app/codec/ffmpeg/ffmpegencoder.cpp
index 3b034f7ad..84349c8d1 100644
--- a/app/codec/ffmpeg/ffmpegencoder.cpp
+++ b/app/codec/ffmpeg/ffmpegencoder.cpp
@@ -20,6 +20,10 @@
 
 #include "ffmpegencoder.h"
 
+extern "C" {
+#include <libavutil/pixdesc.h>
+}
+
 #include <QFile>
 
 #include "ffmpegcommon.h"
@@ -441,9 +445,7 @@ bool FFmpegEncoder::InitializeStream(AVMediaType type, AVStream** stream_ptr, AV
     codec_ctx->height = params().video_params().height();
     codec_ctx->sample_aspect_ratio = {1, 1};
     codec_ctx->time_base = params().video_params().time_base().toAVRational();
-
-    // FIXME: Make this customizable again
-    codec_ctx->pix_fmt = encoder->pix_fmts[0];
+    codec_ctx->pix_fmt = av_get_pix_fmt(params().video_pix_fmt().toUtf8());
 
     // Set custom options
     {
diff --git a/app/dialog/export/export.cpp b/app/dialog/export/export.cpp
index d6e0deb72..b23950cfc 100644
--- a/app/dialog/export/export.cpp
+++ b/app/dialog/export/export.cpp
@@ -203,11 +203,6 @@ ExportDialog::ExportDialog(ViewerOutput *viewer_node, QWidget *parent) :
           this,
           &ExportDialog::ResolutionChanged);
 
-  connect(video_tab_->codec_combobox(),
-          static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-          this,
-          &ExportDialog::VideoCodecChanged);
-
   connect(video_tab_,
           &ExportVideoTab::ColorSpaceChanged,
           preview_viewer_,
@@ -232,8 +227,8 @@ void ExportDialog::StartExport()
     return;
   }
 
-  // Validate if the entered filename contains the correct extension (the extension is necessary for both FFmpeg and
-  // OIIO to determine the output format)
+  // Validate if the entered filename contains the correct extension (the extension is necessary
+  // for both FFmpeg and OIIO to determine the output format)
   QString necessary_ext = QStringLiteral(".%1").arg(ExportFormat::GetExtension(static_cast<ExportFormat::Format>(format_combobox_->currentIndex())));
 
   // If it doesn't, see if the user wants to append it automatically. If not, we don't abort the export.
@@ -356,7 +351,6 @@ void ExportDialog::FormatChanged(int index)
   foreach (ExportCodec::Codec vcodec, ExportFormat::GetVideoCodecs(current_format)) {
     video_tab_->codec_combobox()->addItem(ExportCodec::GetCodecName(vcodec), vcodec);
   }
-  VideoCodecChanged();
 
   audio_tab_->codec_combobox()->clear();
   foreach (ExportCodec::Codec acodec, ExportFormat::GetAudioCodecs(current_format)) {
@@ -396,17 +390,6 @@ void ExportDialog::ResolutionChanged()
   UpdateViewerDimensions();
 }
 
-void ExportDialog::VideoCodecChanged()
-{
-  ExportCodec::Codec codec = static_cast<ExportCodec::Codec>(video_tab_->codec_combobox()->currentData().toInt());
-
-  if (codec == ExportCodec::kCodecH264) {
-    video_tab_->SetCodecSection(video_tab_->h264_section());
-  } else if (ExportCodec::IsCodecAStillImage(codec)) {
-    video_tab_->SetCodecSection(video_tab_->image_section());
-  }
-}
-
 void ExportDialog::LoadPresets()
 {
 
@@ -457,7 +440,7 @@ ExportParams ExportDialog::GenerateParams() const
   }
 
   if (video_enabled_->isChecked()) {
-    ExportCodec::Codec video_codec = static_cast<ExportCodec::Codec>(video_tab_->codec_combobox()->currentData().toInt());
+    ExportCodec::Codec video_codec = video_tab_->GetSelectedCodec();
     params.EnableVideo(video_render_params, video_codec);
 
     params.set_video_threads(video_tab_->threads());
@@ -465,6 +448,8 @@ ExportParams ExportDialog::GenerateParams() const
     video_tab_->GetCodecSection()->AddOpts(&params);
 
     params.set_color_transform(video_tab_->CurrentOCIOColorSpace());
+
+    params.set_video_pix_fmt(video_tab_->pix_fmt());
   }
 
   if (audio_enabled_->isChecked()) {
diff --git a/app/dialog/export/export.h b/app/dialog/export/export.h
index 60a301af4..8313e59cf 100644
--- a/app/dialog/export/export.h
+++ b/app/dialog/export/export.h
@@ -81,8 +81,6 @@ private slots:
 
   void ResolutionChanged();
 
-  void VideoCodecChanged();
-
   void UpdateViewerDimensions();
 
   void StartExport();
diff --git a/app/dialog/export/exportadvancedvideodialog.cpp b/app/dialog/export/exportadvancedvideodialog.cpp
index 1b11d85b9..f4fc6b6e6 100644
--- a/app/dialog/export/exportadvancedvideodialog.cpp
+++ b/app/dialog/export/exportadvancedvideodialog.cpp
@@ -2,42 +2,61 @@
 
 #include <QDialogButtonBox>
 #include <QGridLayout>
+#include <QGroupBox>
 #include <QLabel>
 
 OLIVE_NAMESPACE_ENTER
 
-ExportAdvancedVideoDialog::ExportAdvancedVideoDialog(QWidget *parent) :
+ExportAdvancedVideoDialog::ExportAdvancedVideoDialog(const QList<QString> &pix_fmts, QWidget *parent) :
   QDialog(parent)
 {
   setWindowTitle(tr("Advanced"));
 
-  QGridLayout* layout = new QGridLayout(this);
+  QVBoxLayout* layout = new QVBoxLayout(this);
 
-  int row = 0;
+  {
+    // Pixel Settings
+    QGroupBox* pixel_group = new QGroupBox();
+    layout->addWidget(pixel_group);
+    pixel_group->setTitle(tr("Pixel"));
 
-  layout->addWidget(new QLabel(tr("Threads:")), row, 0);
+    QGridLayout* pixel_layout = new QGridLayout(pixel_group);
 
-  thread_slider_ = new IntegerSlider();
-  thread_slider_->SetMinimum(0);
-  thread_slider_->SetDefaultValue(0);
-  layout->addWidget(thread_slider_, row, 1);
+    int row = 0;
 
-  row++;
+    pixel_layout->addWidget(new QLabel(tr("Pixel Format:")), row, 0);
+
+    pixel_format_combobox_ = new QComboBox();
+    pixel_format_combobox_->addItems(pix_fmts);
+    pixel_layout->addWidget(pixel_format_combobox_, row, 1);
+
+    row++;
+  }
+
+  {
+    // Performance Settings
+    QGroupBox* performance_group = new QGroupBox();
+    layout->addWidget(performance_group);
+    performance_group->setTitle(tr("Performance"));
+
+    QGridLayout* performance_layout = new QGridLayout(performance_group);
+
+    int row = 0;
+
+    performance_layout->addWidget(new QLabel(tr("Threads:")), row, 0);
+
+    thread_slider_ = new IntegerSlider();
+    thread_slider_->SetMinimum(0);
+    thread_slider_->SetDefaultValue(0);
+    performance_layout->addWidget(thread_slider_, row, 1);
+
+    row++;
+  }
 
   QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
   connect(buttons, &QDialogButtonBox::accepted, this, &ExportAdvancedVideoDialog::accept);
   connect(buttons, &QDialogButtonBox::rejected, this, &ExportAdvancedVideoDialog::reject);
-  layout->addWidget(buttons, row, 0, 1, 2);
-}
-
-int ExportAdvancedVideoDialog::threads() const
-{
-  return static_cast<int>(thread_slider_->GetValue());
-}
-
-void ExportAdvancedVideoDialog::set_threads(int t)
-{
-  thread_slider_->SetValue(t);
+  layout->addWidget(buttons);
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/export/exportadvancedvideodialog.h b/app/dialog/export/exportadvancedvideodialog.h
index 71d3dc6e0..bdadbbebe 100644
--- a/app/dialog/export/exportadvancedvideodialog.h
+++ b/app/dialog/export/exportadvancedvideodialog.h
@@ -1,6 +1,7 @@
 #ifndef EXPORTADVANCEDVIDEODIALOG_H
 #define EXPORTADVANCEDVIDEODIALOG_H
 
+#include <QComboBox>
 #include <QDialog>
 
 #include "widget/slider/integerslider.h"
@@ -11,14 +12,34 @@ class ExportAdvancedVideoDialog : public QDialog
 {
   Q_OBJECT
 public:
-  ExportAdvancedVideoDialog(QWidget* parent = nullptr);
+  ExportAdvancedVideoDialog(const QList<QString>& pix_fmts,
+                            QWidget* parent = nullptr);
 
-  int threads() const;
-  void set_threads(int t);
+  int threads() const
+  {
+    return static_cast<int>(thread_slider_->GetValue());
+  }
+
+  void set_threads(int t)
+  {
+    thread_slider_->SetValue(t);
+  }
+
+  QString pix_fmt() const
+  {
+    return pixel_format_combobox_->currentText();
+  }
+
+  void set_pix_fmt(const QString& s)
+  {
+    pixel_format_combobox_->setCurrentText(s);
+  }
 
 private:
   IntegerSlider* thread_slider_;
 
+  QComboBox* pixel_format_combobox_;
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/export/exportvideotab.cpp b/app/dialog/export/exportvideotab.cpp
index 476dc495a..298e5bc11 100644
--- a/app/dialog/export/exportvideotab.cpp
+++ b/app/dialog/export/exportvideotab.cpp
@@ -49,6 +49,11 @@ ExportVideoTab::ExportVideoTab(ColorManager* color_manager, QWidget *parent) :
   outer_layout->addStretch();
 }
 
+ExportCodec::Codec ExportVideoTab::GetSelectedCodec() const
+{
+  return static_cast<ExportCodec::Codec>(codec_combobox()->currentData().toInt());
+}
+
 QComboBox *ExportVideoTab::codec_combobox() const
 {
   return codec_combobox_;
@@ -109,11 +114,6 @@ H264Section *ExportVideoTab::h264_section() const
   return h264_section_;
 }
 
-const int &ExportVideoTab::threads() const
-{
-  return threads_;
-}
-
 QWidget* ExportVideoTab::SetupResolutionSection()
 {
   int row = 0;
@@ -194,6 +194,10 @@ QWidget *ExportVideoTab::SetupCodecSection()
 
   codec_combobox_ = new QComboBox();
   codec_layout->addWidget(codec_combobox_, row, 1);
+  connect(codec_combobox_,
+          static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+          this,
+          &ExportVideoTab::VideoCodecChanged);
 
   row++;
 
@@ -222,13 +226,33 @@ void ExportVideoTab::MaintainAspectRatioChanged(bool val)
 
 void ExportVideoTab::OpenAdvancedDialog()
 {
-  ExportAdvancedVideoDialog d(this);
+  // Find export formats compatible with this encoder
+  QStringList pixel_formats = ExportCodec::GetPixelFormatsForCodec(GetSelectedCodec());
+
+  ExportAdvancedVideoDialog d(pixel_formats, this);
 
   d.set_threads(threads_);
+  d.set_pix_fmt(pix_fmt_);
 
   if (d.exec() == QDialog::Accepted) {
     threads_ = d.threads();
+    pix_fmt_ = d.pix_fmt();
   }
 }
 
+void ExportVideoTab::VideoCodecChanged()
+{
+  ExportCodec::Codec codec = GetSelectedCodec();
+
+  if (codec == ExportCodec::kCodecH264) {
+    SetCodecSection(h264_section());
+  } else if (ExportCodec::IsCodecAStillImage(codec)) {
+    SetCodecSection(image_section());
+  }
+
+  // Set default pixel format
+  pix_fmt_ = ExportCodec::GetPixelFormatsForCodec(codec).first();
+  qDebug() << "Set default pix fmt" << pix_fmt_;
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/export/exportvideotab.h b/app/dialog/export/exportvideotab.h
index 7ad0c72d6..dd67e2ea7 100644
--- a/app/dialog/export/exportvideotab.h
+++ b/app/dialog/export/exportvideotab.h
@@ -40,6 +40,8 @@ class ExportVideoTab : public QWidget
 public:
   ExportVideoTab(ColorManager* color_manager, QWidget* parent = nullptr);
 
+  ExportCodec::Codec GetSelectedCodec() const;
+
   QComboBox* codec_combobox() const;
 
   IntegerSlider* width_slider() const;
@@ -57,7 +59,17 @@ public:
   ImageSection* image_section() const;
   H264Section* h264_section() const;
 
-  const int& threads() const;
+  const int& threads() const
+  {
+    return threads_;
+  }
+
+  const QString& pix_fmt() const {
+    return pix_fmt_;
+  }
+
+public slots:
+  void VideoCodecChanged();
 
 signals:
   void ColorSpaceChanged(const QString& colorspace);
@@ -87,6 +99,8 @@ private:
 
   int threads_;
 
+  QString pix_fmt_;
+
 private slots:
   void MaintainAspectRatioChanged(bool val);
 

From dca4c6d960202b350085537b0df67b61e58cc72d Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 24 Jul 2020 14:45:55 +1000
Subject: [PATCH 084/138] export: allow rgb32f and rgba32f to pass through ocio
 without conversion

Minor optimization.
---
 app/task/export/export.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/task/export/export.cpp b/app/task/export/export.cpp
index fbd7f905e..57f23df6d 100644
--- a/app/task/export/export.cpp
+++ b/app/task/export/export.cpp
@@ -118,8 +118,17 @@ bool ExportTask::Run()
 void FrameColorConvert(ColorProcessorPtr processor, FramePtr frame)
 {
   // OCIO conversion requires a frame in 32F format
-  if (frame->format() != PixelFormat::PIX_FMT_RGBA32F) {
-    frame = PixelFormat::ConvertPixelFormat(frame, PixelFormat::PIX_FMT_RGBA32F);
+  if (frame->format() != PixelFormat::PIX_FMT_RGBA32F
+      && frame->format() != PixelFormat::PIX_FMT_RGB32F) {
+    PixelFormat::Format dst;
+
+    if (PixelFormat::FormatHasAlphaChannel(frame->format())) {
+      dst = PixelFormat::PIX_FMT_RGBA32F;
+    } else {
+      dst = PixelFormat::PIX_FMT_RGB32F;
+    }
+
+    frame = PixelFormat::ConvertPixelFormat(frame, dst);
   }
 
   // Color conversion must be done with unassociated alpha, and the pipeline is always associated

From fb05594b5097d74bbaac3a2fc62dbe2a5f6ea4a8 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 25 Jul 2020 00:58:01 +1000
Subject: [PATCH 085/138] various: allow setting footage aspect ratios

We had support for detecting aspect ratios and respecting them in the
render, but this allows people to not only see the aspect ratio in use,
but also override it with their own.
---
 app/codec/ffmpeg/ffmpegdecoder.cpp            | 20 ++---
 app/codec/ffmpeg/ffmpegdecoder.h              | 12 ++-
 app/codec/frame.cpp                           |  6 +-
 app/codec/oiio/oiiodecoder.cpp                |  3 +
 app/common/CMakeLists.txt                     |  2 +
 app/common/ratiodialog.cpp                    | 90 +++++++++++++++++++
 app/common/ratiodialog.h                      | 36 ++++++++
 .../videostreamproperties.cpp                 | 81 ++++++++++++++++-
 .../streamproperties/videostreamproperties.h  | 18 ++++
 app/project/item/footage/footage.cpp          | 81 ++++++++++-------
 app/project/item/footage/imagestream.cpp      |  3 +-
 app/project/item/footage/imagestream.h        | 19 ++++
 app/render/backend/opengl/openglproxy.cpp     |  2 +-
 app/widget/viewer/viewer.cpp                  | 46 ++--------
 14 files changed, 327 insertions(+), 92 deletions(-)
 create mode 100644 app/common/ratiodialog.cpp
 create mode 100644 app/common/ratiodialog.h

diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp
index c3aee6965..b0da1d794 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.cpp
+++ b/app/codec/ffmpeg/ffmpegdecoder.cpp
@@ -114,8 +114,6 @@ bool FFmpegDecoder::Open()
     native_pix_fmt_ = GetNativePixelFormat(ideal_pix_fmt_);
 
     Q_ASSERT(native_pix_fmt_ != PixelFormat::PIX_FMT_INVALID);
-
-    aspect_ratio_ = our_instance->sample_aspect_ratio();
   }
 
   time_base_ = our_instance->stream()->time_base;
@@ -465,6 +463,7 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
 
         bool image_is_still = false;
         ImageStream::Interlacing interlacing = ImageStream::kInterlaceNone;
+        rational pixel_aspect_ratio;
 
         {
           // Read at least two frames to get more information about this video stream
@@ -484,6 +483,10 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
                   interlacing = ImageStream::kInterlacedBottomFirst;
                 }
               }
+
+              pixel_aspect_ratio = av_guess_sample_aspect_ratio(instance.fmt_ctx(),
+                                                                instance.stream(),
+                                                                frame);
             }
 
             // Read second frame
@@ -527,6 +530,7 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
         image_stream->set_height(avstream->codecpar->height);
         image_stream->set_format(GetNativePixelFormat(FFmpegCommon::GetCompatiblePixelFormat(static_cast<AVPixelFormat>(avstream->codecpar->format))));
         image_stream->set_interlacing(interlacing);
+        image_stream->set_pixel_aspect_ratio(pixel_aspect_ratio);
 
         str = image_stream;
 
@@ -825,7 +829,7 @@ FramePtr FFmpegDecoder::BuffersToNativeFrame(int divider, int width, int height,
                                      native_pix_fmt_,
                                      divider));
   copy->set_timestamp(Timecode::timestamp_to_time(ts, time_base_));
-  copy->set_sample_aspect_ratio(aspect_ratio_);
+  copy->set_sample_aspect_ratio(std::static_pointer_cast<ImageStream>(stream())->pixel_aspect_ratio());
   copy->allocate();
 
   // Convert frame to RGB/A for the rest of the pipeline
@@ -1262,16 +1266,6 @@ void FFmpegDecoderInstance::TruncateCacheRangeTo(const qint64 &t)
   }
 }
 
-rational FFmpegDecoderInstance::sample_aspect_ratio() const
-{
-  return av_guess_sample_aspect_ratio(fmt_ctx_, avstream_, nullptr);
-}
-
-AVStream *FFmpegDecoderInstance::stream() const
-{
-  return avstream_;
-}
-
 FFmpegDecoderInstance::FFmpegDecoderInstance(const char *filename, int stream_index) :
   fmt_ctx_(nullptr),
   opts_(nullptr),
diff --git a/app/codec/ffmpeg/ffmpegdecoder.h b/app/codec/ffmpeg/ffmpegdecoder.h
index 0904bf9d1..d4118cc2e 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.h
+++ b/app/codec/ffmpeg/ffmpegdecoder.h
@@ -64,8 +64,15 @@ public:
   void RemoveFramesBefore(const qint64& t);
   void TruncateCacheRangeTo(const qint64& t);
 
-  rational sample_aspect_ratio() const;
-  AVStream* stream() const;
+  AVFormatContext* fmt_ctx() const
+  {
+    return fmt_ctx_;
+  }
+
+  AVStream* stream() const
+  {
+    return avstream_;
+  }
 
   void ClearFrameCache();
 
@@ -191,7 +198,6 @@ private:
   PixelFormat::Format native_pix_fmt_;
 
   rational time_base_;
-  rational aspect_ratio_;
   int64_t start_time_;
 
   static QHash< Stream*, QList<FFmpegDecoderInstance*> > instance_map_;
diff --git a/app/codec/frame.cpp b/app/codec/frame.cpp
index 00dcb1806..bc821b038 100644
--- a/app/codec/frame.cpp
+++ b/app/codec/frame.cpp
@@ -113,7 +113,11 @@ const rational &Frame::sample_aspect_ratio() const
 
 void Frame::set_sample_aspect_ratio(const rational &aspect_ratio)
 {
-  sample_aspect_ratio_ = aspect_ratio;
+  if (aspect_ratio.isNull()) {
+    sample_aspect_ratio_ = 1;
+  } else {
+    sample_aspect_ratio_ = aspect_ratio;
+  }
 }
 
 const rational &Frame::timestamp() const
diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp
index 5a7650e89..ab8fc311a 100644
--- a/app/codec/oiio/oiiodecoder.cpp
+++ b/app/codec/oiio/oiiodecoder.cpp
@@ -119,6 +119,9 @@ bool OIIODecoder::Probe(Footage *f, const QAtomicInt *cancelled)
   image_stream->set_height(in->spec().height);
   image_stream->set_format(GetFormatFromOIIOBasetype(in->spec()));
 
+  // FIXME: Haven't looked, does OIIO report pixel aspect ratio somewhere?
+  image_stream->set_pixel_aspect_ratio(1);
+
   // Images will always have just one stream
   image_stream->set_index(0);
 
diff --git a/app/common/CMakeLists.txt b/app/common/CMakeLists.txt
index 9b6a1e6f5..295027196 100644
--- a/app/common/CMakeLists.txt
+++ b/app/common/CMakeLists.txt
@@ -36,6 +36,8 @@ set(OLIVE_SOURCES
   common/qtutils.h
   common/qtutils.cpp
   common/range.h
+  common/ratiodialog.h
+  common/ratiodialog.cpp
   common/rational.h
   common/rational.cpp
   common/threadedobject.h
diff --git a/app/common/ratiodialog.cpp b/app/common/ratiodialog.cpp
new file mode 100644
index 000000000..35bf48820
--- /dev/null
+++ b/app/common/ratiodialog.cpp
@@ -0,0 +1,90 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "ratiodialog.h"
+
+#include <QCoreApplication>
+#include <QMessageBox>
+
+OLIVE_NAMESPACE_ENTER
+
+double GetFloatRatioFromUser(QWidget* parent,
+                             const QString& title,
+                             bool* ok_in)
+{
+  QString s;
+
+  forever {
+    bool ok;
+
+    s = QInputDialog::getText(parent,
+                              title,
+                              QCoreApplication::translate("RatioDialog", "Enter custom ratio (e.g. \"4:3\", \"16/9\", etc.):"),
+                              QLineEdit::Normal,
+                              s,
+                              &ok);
+
+    if (!ok) {
+      // User cancelled dialog, do nothing
+      if (ok_in) {
+        *ok_in = false;
+      }
+      return qSNaN();
+    }
+
+    QStringList ratio_components = s.split(QRegExp(QStringLiteral(":|;|\\/")));
+
+    if (ratio_components.size() == 1) {
+      bool float_ok;
+
+      double flt = ratio_components.at(0).toDouble(&float_ok);
+
+      if (float_ok && flt > 0) {
+        if (ok_in) {
+          *ok_in = true;
+        }
+        return flt;
+      }
+    } else if (ratio_components.size() == 2) {
+      bool numer_ok, denom_ok;
+
+      double num = ratio_components.at(0).toDouble(&numer_ok);
+      double den = ratio_components.at(1).toDouble(&denom_ok);
+
+      if (numer_ok
+          && denom_ok
+          && num > 0) {
+        // Exit loop and set this ratio
+        if (ok_in) {
+          *ok_in = true;
+        }
+        return num / den;
+      }
+    }
+
+    QMessageBox::warning(parent,
+                         QCoreApplication::translate("RatioDialog", "Invalid custom ratio"),
+                         QCoreApplication::translate("RatioDialog", "Failed to parse \"%1\" into an aspect ratio. Please format a "
+                                                                    "rational fraction with a ':' or a '/' separator.").arg(s),
+                         QMessageBox::Ok);
+  }
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/common/ratiodialog.h b/app/common/ratiodialog.h
new file mode 100644
index 000000000..306e36d22
--- /dev/null
+++ b/app/common/ratiodialog.h
@@ -0,0 +1,36 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef RATIODIALOG_H
+#define RATIODIALOG_H
+
+#include <QInputDialog>
+
+#include "common/rational.h"
+
+OLIVE_NAMESPACE_ENTER
+
+double GetFloatRatioFromUser(QWidget* parent,
+                             const QString& title,
+                             bool* ok_in);
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // RATIODIALOG_H
diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
index d60e21df1..04212ddf8 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
@@ -22,11 +22,13 @@
 
 #include <QGridLayout>
 #include <QGroupBox>
+#include <QInputDialog>
 #include <QLabel>
 #include <QMessageBox>
 #include <OpenColorIO/OpenColorIO.h>
 namespace OCIO = OCIO_NAMESPACE::v1;
 
+#include "common/ratiodialog.h"
 #include "project/item/footage/footage.h"
 #include "project/project.h"
 #include "undo/undostack.h"
@@ -41,6 +43,37 @@ VideoStreamProperties::VideoStreamProperties(ImageStreamPtr stream) :
 
   int row = 0;
 
+  video_layout->addWidget(new QLabel(tr("Pixel Aspect:")), row, 0);
+
+  pixel_aspect_combo_ = new QComboBox();
+  video_layout->addWidget(pixel_aspect_combo_, row, 1);
+
+  AddPixelAspectRatio(tr("Square Pixels"), rational(1));
+  AddPixelAspectRatio(tr("NTSC Standard"), rational(8, 9));
+  AddPixelAspectRatio(tr("NTSC Widescreen"), rational(32, 27));
+  AddPixelAspectRatio(tr("PAL Standard"), rational(16, 15));
+  AddPixelAspectRatio(tr("PAL Widescreen"), rational(64, 45));
+  AddPixelAspectRatio(tr("HD Anamorphic 1080"), rational(4, 3));
+
+  // Always add custom item last, much of the logic relies on this. Set this to the current AR so
+  // that if none of the above are ==, it will eventually select this item
+  AddPixelAspectRatio(QString(), rational());
+  UpdateCustomItem(stream->pixel_aspect_ratio());
+
+  // Determine which index to select on startup
+  for (int i=0; i<pixel_aspect_combo_->count(); i++) {
+    if (pixel_aspect_combo_->itemData(i).value<rational>() == stream->pixel_aspect_ratio()) {
+      pixel_aspect_combo_->setCurrentIndex(i);
+      break;
+    }
+  }
+
+  // Pick up index signal to query for custom aspect ratio if requested
+  connect(pixel_aspect_combo_, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+          this, &VideoStreamProperties::PixelAspectComboBoxChanged);
+
+  row++;
+
   video_layout->addWidget(new QLabel(tr("Interlacing:")), row, 0);
 
   video_interlace_combo_ = new QComboBox();
@@ -119,12 +152,15 @@ void VideoStreamProperties::Accept(QUndoCommand *parent)
   }
 
   if (video_premultiply_alpha_->isChecked() != stream_->premultiplied_alpha()
-      || set_colorspace != stream_->colorspace(false)) {
+      || set_colorspace != stream_->colorspace(false)
+      || static_cast<ImageStream::Interlacing>(video_interlace_combo_->currentIndex()) != stream_->interlacing()
+      || pixel_aspect_combo_->currentData().value<rational>() != stream_->pixel_aspect_ratio()) {
 
     new VideoStreamChangeCommand(stream_,
                                  video_premultiply_alpha_->isChecked(),
                                  set_colorspace,
                                  static_cast<ImageStream::Interlacing>(video_interlace_combo_->currentIndex()),
+                                 pixel_aspect_combo_->currentData().value<rational>(),
                                  parent);
   }
 
@@ -163,16 +199,54 @@ bool VideoStreamProperties::IsImageSequence(ImageStream *stream)
   return (stream->type() == Stream::kVideo && static_cast<VideoStream*>(stream)->is_image_sequence());
 }
 
+void VideoStreamProperties::AddPixelAspectRatio(const QString &name, const rational &ratio)
+{
+  pixel_aspect_combo_->addItem(GetPixelAspectRatioItemText(name, ratio),
+                               QVariant::fromValue(ratio));
+}
+
+QString VideoStreamProperties::GetPixelAspectRatioItemText(const QString &name, const rational &ratio)
+{
+  return tr("%1 (%2)").arg(name, QString::number(ratio.toDouble(), 'f', 4));
+}
+
+void VideoStreamProperties::UpdateCustomItem(const rational &ratio)
+{
+  const int custom_index = pixel_aspect_combo_->count() - 1;
+
+  pixel_aspect_combo_->setItemText(custom_index,
+                                   GetPixelAspectRatioItemText(tr("Custom"), ratio));
+  pixel_aspect_combo_->setItemData(custom_index,
+                                   QVariant::fromValue(ratio));
+}
+
+void VideoStreamProperties::PixelAspectComboBoxChanged(int index)
+{
+  // Detect if custom was selected, in which case query what the new AR should be
+  if (index == pixel_aspect_combo_->count() - 1) {
+    // Query for custom pixel aspect ratio
+    bool ok;
+
+    double custom_ratio = GetFloatRatioFromUser(this, tr("Set Custom Pixel Aspect Ratio"), &ok);
+
+    if (ok) {
+      UpdateCustomItem(rational::fromDouble(custom_ratio));
+    }
+  }
+}
+
 VideoStreamProperties::VideoStreamChangeCommand::VideoStreamChangeCommand(ImageStreamPtr stream,
                                                                           bool premultiplied,
                                                                           QString colorspace,
                                                                           ImageStream::Interlacing interlacing,
+                                                                          const rational &pixel_ar,
                                                                           QUndoCommand *parent) :
   UndoCommand(parent),
   stream_(stream),
   new_premultiplied_(premultiplied),
   new_colorspace_(colorspace),
-  new_interlacing_(interlacing)
+  new_interlacing_(interlacing),
+  new_pixel_ar_(pixel_ar)
 {
 }
 
@@ -186,10 +260,12 @@ void VideoStreamProperties::VideoStreamChangeCommand::redo_internal()
   old_premultiplied_ = stream_->premultiplied_alpha();
   old_colorspace_ = stream_->colorspace(false);
   old_interlacing_ = stream_->interlacing();
+  old_pixel_ar_ = stream_->pixel_aspect_ratio();
 
   stream_->set_premultiplied_alpha(new_premultiplied_);
   stream_->set_colorspace(new_colorspace_);
   stream_->set_interlacing(new_interlacing_);
+  stream_->set_pixel_aspect_ratio(new_pixel_ar_);
 }
 
 void VideoStreamProperties::VideoStreamChangeCommand::undo_internal()
@@ -197,6 +273,7 @@ void VideoStreamProperties::VideoStreamChangeCommand::undo_internal()
   stream_->set_premultiplied_alpha(old_premultiplied_);
   stream_->set_colorspace(old_colorspace_);
   stream_->set_interlacing(old_interlacing_);
+  stream_->set_pixel_aspect_ratio(old_pixel_ar_);
 }
 
 VideoStreamProperties::ImageSequenceChangeCommand::ImageSequenceChangeCommand(VideoStreamPtr video_stream, int64_t start_index, int64_t duration, QUndoCommand *parent) :
diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.h b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
index 0770d6a07..a1d534cee 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.h
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
@@ -43,6 +43,12 @@ public:
 private:
   static bool IsImageSequence(ImageStream* stream);
 
+  void AddPixelAspectRatio(const QString& name, const rational& ratio);
+
+  static QString GetPixelAspectRatioItemText(const QString& name, const rational& ratio);
+
+  void UpdateCustomItem(const rational& ratio);
+
   /**
    * @brief Attached video stream
    */
@@ -73,12 +79,18 @@ private:
    */
   IntegerSlider* imgseq_end_time_;
 
+  /**
+   * @brief Sets the pixel aspect ratio of the stream
+   */
+  QComboBox* pixel_aspect_combo_;
+
   class VideoStreamChangeCommand : public UndoCommand {
   public:
     VideoStreamChangeCommand(ImageStreamPtr stream,
                              bool premultiplied,
                              QString colorspace,
                              ImageStream::Interlacing interlacing,
+                             const rational& pixel_ar,
                              QUndoCommand* parent = nullptr);
 
     virtual Project* GetRelevantProject() const override;
@@ -93,10 +105,12 @@ private:
     bool new_premultiplied_;
     QString new_colorspace_;
     ImageStream::Interlacing new_interlacing_;
+    rational new_pixel_ar_;
 
     bool old_premultiplied_;
     QString old_colorspace_;
     ImageStream::Interlacing old_interlacing_;
+    rational old_pixel_ar_;
 
   };
 
@@ -123,6 +137,10 @@ private:
     int64_t old_duration_;
 
   };
+
+private slots:
+  void PixelAspectComboBoxChanged(int index);
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/project/item/footage/footage.cpp b/app/project/item/footage/footage.cpp
index d2e62f46e..56136de0f 100644
--- a/app/project/item/footage/footage.cpp
+++ b/app/project/item/footage/footage.cpp
@@ -242,38 +242,53 @@ QIcon Footage::icon()
 
 QString Footage::duration()
 {
-  if (streams_.isEmpty()) {
-    return QString();
+  // Find longest stream duration
+
+  StreamPtr longest_stream = nullptr;
+  rational longest;
+
+  foreach (StreamPtr stream, streams_) {
+    if (stream->type() == Stream::kVideo || stream->type() == Stream::kAudio) {
+      rational this_stream_dur = Timecode::timestamp_to_time(stream->duration(),
+                                                             stream->timebase());
+
+      if (this_stream_dur > longest) {
+        longest_stream = stream;
+        longest = this_stream_dur;
+      }
+    }
   }
 
-  if (streams_.first()->type() == Stream::kVideo) {
-    VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(streams_.first());
+  if (longest_stream) {
+    if (longest_stream->type() == Stream::kVideo) {
+      VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(longest_stream);
 
-    int64_t duration = video_stream->duration();
-    rational frame_rate_timebase = video_stream->frame_rate().flipped();
+      int64_t duration = video_stream->duration();
+      rational frame_rate_timebase = video_stream->frame_rate().flipped();
 
-    if (video_stream->timebase() != frame_rate_timebase) {
-      // Convert from timebase to frame rate
-      rational duration_time = Timecode::timestamp_to_time(duration, video_stream->timebase());
-      duration = Timecode::time_to_timestamp(duration_time, frame_rate_timebase);
+      if (video_stream->timebase() != frame_rate_timebase) {
+        // Convert from timebase to frame rate
+        rational duration_time = Timecode::timestamp_to_time(duration, video_stream->timebase());
+        duration = Timecode::time_to_timestamp(duration_time, frame_rate_timebase);
+      }
+
+      return Timecode::timestamp_to_timecode(duration,
+                                             frame_rate_timebase,
+                                             Core::instance()->GetTimecodeDisplay());
+    } else if (longest_stream->type() == Stream::kAudio) {
+      AudioStreamPtr audio_stream = std::static_pointer_cast<AudioStream>(longest_stream);
+
+      // If we're showing in a timecode, we prefer showing audio in seconds instead
+      Timecode::Display display = Core::instance()->GetTimecodeDisplay();
+      if (display == Timecode::kTimecodeDropFrame
+          || display == Timecode::kTimecodeNonDropFrame) {
+        display = Timecode::kTimecodeSeconds;
+      }
+
+      return Timecode::timestamp_to_timecode(longest_stream->duration(),
+                                             longest_stream->timebase(),
+                                             display);
     }
-
-    return Timecode::timestamp_to_timecode(duration,
-                                           frame_rate_timebase,
-                                           Core::instance()->GetTimecodeDisplay());
-  } else if (streams_.first()->type() == Stream::kAudio) {
-    AudioStreamPtr audio_stream = std::static_pointer_cast<AudioStream>(streams_.first());
-
-    // If we're showing in a timecode, we prefer showing audio in seconds instead
-    Timecode::Display display = Core::instance()->GetTimecodeDisplay();
-    if (display == Timecode::kTimecodeDropFrame
-        || display == Timecode::kTimecodeNonDropFrame) {
-      display = Timecode::kTimecodeSeconds;
-    }
-
-    return Timecode::timestamp_to_timecode(streams_.first()->duration(),
-                                           streams_.first()->timebase(),
-                                           display);
   }
 
   return QString();
@@ -285,15 +300,13 @@ QString Footage::rate()
     return QString();
   }
 
-  if (streams_.first()->type() == Stream::kVideo) {
-    // Return the timebase as a frame rate
-    VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(streams_.first());
-
+  if (HasStreamsOfType(Stream::kVideo)) {
+    // This is a video editor, prioritize video streams
+    VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(get_first_stream_of_type(Stream::kVideo));
     return QCoreApplication::translate("Footage", "%1 FPS").arg(video_stream->frame_rate().toDouble());
-  } else if (streams_.first()->type() == Stream::kAudio) {
-    // Return the sample rate
+  } else if (HasStreamsOfType(Stream::kAudio)) {
+    // No video streams, return audio
     AudioStreamPtr audio_stream = std::static_pointer_cast<AudioStream>(streams_.first());
-
     return QCoreApplication::translate("Footage", "%1 Hz").arg(audio_stream->sample_rate());
   }
 
diff --git a/app/project/item/footage/imagestream.cpp b/app/project/item/footage/imagestream.cpp
index fc74ac6e3..908ac8adc 100644
--- a/app/project/item/footage/imagestream.cpp
+++ b/app/project/item/footage/imagestream.cpp
@@ -29,7 +29,8 @@ OLIVE_NAMESPACE_ENTER
 
 ImageStream::ImageStream() :
   premultiplied_alpha_(false),
-  interlacing_(kInterlaceNone)
+  interlacing_(kInterlaceNone),
+  pixel_aspect_ratio_(1)
 {
   set_type(kImage);
 }
diff --git a/app/project/item/footage/imagestream.h b/app/project/item/footage/imagestream.h
index 78a700f77..47f59f3f2 100644
--- a/app/project/item/footage/imagestream.h
+++ b/app/project/item/footage/imagestream.h
@@ -93,6 +93,23 @@ public:
     emit ParametersChanged();
   }
 
+  const rational& pixel_aspect_ratio() const
+  {
+    return pixel_aspect_ratio_;
+  }
+
+  void set_pixel_aspect_ratio(const rational& r)
+  {
+    // Auto-correct null aspect ratio to 1:1
+    if (r.isNull()) {
+      pixel_aspect_ratio_ = 1;
+    } else {
+      pixel_aspect_ratio_ = r;
+    }
+
+    emit ParametersChanged();
+  }
+
 protected:
   virtual void FootageSetEvent(Footage*) override;
 
@@ -109,6 +126,8 @@ private:
 
   PixelFormat::Format format_;
 
+  rational pixel_aspect_ratio_;
+
 private slots:
   void ColorConfigChanged();
 
diff --git a/app/render/backend/opengl/openglproxy.cpp b/app/render/backend/opengl/openglproxy.cpp
index fff23b55d..1bc204713 100644
--- a/app/render/backend/opengl/openglproxy.cpp
+++ b/app/render/backend/opengl/openglproxy.cpp
@@ -149,7 +149,7 @@ QVariant OpenGLProxy::FrameToValue(FramePtr frame, StreamPtr stream, const Video
     VideoParams frame_params = frame->video_params();
 
     // Check frame aspect ratio
-    if (frame->sample_aspect_ratio() != 1 && frame->sample_aspect_ratio() != 0) {
+    if (frame->sample_aspect_ratio() != 1) {
       int new_width = frame_params.width();
       int new_height = frame_params.height();
 
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 8d982bd2b..40bf5379a 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -32,6 +32,7 @@
 
 #include "audio/audiomanager.h"
 #include "common/power.h"
+#include "common/ratiodialog.h"
 #include "common/timecodefunctions.h"
 #include "config/config.h"
 #include "project/item/sequence/sequence.h"
@@ -397,6 +398,8 @@ FramePtr DecodeCachedImage(const QString &fn, const rational& time)
 
   if (frame) {
     frame->set_timestamp(time);
+  } else {
+    qWarning() << "Tried to load cached frame from file but it was null";
   }
 
   return frame;
@@ -743,45 +746,14 @@ void ViewerWidget::ContextMenuSetSafeMargins()
 
 void ViewerWidget::ContextMenuSetCustomSafeMargins()
 {
-  QString s;
+  bool ok;
 
-  forever {
-    bool ok;
+  double new_ratio = GetFloatRatioFromUser(this,
+                                           tr("Safe Margins"),
+                                           &ok);
 
-    s = QInputDialog::getText(this,
-                              tr("Safe Margins"),
-                              tr("Enter custom ratio (e.g. \"4:3\", \"16/9\", etc.):"),
-                              QLineEdit::Normal,
-                              s,
-                              &ok);
-
-    if (!ok) {
-      // User cancelled dialog, do nothing
-      return;
-    }
-
-    QStringList ratio_components = s.split(QRegExp(QStringLiteral(":|;|\\/")));
-
-    if (ratio_components.size() == 2) {
-      bool numer_ok, denom_ok;
-
-      double num = ratio_components.at(0).toDouble(&numer_ok);
-      double den = ratio_components.at(1).toDouble(&denom_ok);
-
-      if (numer_ok
-          && denom_ok
-          && num > 0) {
-        // Exit loop and set this ratio
-        context_menu_widget_->SetSafeMargins(ViewerSafeMarginInfo(true, num / den));
-        return;
-      }
-    }
-
-    QMessageBox::warning(this,
-                         tr("Invalid custom ratio"),
-                         tr("Failed to parse \"%1\" into an aspect ratio. Please format a "
-                            "rational fraction with a ':' or a '/' separator.").arg(s),
-                         QMessageBox::Ok);
+  if (ok) {
+    context_menu_widget_->SetSafeMargins(ViewerSafeMarginInfo(true, new_ratio));
   }
 }
 

From 2afa5a42c790f42be08e829868d3c7d30bf71ba2 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 1 Aug 2020 02:12:20 +1000
Subject: [PATCH 086/138] ui: optimized widget signals for selecting
 clips/nodes

Decent performance optimization when working with the UI.
---
 app/panel/node/node.cpp                       |  63 +-------
 app/panel/node/node.h                         |  75 +++++++--
 app/panel/param/param.cpp                     |  19 ++-
 app/panel/param/param.h                       |   3 +-
 app/panel/table/table.cpp                     |   8 +-
 app/panel/table/table.h                       |  11 +-
 app/panel/timeline/timeline.cpp               |   3 +-
 app/panel/timeline/timeline.h                 |   4 +-
 app/widget/keyframeview/keyframeviewbase.cpp  |  13 ++
 app/widget/keyframeview/keyframeviewbase.h    |   2 +
 app/widget/nodeparamview/nodeparamview.cpp    |  72 ++++-----
 app/widget/nodeparamview/nodeparamview.h      |  19 +--
 app/widget/nodetableview/nodetableview.cpp    | 147 +++++++++++++++---
 app/widget/nodetableview/nodetableview.h      |  10 +-
 app/widget/nodetableview/nodetablewidget.cpp  |  36 +----
 app/widget/nodetableview/nodetablewidget.h    |  22 ++-
 app/widget/nodeview/nodeview.cpp              | 123 ++++++++++-----
 app/widget/nodeview/nodeview.h                |  20 ++-
 app/widget/timelinewidget/timelinewidget.cpp  | 122 ++++++++-------
 app/widget/timelinewidget/timelinewidget.h    |  13 +-
 app/widget/timelinewidget/tool/pointer.cpp    |  20 ++-
 app/widget/timelinewidget/tool/zoom.cpp       |   2 +-
 .../timelinewidget/view/timelineview.cpp      |  20 ---
 app/widget/timelinewidget/view/timelineview.h |   6 -
 app/window/mainwindow/mainwindow.cpp          |   9 +-
 25 files changed, 491 insertions(+), 351 deletions(-)

diff --git a/app/panel/node/node.cpp b/app/panel/node/node.cpp
index 72a1c7c23..44aad38f6 100644
--- a/app/panel/node/node.cpp
+++ b/app/panel/node/node.cpp
@@ -29,7 +29,8 @@ NodePanel::NodePanel(QWidget *parent) :
   node_view_ = new NodeView(this);
 
   // Connect node view signals to this panel
-  connect(node_view_, SIGNAL(SelectionChanged(QList<Node*>)), this, SIGNAL(SelectionChanged(QList<Node*>)));
+  connect(node_view_, &NodeView::NodesSelected, this, &NodePanel::NodesSelected);
+  connect(node_view_, &NodeView::NodesDeselected, this, &NodePanel::NodesDeselected);
 
   // Set it as the main widget of this panel
   SetWidgetWithPadding(node_view_);
@@ -38,64 +39,4 @@ NodePanel::NodePanel(QWidget *parent) :
   Retranslate();
 }
 
-void NodePanel::SetGraph(NodeGraph *graph)
-{
-  node_view_->SetGraph(graph);
-}
-
-void NodePanel::SelectAll()
-{
-  node_view_->SelectAll();
-}
-
-void NodePanel::DeselectAll()
-{
-  node_view_->DeselectAll();
-}
-
-void NodePanel::DeleteSelected()
-{
-  node_view_->DeleteSelected();
-}
-
-void NodePanel::CutSelected()
-{
-  node_view_->CopySelected(true);
-}
-
-void NodePanel::CopySelected()
-{
-  node_view_->CopySelected(false);
-}
-
-void NodePanel::Paste()
-{
-  node_view_->Paste();
-}
-
-void NodePanel::Duplicate()
-{
-  node_view_->Duplicate();
-}
-
-void NodePanel::Select(const QList<Node *> &nodes)
-{
-  node_view_->Select(nodes);
-}
-
-void NodePanel::SelectWithDependencies(const QList<Node *> &nodes)
-{
-  node_view_->SelectWithDependencies(nodes);
-}
-
-void NodePanel::SelectBlocks(const QList<Block *> &nodes)
-{
-  node_view_->SelectBlocks(nodes);
-}
-
-void NodePanel::Retranslate()
-{
-  SetTitle(tr("Node Editor"));
-}
-
 OLIVE_NAMESPACE_EXIT
diff --git a/app/panel/node/node.h b/app/panel/node/node.h
index c2b4f370e..8580b7c1e 100644
--- a/app/panel/node/node.h
+++ b/app/panel/node/node.h
@@ -35,34 +35,77 @@ class NodePanel : public PanelWidget
 public:
   NodePanel(QWidget* parent);
 
-  void SetGraph(NodeGraph* graph);
+  void SetGraph(NodeGraph *graph)
+  {
+    node_view_->SetGraph(graph);
+  }
 
-  virtual void SelectAll() override;
-  virtual void DeselectAll() override;
+  virtual void SelectAll() override
+  {
+    node_view_->SelectAll();
+  }
 
-  virtual void DeleteSelected() override;
+  virtual void DeselectAll() override
+  {
+    node_view_->DeselectAll();
+  }
 
-  virtual void CutSelected() override;
-  virtual void CopySelected() override;
+  virtual void DeleteSelected() override
+  {
+    node_view_->DeleteSelected();
+  }
 
-  virtual void Paste() override;
+  virtual void CutSelected() override
+  {
+    node_view_->CopySelected(true);
+  }
 
-  virtual void Duplicate() override;
+  virtual void CopySelected() override
+  {
+    node_view_->CopySelected(false);
+  }
+
+  virtual void Paste() override
+  {
+    node_view_->Paste();
+  }
+
+  virtual void Duplicate() override
+  {
+    node_view_->Duplicate();
+  }
 
 public slots:
-  void Select(const QList<Node*>& nodes);
-  void SelectWithDependencies(const QList<Node*>& nodes);
+  void Select(const QList<Node*>& nodes)
+  {
+    node_view_->Select(nodes);
+  }
 
-  void SelectBlocks(const QList<Block*>& nodes);
+  void SelectWithDependencies(const QList<Node*>& nodes)
+  {
+    node_view_->SelectWithDependencies(nodes);
+  }
+
+  void SelectBlocks(const QList<Block*>& nodes)
+  {
+    node_view_->SelectBlocks(nodes);
+  }
+
+  void DeselectBlocks(const QList<Block*>& nodes)
+  {
+    node_view_->DeselectBlocks(nodes);
+  }
 
 signals:
-  /**
-   * @brief Wrapper for NodeView::SelectionChanged()
-   */
-  void SelectionChanged(QList<Node*> selected_nodes);
+  void NodesSelected(const QList<Node*>& nodes);
+
+  void NodesDeselected(const QList<Node*>& nodes);
 
 private:
-  virtual void Retranslate() override;
+  virtual void Retranslate() override
+  {
+    SetTitle(tr("Node Editor"));
+  }
 
   NodeView* node_view_;
 
diff --git a/app/panel/param/param.cpp b/app/panel/param/param.cpp
index e6731e9b0..519250837 100644
--- a/app/panel/param/param.cpp
+++ b/app/panel/param/param.cpp
@@ -30,15 +30,22 @@ ParamPanel::ParamPanel(QWidget* parent) :
   NodeParamView* view = new NodeParamView();
   connect(view, &NodeParamView::InputDoubleClicked, this, &ParamPanel::CreateCurvePanel);
   connect(view, &NodeParamView::RequestSelectNode, this, &ParamPanel::RequestSelectNode);
-  connect(view, &NodeParamView::FoundGizmos, this, &ParamPanel::FoundGizmos);
+  //connect(view, &NodeParamView::FoundGizmos, this, &ParamPanel::FoundGizmos);
   SetTimeBasedWidget(view);
 
   Retranslate();
 }
 
-void ParamPanel::SetNodes(QList<Node *> nodes)
+void ParamPanel::SelectNodes(const QList<Node *> &nodes)
 {
-  static_cast<NodeParamView*>(GetTimeBasedWidget())->SetNodes(nodes);
+  static_cast<NodeParamView*>(GetTimeBasedWidget())->SelectNodes(nodes);
+
+  Retranslate();
+}
+
+void ParamPanel::DeselectNodes(const QList<Node *> &nodes)
+{
+  static_cast<NodeParamView*>(GetTimeBasedWidget())->DeselectNodes(nodes);
 
   Retranslate();
 }
@@ -62,10 +69,10 @@ void ParamPanel::Retranslate()
 
   NodeParamView* view = static_cast<NodeParamView*>(GetTimeBasedWidget());
 
-  if (view->nodes().isEmpty()) {
+  if (view->GetItemMap().isEmpty()) {
     SetSubtitle(tr("(none)"));
-  } else if (view->nodes().size() == 1) {
-    SetSubtitle(view->nodes().first()->Name());
+  } else if (view->GetItemMap().size() == 1) {
+    SetSubtitle(view->GetItemMap().firstKey()->Name());
   } else {
     SetSubtitle(tr("(multiple)"));
   }
diff --git a/app/panel/param/param.h b/app/panel/param/param.h
index 12bc1715e..442c5e921 100644
--- a/app/panel/param/param.h
+++ b/app/panel/param/param.h
@@ -34,7 +34,8 @@ public:
   ParamPanel(QWidget* parent);
 
 public slots:
-  void SetNodes(QList<Node*> nodes);
+  void SelectNodes(const QList<Node*>& nodes);
+  void DeselectNodes(const QList<Node*>& nodes);
 
   virtual void SetTimestamp(const int64_t& timestamp) override;
 
diff --git a/app/panel/table/table.cpp b/app/panel/table/table.cpp
index 7183e9c23..0b3c5260f 100644
--- a/app/panel/table/table.cpp
+++ b/app/panel/table/table.cpp
@@ -25,17 +25,11 @@ OLIVE_NAMESPACE_ENTER
 NodeTablePanel::NodeTablePanel(QWidget* parent) :
   TimeBasedPanel(QStringLiteral("NodeTablePanel"), parent)
 {
-  view_ = new NodeTableWidget();
-  SetTimeBasedWidget(view_);
+  SetTimeBasedWidget(new NodeTableWidget());
 
   Retranslate();
 }
 
-void NodeTablePanel::SetNodes(const QList<Node *> &nodes)
-{
-  view_->SetNodes(nodes);
-}
-
 void NodeTablePanel::Retranslate()
 {
   SetTitle(tr("Table View"));
diff --git a/app/panel/table/table.h b/app/panel/table/table.h
index d08fe0de3..85c6ea888 100644
--- a/app/panel/table/table.h
+++ b/app/panel/table/table.h
@@ -33,12 +33,19 @@ public:
   NodeTablePanel(QWidget* parent);
 
 public slots:
-  void SetNodes(const QList<Node*>& nodes);
+  void SelectNodes(const QList<Node*>& nodes)
+  {
+    static_cast<NodeTableWidget*>(GetTimeBasedWidget())->SelectNodes(nodes);
+  }
+
+  void DeselectNodes(const QList<Node*>& nodes)
+  {
+    static_cast<NodeTableWidget*>(GetTimeBasedWidget())->DeselectNodes(nodes);
+  }
 
 private:
   virtual void Retranslate() override;
 
-  NodeTableWidget* view_;
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/panel/timeline/timeline.cpp b/app/panel/timeline/timeline.cpp
index 7d6cd4c8d..2a36987b3 100644
--- a/app/panel/timeline/timeline.cpp
+++ b/app/panel/timeline/timeline.cpp
@@ -33,7 +33,8 @@ TimelinePanel::TimelinePanel(QWidget *parent) :
 
   Retranslate();
 
-  connect(tw, &TimelineWidget::SelectionChanged, this, &TimelinePanel::SelectionChanged);
+  connect(tw, &TimelineWidget::BlocksSelected, this, &TimelinePanel::BlocksSelected);
+  connect(tw, &TimelineWidget::BlocksDeselected, this, &TimelinePanel::BlocksDeselected);
 }
 
 void TimelinePanel::Clear()
diff --git a/app/panel/timeline/timeline.h b/app/panel/timeline/timeline.h
index cf09322cb..b05f7b8bc 100644
--- a/app/panel/timeline/timeline.h
+++ b/app/panel/timeline/timeline.h
@@ -91,7 +91,9 @@ protected:
   virtual void Retranslate() override;
 
 signals:
-  void SelectionChanged(const QList<Block*>& selected_blocks);
+  void BlocksSelected(const QList<Block*>& selected_blocks);
+
+  void BlocksDeselected(const QList<Block*>& deselected_blocks);
 
 };
 
diff --git a/app/widget/keyframeview/keyframeviewbase.cpp b/app/widget/keyframeview/keyframeviewbase.cpp
index c97a85372..56ba3078d 100644
--- a/app/widget/keyframeview/keyframeviewbase.cpp
+++ b/app/widget/keyframeview/keyframeviewbase.cpp
@@ -74,6 +74,19 @@ void KeyframeViewBase::DeleteSelected()
   Core::instance()->undo_stack()->pushIfHasChildren(command);
 }
 
+void KeyframeViewBase::RemoveKeyframesOfNode(Node *n)
+{
+  QList<NodeInput*> inputs = n->GetInputsIncludingArrays();
+
+  foreach (NodeInput* i, inputs) {
+    foreach (const NodeInput::KeyframeTrack& track, i->keyframe_tracks()) {
+      foreach (NodeKeyframePtr key, track) {
+        RemoveKeyframe(key);
+      }
+    }
+  }
+}
+
 void KeyframeViewBase::RemoveKeyframe(NodeKeyframePtr key)
 {
   KeyframeAboutToBeRemoved(key.get());
diff --git a/app/widget/keyframeview/keyframeviewbase.h b/app/widget/keyframeview/keyframeviewbase.h
index 743ef996f..9cbe0b01f 100644
--- a/app/widget/keyframeview/keyframeviewbase.h
+++ b/app/widget/keyframeview/keyframeviewbase.h
@@ -40,6 +40,8 @@ public:
 
   void DeleteSelected();
 
+  void RemoveKeyframesOfNode(Node* n);
+
 public slots:
   void RemoveKeyframe(NodeKeyframePtr key);
 
diff --git a/app/widget/nodeparamview/nodeparamview.cpp b/app/widget/nodeparamview/nodeparamview.cpp
index 24f32e7d6..51b332fe6 100644
--- a/app/widget/nodeparamview/nodeparamview.cpp
+++ b/app/widget/nodeparamview/nodeparamview.cpp
@@ -122,52 +122,41 @@ NodeParamView::NodeParamView(QWidget *parent) :
   SetMaximumScale(TimelineViewBase::kMaximumScale);
 }
 
-void NodeParamView::SetNodes(QList<Node *> nodes)
+void NodeParamView::SelectNodes(const QList<Node *> &nodes)
 {
-  // If we already have item widgets, delete them all now
-  foreach (NodeParamViewItem* item, items_) {
-    emit ClosedNode(item->GetNode());
-    emit FoundGizmos(nullptr);
-    item->deleteLater();
+  foreach (Node* n, nodes) {
+    NodeParamViewItem* item = new NodeParamViewItem(n);
+
+    // Insert the widget before the stretch
+    param_layout_->insertWidget(param_layout_->count() - 1, item);
+
+    connect(item, &NodeParamViewItem::KeyframeAdded, keyframe_view_, &KeyframeView::AddKeyframe);
+    connect(item, &NodeParamViewItem::KeyframeRemoved, keyframe_view_, &KeyframeView::RemoveKeyframe);
+    connect(item, &NodeParamViewItem::RequestSetTime, this, &NodeParamView::ItemRequestedTimeChanged);
+    connect(item, &NodeParamViewItem::InputDoubleClicked, this, &NodeParamView::InputDoubleClicked);
+    connect(item, &NodeParamViewItem::RequestSelectNode, this, &NodeParamView::RequestSelectNode);
+
+    items_.insert(n, item);
   }
-  items_.clear();
 
-  // Reset keyframe view
-  keyframe_view_->Clear();
+  UpdateItemTime(GetTimestamp());
 
-  // Set the internal list to the one we've received
-  nodes_ = nodes;
+  // Re-arrange keyframes
+  QMetaObject::invokeMethod(this, "PlaceKeyframesOnView", Qt::QueuedConnection);
+}
 
-  if (!nodes_.isEmpty()) {
-    // For each node, create a widget
-    bool found_gizmos = false;
+void NodeParamView::DeselectNodes(const QList<Node *> &nodes)
+{
+  // Remove item from map and delete the widget
+  foreach (Node* n, nodes) {
+    // Remove all keyframes from this node
+    keyframe_view_->RemoveKeyframesOfNode(n);
 
-    foreach (Node* node, nodes_) {
-      NodeParamViewItem* item = new NodeParamViewItem(node);
-
-      // Insert the widget before the stretch
-      param_layout_->insertWidget(param_layout_->count() - 1, item);
-
-      connect(item, &NodeParamViewItem::KeyframeAdded, keyframe_view_, &KeyframeView::AddKeyframe);
-      connect(item, &NodeParamViewItem::KeyframeRemoved, keyframe_view_, &KeyframeView::RemoveKeyframe);
-      connect(item, &NodeParamViewItem::RequestSetTime, this, &NodeParamView::ItemRequestedTimeChanged);
-      connect(item, &NodeParamViewItem::InputDoubleClicked, this, &NodeParamView::InputDoubleClicked);
-      connect(item, &NodeParamViewItem::RequestSelectNode, this, &NodeParamView::RequestSelectNode);
-
-      items_.append(item);
-
-      emit OpenedNode(node);
-
-      if (!found_gizmos && node->HasGizmos()) {
-        emit FoundGizmos(node);
-        found_gizmos = true;
-      }
-    }
-
-    UpdateItemTime(GetTimestamp());
-
-    QMetaObject::invokeMethod(this, "PlaceKeyframesOnView", Qt::QueuedConnection);
+    delete items_.take(n);
   }
+
+  // Re-arrange keyframes
+  QMetaObject::invokeMethod(this, "PlaceKeyframesOnView", Qt::QueuedConnection);
 }
 
 void NodeParamView::resizeEvent(QResizeEvent *event)
@@ -212,11 +201,6 @@ void NodeParamView::ConnectedNodeChanged(ViewerOutput *n)
   }
 }
 
-const QList<Node *> &NodeParamView::nodes()
-{
-  return nodes_;
-}
-
 Node *NodeParamView::GetTimeTarget() const
 {
   return keyframe_view_->GetTimeTarget();
diff --git a/app/widget/nodeparamview/nodeparamview.h b/app/widget/nodeparamview/nodeparamview.h
index 9fe697d97..1e3889b0c 100644
--- a/app/widget/nodeparamview/nodeparamview.h
+++ b/app/widget/nodeparamview/nodeparamview.h
@@ -37,8 +37,13 @@ class NodeParamView : public TimeBasedWidget
 public:
   NodeParamView(QWidget* parent = nullptr);
 
-  void SetNodes(QList<Node*> nodes);
-  const QList<Node*>& nodes();
+  void SelectNodes(const QList<Node*>& nodes);
+  void DeselectNodes(const QList<Node*>& nodes);
+
+  const QMap<Node*, NodeParamViewItem*>& GetItemMap() const
+  {
+    return items_;
+  }
 
   Node* GetTimeTarget() const;
 
@@ -49,12 +54,6 @@ signals:
 
   void RequestSelectNode(const QList<Node*>& target);
 
-  void OpenedNode(Node* n);
-
-  void ClosedNode(Node* n);
-
-  void FoundGizmos(Node* n);
-
 protected:
   virtual void resizeEvent(QResizeEvent *event) override;
 
@@ -71,9 +70,7 @@ private:
 
   KeyframeView* keyframe_view_;
 
-  QList<Node*> nodes_;
-
-  QList<NodeParamViewItem*> items_;
+  QMap<Node*, NodeParamViewItem*> items_;
 
   QScrollBar* vertical_scrollbar_;
 
diff --git a/app/widget/nodetableview/nodetableview.cpp b/app/widget/nodetableview/nodetableview.cpp
index 9d6590cbc..01fc8c315 100644
--- a/app/widget/nodetableview/nodetableview.cpp
+++ b/app/widget/nodetableview/nodetableview.cpp
@@ -29,8 +29,7 @@
 OLIVE_NAMESPACE_ENTER
 
 NodeTableView::NodeTableView(QWidget* parent) :
-  QTreeWidget(parent),
-  last_set_node_(nullptr)
+  QTreeWidget(parent)
 {
   setColumnCount(3);
   setHeaderLabels({tr("Type"),
@@ -41,14 +40,135 @@ NodeTableView::NodeTableView(QWidget* parent) :
                    tr("A/W")});
 }
 
+void NodeTableView::SelectNodes(const QList<Node *> &nodes)
+{
+  foreach (Node* n, nodes) {
+    QTreeWidgetItem* top_item = new QTreeWidgetItem();
+    top_item->setText(0, n->Name());
+    top_item->setFirstColumnSpanned(true);
+    this->addTopLevelItem(top_item);
+    top_level_item_map_.insert(n, top_item);
+  }
+
+  SetTime(last_time_);
+}
+
+void NodeTableView::DeselectNodes(const QList<Node *> &nodes)
+{
+  foreach (Node* n, nodes) {
+    delete top_level_item_map_.take(n);
+  }
+}
+
+void NodeTableView::SetTime(const rational &time)
+{
+  last_time_ = time;
+
+  NodeTableTraverser traverser;
+
+  QMap<Node*, QTreeWidgetItem*>::const_iterator i;
+  for (i=top_level_item_map_.constBegin(); i!=top_level_item_map_.constEnd(); i++) {
+    Node* node = i.key();
+    QTreeWidgetItem* item = i.value();
+
+    // Generate a value database for this node at this time
+    NodeValueDatabase db = traverser.GenerateDatabase(node, TimeRange(time, time));
+
+    // Delete any children of this item that aren't in this database
+    for (int j=0; j<item->childCount(); j++) {
+      if (!db.contains(item->child(j)->data(0, Qt::UserRole).toString())) {
+        delete item->takeChild(j);
+        j--;
+      }
+    }
+
+    // Update all inputs
+    NodeValueDatabase::const_iterator l;
+
+    for (l=db.begin(); l!=db.end(); l++) {
+      const NodeValueTable& table = l.value();
+
+      NodeInput* input = node->GetInputWithID(l.key());
+      if (!input) {
+        // Filters out table entries that aren't inputs (like "global")
+        continue;
+      }
+
+      QTreeWidgetItem* input_item = nullptr;
+
+      for (int j=0; j<item->childCount(); j++) {
+        QTreeWidgetItem* compare = item->child(j);
+
+        if (compare->data(0, Qt::UserRole).toString() == input->id()) {
+          input_item = compare;
+          break;
+        }
+      }
+
+      if (!input_item) {
+        input_item = new QTreeWidgetItem();
+        input_item->setText(0, input->name());
+        input_item->setData(0, Qt::UserRole, input->id());
+        input_item->setFirstColumnSpanned(true);
+        item->addChild(input_item);
+      }
+
+      // Create children if necessary
+      while (input_item->childCount() < table.Count())  {
+        input_item->addChild(new QTreeWidgetItem());
+      }
+
+      // Remove children if necessary
+      while (input_item->childCount() > table.Count()) {
+        delete input_item->takeChild(input_item->childCount() - 1);
+      }
+
+      for (int j=0;j<table.Count();j++) {
+        const NodeValue& value = table.at(table.Count() - 1 - j);
+
+        // Create item
+        QTreeWidgetItem* sub_item = input_item->child(j);
+
+        // Set data type name
+        sub_item->setText(0, NodeParam::GetPrettyDataTypeName(value.type()));
+
+        // Determine source
+        QString source_name;
+        if (value.source()) {
+          source_name = value.source()->Name();
+        } else {
+          source_name = tr("(unknown)");
+        }
+        sub_item->setText(1, source_name);
+
+        switch (value.type()) {
+        case NodeParam::kTexture:
+        {
+          // NodeTableTraverser puts video params in here
+          VideoParams p = value.data().value<VideoParams>();
+          int channel_count = PixelFormat::ChannelCount(p.format());
+
+          for (int k=0;k<channel_count;k++) {
+            this->setItemWidget(sub_item, 2 + k, new QCheckBox());
+          }
+          break;
+        }
+        default:
+        {
+          QVector<QVariant> split_values = input->split_normal_value_into_track_values(value.data());
+          for (int k=0;k<split_values.size();k++) {
+            sub_item->setText(2 + k, NodeInput::ValueToString(value.type(), split_values.at(k)));
+          }
+        }
+        }
+      }
+    }
+  }
+}
+
+/*
 void NodeTableView::SetNode(Node *n, const rational &time)
 {
-  if (last_set_node_ != n) {
-    // Clear everything if the node has changed
-    clear();
-  }
-  last_set_node_ = n;
-
   NodeTableTraverser traverser;
   NodeValueDatabase db = traverser.GenerateDatabase(n, TimeRange(time, time));
 
@@ -141,15 +261,6 @@ void NodeTableView::SetNode(Node *n, const rational &time)
     }
   }
 }
-
-void NodeTableView::SetMultipleNodeMessage()
-{
-  this->clear();
-
-  QTreeWidgetItem* item = new QTreeWidgetItem();
-  item->setText(0, tr("Multiple nodes selected"));
-  item->setFirstColumnSpanned(true);
-  this->addTopLevelItem(item);
-}
+*/
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodetableview/nodetableview.h b/app/widget/nodetableview/nodetableview.h
index 1ce906c09..7aa6e3eeb 100644
--- a/app/widget/nodetableview/nodetableview.h
+++ b/app/widget/nodetableview/nodetableview.h
@@ -32,12 +32,16 @@ class NodeTableView : public QTreeWidget
 public:
   NodeTableView(QWidget* parent = nullptr);
 
-  void SetNode(Node* n, const rational& time);
+  void SelectNodes(const QList<Node*>& nodes);
 
-  void SetMultipleNodeMessage();
+  void DeselectNodes(const QList<Node*>& nodes);
+
+  void SetTime(const rational& time);
 
 private:
-  Node* last_set_node_;
+  QMap<Node*, QTreeWidgetItem*> top_level_item_map_;
+
+  rational last_time_;
 
 };
 
diff --git a/app/widget/nodetableview/nodetablewidget.cpp b/app/widget/nodetableview/nodetablewidget.cpp
index 0c50794ab..f06678d33 100644
--- a/app/widget/nodetableview/nodetablewidget.cpp
+++ b/app/widget/nodetableview/nodetablewidget.cpp
@@ -25,8 +25,7 @@
 OLIVE_NAMESPACE_ENTER
 
 NodeTableWidget::NodeTableWidget(QWidget* parent) :
-  TimeBasedWidget(parent),
-  node_(nullptr)
+  TimeBasedWidget(parent)
 {
   QVBoxLayout* layout = new QVBoxLayout(this);
   layout->setSpacing(0);
@@ -36,37 +35,4 @@ NodeTableWidget::NodeTableWidget(QWidget* parent) :
   layout->addWidget(view_);
 }
 
-void NodeTableWidget::SetNodes(const QList<Node *> &nodes)
-{
-  node_ = nullptr;
-
-  if (nodes.isEmpty()) {
-    view_->clear();
-  } else if (nodes.size() == 1) {
-    node_ = nodes.first();
-
-    ViewerOutput* viewer = node_->FindOutputNode<ViewerOutput>();
-    if (viewer) {
-      qDebug() << "Found timebase";
-      SetTimebase(viewer->video_params().time_base());
-    }
-
-    UpdateView();
-  } else {
-    view_->SetMultipleNodeMessage();
-  }
-}
-
-void NodeTableWidget::TimeChangedEvent(const int64_t &)
-{
-  UpdateView();
-}
-
-void NodeTableWidget::UpdateView()
-{
-  if (node_) {
-    view_->SetNode(node_, GetTime());
-  }
-}
-
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodetableview/nodetablewidget.h b/app/widget/nodetableview/nodetablewidget.h
index bc05d768d..1eeecbfcb 100644
--- a/app/widget/nodetableview/nodetablewidget.h
+++ b/app/widget/nodetableview/nodetablewidget.h
@@ -31,18 +31,30 @@ class NodeTableWidget : public TimeBasedWidget
 public:
   NodeTableWidget(QWidget* parent = nullptr);
 
-  void SetNodes(const QList<Node*>& nodes);
+  void SelectNodes(const QList<Node*>& nodes)
+  {
+    view_->SelectNodes(nodes);
+  }
+
+  void DeselectNodes(const QList<Node*>& nodes)
+  {
+    view_->DeselectNodes(nodes);
+  }
 
 protected:
-  virtual void TimeChangedEvent(const int64_t& ts) override;
+  virtual void TimeChangedEvent(const int64_t& ts) override
+  {
+    UpdateView();
+  }
 
 private:
-  void UpdateView();
+  void UpdateView()
+  {
+    view_->SetTime(GetTime());
+  }
 
   NodeTableView* view_;
 
-  Node* node_;
-
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp
index ebd5d8c26..cba47d257 100644
--- a/app/widget/nodeview/nodeview.cpp
+++ b/app/widget/nodeview/nodeview.cpp
@@ -144,7 +144,8 @@ void NodeView::SelectAll()
 
   scene_.SelectAll();
 
-  ReconnectSelectionChangedSignal();
+  ConnectSelectionChangedSignal();
+  SceneSelectionChangedSlot();
 }
 
 void NodeView::DeselectAll()
@@ -155,7 +156,8 @@ void NodeView::DeselectAll()
 
   scene_.DeselectAll();
 
-  ReconnectSelectionChangedSignal();
+  ConnectSelectionChangedSignal();
+  SceneSelectionChangedSlot();
 }
 
 void NodeView::Select(const QList<Node *> &nodes)
@@ -176,7 +178,8 @@ void NodeView::Select(const QList<Node *> &nodes)
     item->setSelected(true);
   }
 
-  ReconnectSelectionChangedSignal();
+  ConnectSelectionChangedSignal();
+  SceneSelectionChangedSlot();
 }
 
 void NodeView::SelectWithDependencies(QList<Node *> nodes)
@@ -195,10 +198,13 @@ void NodeView::SelectWithDependencies(QList<Node *> nodes)
 
 void NodeView::SelectBlocks(const QList<Block *> &blocks)
 {
-  if (selected_blocks_ == blocks) {
-    return;
-  }
+  selected_blocks_.append(blocks);
 
+  SelectBlocksInternal();
+}
+
+void NodeView::DeselectBlocks(const QList<Block *> &blocks)
+{
   // Remove temporary associations
   foreach (Block* b, selected_blocks_) {
     if (!blocks.contains(b)) {
@@ -206,35 +212,12 @@ void NodeView::SelectBlocks(const QList<Block *> &blocks)
     }
   }
 
-  selected_blocks_ = blocks;
-
-  // Block scene signals while our selection is changing a lot
-  scene_.blockSignals(true);
-
-  if (filter_mode_ == kFilterShowSelectedBlocks) {
-    UpdateBlockFilter();
-  }
-
-  QList<Node*> nodes;
-  nodes.reserve(blocks.size());
-
+  // Remove blocks from selected array
   foreach (Block* b, blocks) {
-    nodes.append(b);
-    nodes.append(b->GetDependencies());
+    selected_blocks_.removeOne(b);
   }
 
-  SelectWithDependencies(nodes);
-
-  // Stop blocking signals and send a change signal now that all of our processing is done
-  scene_.blockSignals(false);
-  SceneSelectionChangedSlot();
-
-  if (!blocks.isEmpty()) {
-    NodeViewItem* item = scene_.NodeToUIObject(blocks.first());
-    if (item) {
-      centerOn(item);
-    }
-  }
+  SelectBlocksInternal();
 }
 
 void NodeView::CopySelected(bool cut)
@@ -478,7 +461,44 @@ void NodeView::wheelEvent(QWheelEvent *event)
 
 void NodeView::SceneSelectionChangedSlot()
 {
-  emit SelectionChanged(scene_.GetSelectedNodes());
+  QList<Node*> current_selection = scene_.GetSelectedNodes();
+
+  QList<Node*> selected;
+  QList<Node*> deselected;
+
+  // Determine which nodes are newly selected
+  if (selected_nodes_.isEmpty()) {
+    // All nodes in the current selection have just been selected
+    selected = current_selection;
+  } else {
+    foreach (Node* n, current_selection) {
+      if (!selected_nodes_.contains(n)) {
+        selected.append(n);
+      }
+    }
+  }
+
+  // Determine which nodes are newly deselected
+  if (current_selection.isEmpty()) {
+    // All nodes that were selected have been deselected
+    deselected = selected_nodes_;
+  } else {
+    foreach (Node* n, selected_nodes_) {
+      if (!current_selection.contains(n)) {
+        deselected.append(n);
+      }
+    }
+  }
+
+  selected_nodes_ = current_selection;
+
+  if (!selected.isEmpty()) {
+    emit NodesSelected(selected);
+  }
+
+  if (!deselected.isEmpty()) {
+    emit NodesDeselected(deselected);
+  }
 }
 
 void NodeView::ShowContextMenu(const QPoint &pos)
@@ -803,12 +823,6 @@ void NodeView::ConnectSelectionChangedSignal()
   connect(&scene_, &QGraphicsScene::selectionChanged, this, &NodeView::SceneSelectionChangedSlot);
 }
 
-void NodeView::ReconnectSelectionChangedSignal()
-{
-  ConnectSelectionChangedSignal();
-  SceneSelectionChangedSlot();
-}
-
 void NodeView::DisconnectSelectionChangedSignal()
 {
   disconnect(&scene_, &QGraphicsScene::selectionChanged, this, &NodeView::SceneSelectionChangedSlot);
@@ -913,6 +927,37 @@ void NodeView::DisassociateNode(Node *n, bool remove_from_map)
   disconnect(n, &Node::destroyed, this, &NodeView::AssociatedNodeDestroyed);
 }
 
+void NodeView::SelectBlocksInternal()
+{
+  // Block scene signals while our selection is changing a lot
+  scene_.blockSignals(true);
+
+  if (filter_mode_ == kFilterShowSelectedBlocks) {
+    UpdateBlockFilter();
+  }
+
+  QList<Node*> nodes;
+  nodes.reserve(selected_blocks_.size());
+
+  foreach (Block* b, selected_blocks_) {
+    nodes.append(b);
+    nodes.append(b->GetDependencies());
+  }
+
+  SelectWithDependencies(nodes);
+
+  // Stop blocking signals and send a change signal now that all of our processing is done
+  scene_.blockSignals(false);
+  SceneSelectionChangedSlot();
+
+  if (!selected_blocks_.isEmpty()) {
+    NodeViewItem* item = scene_.NodeToUIObject(selected_blocks_.first());
+    if (item) {
+      centerOn(item);
+    }
+  }
+}
+
 void NodeView::ValidateFilter()
 {
   // Force auto-positioning
diff --git a/app/widget/nodeview/nodeview.h b/app/widget/nodeview/nodeview.h
index bca1d669a..d2c7d7a95 100644
--- a/app/widget/nodeview/nodeview.h
+++ b/app/widget/nodeview/nodeview.h
@@ -61,18 +61,19 @@ public:
   void Select(const QList<Node*>& nodes);
   void SelectWithDependencies(QList<Node *> nodes);
 
-  void SelectBlocks(const QList<Block*>& blocks);
-
   void CopySelected(bool cut);
   void Paste();
 
   void Duplicate();
 
+  void SelectBlocks(const QList<Block*>& blocks);
+
+  void DeselectBlocks(const QList<Block*>& blocks);
+
 signals:
-  /**
-   * @brief Signal emitted when the selected nodes have changed
-   */
-  void SelectionChanged(QList<Node*> selected_nodes);
+  void NodesSelected(const QList<Node*>& nodes);
+
+  void NodesDeselected(const QList<Node*>& nodes);
 
 protected:
   virtual void keyPressEvent(QKeyEvent *event) override;
@@ -83,6 +84,8 @@ protected:
 
   virtual void wheelEvent(QWheelEvent* event) override;
 
+  //virtual void scrollContentsBy(int dx, int dy) override;
+
 private:
   void PlaceNode(NodeViewItem* n, const QPointF& pos);
 
@@ -97,7 +100,6 @@ private:
   void MoveAttachedNodesToCursor(const QPoint &p);
 
   void ConnectSelectionChangedSignal();
-  void ReconnectSelectionChangedSignal();
   void DisconnectSelectionChangedSignal();
 
   void UpdateBlockFilter();
@@ -105,6 +107,8 @@ private:
   void AssociateNodeWithSelectedBlocks(Node* n);
   void DisassociateNode(Node* n, bool remove_from_map);
 
+  void SelectBlocksInternal();
+
   NodeGraph* graph_;
 
   struct AttachedItem {
@@ -119,6 +123,8 @@ private:
 
   NodeViewScene scene_;
 
+  QList<Node*> selected_nodes_;
+
   QList<Block*> selected_blocks_;
 
   QHash<Node*, QList<Block*> > association_map_;
diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index 3a89da8fc..fae2a6910 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -129,7 +129,6 @@ TimelineWidget::TimelineWidget(QWidget *parent) :
     connect(view, &TimelineView::DragMoved, this, &TimelineWidget::ViewDragMoved);
     connect(view, &TimelineView::DragLeft, this, &TimelineWidget::ViewDragLeft);
     connect(view, &TimelineView::DragDropped, this, &TimelineWidget::ViewDragDropped);
-    ConnectViewSelectionSignal(view);
 
     connect(tview->splitter(), &QSplitter::splitterMoved, this, &TimelineWidget::UpdateHorizontalSplitters);
 
@@ -163,21 +162,19 @@ TimelineWidget::~TimelineWidget()
 
 void TimelineWidget::Clear()
 {
-  foreach (TimelineAndTrackView* tview, views_) {
-    DisconnectViewSelectionSignal(tview->view());
-  }
+  QList<Block*> deselected_blocks;
 
   QMap<Block*, TimelineViewBlockItem*>::const_iterator iterator;
   for (iterator=block_items_.begin(); iterator!=block_items_.end(); iterator++) {
+    if (iterator.value()->isSelected()) {
+      deselected_blocks.append(iterator.key());
+    }
+
     delete iterator.value();
   }
   block_items_.clear();
 
-  foreach (TimelineAndTrackView* tview, views_) {
-    ConnectViewSelectionSignal(tview->view());
-  }
-
-  emit SelectionChanged(QList<Block*>());
+  emit BlocksDeselected(deselected_blocks);
 
   SetTimebase(0);
 }
@@ -379,24 +376,34 @@ rational TimelineWidget::GetToolTipTimebase() const
 
 void TimelineWidget::SelectAll()
 {
-  foreach (TimelineAndTrackView* view, views_) {
-    DisconnectViewSelectionSignal(view->view());
-    view->view()->SelectAll();
-    ConnectViewSelectionSignal(view->view());
+  QList<Block*> blocks_selected;
+
+  QMap<Block*, TimelineViewBlockItem*>::const_iterator i;
+
+  for (i=block_items_.constBegin(); i!=block_items_.end(); i++) {
+    if (!i.value()->isSelected()) {
+      i.value()->setSelected(true);
+      blocks_selected.append(i.key());
+    }
   }
 
-  ViewSelectionChanged();
+  emit BlocksSelected(blocks_selected);
 }
 
 void TimelineWidget::DeselectAll()
 {
-  foreach (TimelineAndTrackView* view, views_) {
-    DisconnectViewSelectionSignal(view->view());
-    view->view()->DeselectAll();
-    ConnectViewSelectionSignal(view->view());
+  QList<Block*> blocks_deselected;
+
+  QMap<Block*, TimelineViewBlockItem*>::const_iterator i;
+
+  for (i=block_items_.constBegin(); i!=block_items_.end(); i++) {
+    if (i.value()->isSelected()) {
+      i.value()->setSelected(false);
+      blocks_deselected.append(i.key());
+    }
   }
 
-  emit SelectionChanged(QList<Block*>());
+  emit BlocksDeselected(blocks_deselected);
 }
 
 void TimelineWidget::RippleToIn()
@@ -803,16 +810,6 @@ TrackOutput *TimelineWidget::GetTrackFromReference(const TrackReference &ref)
   return GetConnectedNode()->track_list(ref.type())->GetTrackAt(ref.index());
 }
 
-void TimelineWidget::ConnectViewSelectionSignal(TimelineView *view)
-{
-  connect(view, &TimelineView::SelectionChanged, this, &TimelineWidget::ViewSelectionChanged);
-}
-
-void TimelineWidget::DisconnectViewSelectionSignal(TimelineView *view)
-{
-  disconnect(view, &TimelineView::SelectionChanged, this, &TimelineWidget::ViewSelectionChanged);
-}
-
 int TimelineWidget::GetTrackY(const TrackReference &ref)
 {
   return views_.at(ref.type())->view()->GetTrackY(ref.index());
@@ -983,22 +980,6 @@ void TimelineWidget::TrackIndexChanged()
   }
 }
 
-void TimelineWidget::ViewSelectionChanged()
-{
-  if (rubberband_.isVisible()) {
-    return;
-  }
-
-  QList<TimelineViewBlockItem*> selected_items = GetSelectedBlocks();
-  QList<Block*> selected_blocks;
-
-  foreach (TimelineViewBlockItem* item, selected_items) {
-    selected_blocks.append(item->block());
-  }
-
-  emit SelectionChanged(selected_blocks);
-}
-
 void TimelineWidget::BlockRefreshed()
 {
   TimelineViewRect* rect = block_items_.value(static_cast<Block*>(sender()));
@@ -1393,6 +1374,14 @@ void TimelineWidget::StartRubberBandSelect(bool enable_selecting, bool select_li
   drag_origin_ = QCursor::pos();
   rubberband_.show();
 
+  // We don't touch any blocks that are already selected. If you want these to be deselected by
+  // default, call DeselectAll() befoer calling StartRubberBandSelect()
+  foreach (TimelineViewBlockItem* block, block_items_) {
+    if (block->isSelected()) {
+      rubberband_already_selected_.append(block);
+    }
+  }
+
   MoveRubberBandSelect(enable_selecting, select_links);
 }
 
@@ -1408,10 +1397,11 @@ void TimelineWidget::MoveRubberBandSelect(bool enable_selecting, bool select_lin
 
   QList<QGraphicsItem*> new_selected_list;
 
+  // Determine all items in the rubberband
   foreach (TimelineAndTrackView* tview, views_) {
-    // Map global mouse coordinates to viewport
     TimelineView* view = tview->view();
 
+    // Map global mouse coordinates to viewport
     QRect mapped_rect(view->viewport()->mapFromGlobal(drag_origin_),
                       view->viewport()->mapFromGlobal(rubberband_now));
 
@@ -1421,13 +1411,25 @@ void TimelineWidget::MoveRubberBandSelect(bool enable_selecting, bool select_lin
     new_selected_list.append(rubberband_items);
   }
 
+  // Filter out any items that were already selected
+  if (!rubberband_already_selected_.isEmpty()) {
+    for (int i=0; i<new_selected_list.size(); i++) {
+      if (rubberband_already_selected_.contains(new_selected_list.at(i))) {
+        new_selected_list.removeAt(i);
+        i--;
+      }
+    }
+  }
+
   foreach (QGraphicsItem* item, rubberband_now_selected_) {
     item->setSelected(false);
   }
 
-  foreach (QGraphicsItem* item, new_selected_list) {
-    TimelineViewBlockItem* block_item = dynamic_cast<TimelineViewBlockItem*>(item);
-    if (!block_item || block_item->block()->type() == Block::kGap) {
+  // Cache limit because we append to this array in this loop and don't need to process those
+  int lim = new_selected_list.size();
+  for (int i=0;i<lim;i++) {
+    TimelineViewBlockItem* block_item = static_cast<TimelineViewBlockItem*>(new_selected_list.at(i));
+    if (block_item->block()->type() == Block::kGap) {
       continue;
     }
 
@@ -1436,18 +1438,22 @@ void TimelineWidget::MoveRubberBandSelect(bool enable_selecting, bool select_lin
       continue;
     }
 
+    // Since new_selected_list is filtered by rubberband_already_selected_, this should certainly
+    // be deselected by now
     block_item->setSelected(true);
 
     if (select_links) {
       // Select the block's links
       Block* b = block_item->block();
-      SetBlockLinksSelected(b, true);
 
       // Add its links to the list
       TimelineViewBlockItem* link_item;
       foreach (Block* link, b->linked_clips()) {
         if ((link_item = block_items_[link]) != nullptr) {
-          if (!new_selected_list.contains(link_item)) {
+          link_item->setSelected(true);
+
+          if (!new_selected_list.contains(link_item)
+              && !rubberband_already_selected_.contains(link_item)) {
             new_selected_list.append(link_item);
           }
         }
@@ -1458,13 +1464,19 @@ void TimelineWidget::MoveRubberBandSelect(bool enable_selecting, bool select_lin
   rubberband_now_selected_ = new_selected_list;
 }
 
-void TimelineWidget::EndRubberBandSelect(bool enable_selecting, bool select_links)
+void TimelineWidget::EndRubberBandSelect()
 {
-  MoveRubberBandSelect(enable_selecting, select_links);
   rubberband_.hide();
-  rubberband_now_selected_.clear();
 
-  ViewSelectionChanged();
+  // Emit any blocks that were newly selected
+  QList<Block*> selected_blocks;
+  foreach (QGraphicsItem* item, rubberband_now_selected_) {
+    selected_blocks.append(static_cast<TimelineViewBlockItem*>(item)->block());
+  }
+  emit BlocksSelected(selected_blocks);
+
+  rubberband_now_selected_.clear();
+  rubberband_already_selected_.clear();
 }
 
 struct SnapData {
diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h
index 7b957c67c..cab78ee0f 100644
--- a/app/widget/timelinewidget/timelinewidget.h
+++ b/app/widget/timelinewidget/timelinewidget.h
@@ -104,7 +104,9 @@ public:
   void RestoreSplitterState(const QByteArray& state);
 
 signals:
-  void SelectionChanged(const QList<Block*>& selected_blocks);
+  void BlocksSelected(const QList<Block*>& selected_blocks);
+
+  void BlocksDeselected(const QList<Block*>& deselected_blocks);
 
 protected:
   virtual void resizeEvent(QResizeEvent *event) override;
@@ -474,8 +476,9 @@ private:
 
   void StartRubberBandSelect(bool enable_selecting, bool select_links);
   void MoveRubberBandSelect(bool enable_selecting, bool select_links);
-  void EndRubberBandSelect(bool enable_selecting, bool select_links);
+  void EndRubberBandSelect();
   QRubberBand rubberband_;
+  QList<QGraphicsItem*> rubberband_already_selected_;
   QList<QGraphicsItem*> rubberband_now_selected_;
 
   Tool* GetActiveTool();
@@ -496,10 +499,6 @@ private:
 
   TrackOutput* GetTrackFromReference(const TrackReference& ref);
 
-  void ConnectViewSelectionSignal(TimelineView* view);
-
-  void DisconnectViewSelectionSignal(TimelineView* view);
-
   QList<TimelineAndTrackView*> views_;
 
   TimeSlider* timecode_label_;
@@ -539,8 +538,6 @@ private slots:
   void RemoveTrack(TrackOutput* track);
   void TrackIndexChanged();
 
-  void ViewSelectionChanged();
-
   /**
    * @brief Slot for when a Block node changes its parameters and the graphics need to update
    *
diff --git a/app/widget/timelinewidget/tool/pointer.cpp b/app/widget/timelinewidget/tool/pointer.cpp
index 85e1884f5..9889a30a3 100644
--- a/app/widget/timelinewidget/tool/pointer.cpp
+++ b/app/widget/timelinewidget/tool/pointer.cpp
@@ -78,16 +78,23 @@ void TimelineWidget::PointerTool::MousePress(TimelineViewMouseEvent *event)
     // If this item is already selected, no further selection needs to be made
     if (clicked_item_->isSelected()) {
 
+      // Collect item deselections
+      QList<Block*> deselected_blocks;
+
       // If shift is held, deselect it
       if (event->GetModifiers() & Qt::ShiftModifier) {
         clicked_item_->setSelected(false);
+        deselected_blocks.append(clicked_item_->block());
 
         // If not holding alt, deselect all links as well
         if (!(event->GetModifiers() & Qt::AltModifier)) {
           parent()->SetBlockLinksSelected(clicked_item_->block(), false);
+          deselected_blocks.append(clicked_item_->block()->linked_clips().toList());
         }
       }
 
+      emit parent()->BlocksDeselected(deselected_blocks);
+
       return;
     }
   }
@@ -98,18 +105,29 @@ void TimelineWidget::PointerTool::MousePress(TimelineViewMouseEvent *event)
   }
 
   if (selectable_item) {
+
+    // Collect item selections
+    QList<Block*> selected_blocks;
+
     // Select this item
     clicked_item_->setSelected(true);
+    selected_blocks.append(clicked_item_->block());
 
     // If not holding alt, select all links as well
     if (!(event->GetModifiers() & Qt::AltModifier)) {
       parent()->SetBlockLinksSelected(clicked_item_->block(), true);
+      selected_blocks.append(clicked_item_->block()->linked_clips().toList());
     }
+
+    emit parent()->BlocksSelected(selected_blocks);
+
   } else if (event->GetButton() == Qt::LeftButton) {
+
     // Start rubberband drag
     parent()->StartRubberBandSelect(true, !(event->GetModifiers() & Qt::AltModifier));
 
     rubberband_selecting_ = true;
+
   }
 }
 
@@ -150,7 +168,7 @@ void TimelineWidget::PointerTool::MouseRelease(TimelineViewMouseEvent *event)
 {
   if (rubberband_selecting_) {
     // Finish rubberband select
-    parent()->EndRubberBandSelect(true, !(event->GetModifiers() & Qt::AltModifier));
+    parent()->EndRubberBandSelect();
     rubberband_selecting_ = false;
     return;
   }
diff --git a/app/widget/timelinewidget/tool/zoom.cpp b/app/widget/timelinewidget/tool/zoom.cpp
index 123b821c8..a961a88e7 100644
--- a/app/widget/timelinewidget/tool/zoom.cpp
+++ b/app/widget/timelinewidget/tool/zoom.cpp
@@ -51,7 +51,7 @@ void TimelineWidget::ZoomTool::MouseRelease(TimelineViewMouseEvent *event)
     // Zoom into the rubberband selection
     QRect screen_coords = parent()->rubberband_.geometry();
 
-    parent()->EndRubberBandSelect(false, false);
+    parent()->EndRubberBandSelect();
 
     TimelineView* reference_view = parent()->views_.first()->view();
     QPointF scene_topleft = reference_view->mapToScene(reference_view->mapFrom(parent(), screen_coords.topLeft()));
diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp
index b55ec6cba..3ff4cd08a 100644
--- a/app/widget/timelinewidget/view/timelineview.cpp
+++ b/app/widget/timelinewidget/view/timelineview.cpp
@@ -47,26 +47,6 @@ TimelineView::TimelineView(Qt::Alignment vertical_alignment, QWidget *parent) :
   setBackgroundRole(QPalette::Window);
   setContextMenuPolicy(Qt::CustomContextMenu);
   viewport()->setMouseTracking(true);
-
-  connect(scene(), &QGraphicsScene::selectionChanged, this, &TimelineView::SelectionChanged);
-}
-
-void TimelineView::SelectAll()
-{
-  QList<QGraphicsItem*> all_items = items();
-
-  foreach (QGraphicsItem* i, all_items) {
-    i->setSelected(true);
-  }
-}
-
-void TimelineView::DeselectAll()
-{
-  QList<QGraphicsItem*> all_items = items();
-
-  foreach (QGraphicsItem* i, all_items) {
-    i->setSelected(false);
-  }
 }
 
 void TimelineView::mousePressEvent(QMouseEvent *event)
diff --git a/app/widget/timelinewidget/view/timelineview.h b/app/widget/timelinewidget/view/timelineview.h
index 4bacad401..e409b425d 100644
--- a/app/widget/timelinewidget/view/timelineview.h
+++ b/app/widget/timelinewidget/view/timelineview.h
@@ -49,10 +49,6 @@ public:
   TimelineView(Qt::Alignment vertical_alignment = Qt::AlignTop,
                QWidget* parent = nullptr);
 
-  void SelectAll();
-
-  void DeselectAll();
-
   int GetTrackY(int track_index) const;
   int GetTrackHeight(int track_index) const;
 
@@ -74,8 +70,6 @@ signals:
   void DragLeft(QDragLeaveEvent* event);
   void DragDropped(TimelineViewMouseEvent* event);
 
-  void SelectionChanged();
-
 protected:
   virtual void mousePressEvent(QMouseEvent *event) override;
   virtual void mouseMoveEvent(QMouseEvent *event) override;
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 4825c9b61..4c010e963 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -82,8 +82,10 @@ MainWindow::MainWindow(QWidget *parent) :
   audio_monitor_panel_ = PanelManager::instance()->CreatePanel<AudioMonitorPanel>(this);
 
   // Make connections to sequence viewer
-  connect(node_panel_, &NodePanel::SelectionChanged, param_panel_, &ParamPanel::SetNodes);
-  connect(node_panel_, &NodePanel::SelectionChanged, table_panel_, &NodeTablePanel::SetNodes);
+  connect(node_panel_, &NodePanel::NodesSelected, param_panel_, &ParamPanel::SelectNodes);
+  connect(node_panel_, &NodePanel::NodesDeselected, param_panel_, &ParamPanel::DeselectNodes);
+  connect(node_panel_, &NodePanel::NodesSelected, table_panel_, &NodeTablePanel::SelectNodes);
+  connect(node_panel_, &NodePanel::NodesDeselected, table_panel_, &NodeTablePanel::DeselectNodes);
   connect(param_panel_, &ParamPanel::RequestSelectNode, node_panel_, &NodePanel::Select);
   connect(sequence_viewer_panel_, &SequenceViewerPanel::TimeChanged, param_panel_, &ParamPanel::SetTimestamp);
   connect(sequence_viewer_panel_, &SequenceViewerPanel::TimeChanged, table_panel_, &NodeTablePanel::SetTimestamp);
@@ -480,7 +482,8 @@ TimelinePanel* MainWindow::AppendTimelinePanel()
   connect(panel, &TimelinePanel::TimeChanged, param_panel_, &ParamPanel::SetTimestamp);
   connect(panel, &TimelinePanel::TimeChanged, table_panel_, &NodeTablePanel::SetTimestamp);
   connect(panel, &TimelinePanel::TimeChanged, sequence_viewer_panel_, &SequenceViewerPanel::SetTimestamp);
-  connect(panel, &TimelinePanel::SelectionChanged, node_panel_, &NodePanel::SelectBlocks);
+  connect(panel, &TimelinePanel::BlocksSelected, node_panel_, &NodePanel::SelectBlocks);
+  connect(panel, &TimelinePanel::BlocksDeselected, node_panel_, &NodePanel::DeselectBlocks);
   connect(param_panel_, &ParamPanel::TimeChanged, panel, &TimelinePanel::SetTimestamp);
   connect(sequence_viewer_panel_, &SequenceViewerPanel::TimeChanged, panel, &TimelinePanel::SetTimestamp);
 

From d453c13c158a4ff0711501e8f3e478a6e6419a42 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 5 Aug 2020 01:38:00 +1000
Subject: [PATCH 087/138] initialize variable (fixes gcc build issue)

---
 app/codec/exportcodec.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/codec/exportcodec.cpp b/app/codec/exportcodec.cpp
index bd819e204..4f8aca533 100644
--- a/app/codec/exportcodec.cpp
+++ b/app/codec/exportcodec.cpp
@@ -86,7 +86,7 @@ QStringList ExportCodec::GetPixelFormatsForCodec(ExportCodec::Codec c)
 {
   QStringList pix_fmts;
 
-  AVCodec* codec_info;
+  AVCodec* codec_info = nullptr;
 
   switch (c) {
   case kCodecH264:
@@ -105,7 +105,6 @@ QStringList ExportCodec::GetPixelFormatsForCodec(ExportCodec::Codec c)
   case kCodecPNG:
   case kCodecTIFF:
     // FIXME: Add these in (these will most likely use an OIIOEncoder which doesn't exist yet)
-    codec_info = nullptr;
     break;
   case kCodecMP2:
   case kCodecMP3:
@@ -113,7 +112,6 @@ QStringList ExportCodec::GetPixelFormatsForCodec(ExportCodec::Codec c)
   case kCodecPCM:
   case kCodecCount:
     // These are audio or invalid codecs and therefore have no pixel formats
-    codec_info = nullptr;
     break;
   }
 

From 07a3216a1fe182441ea3c182b7c5c09a7c2c87f7 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 5 Aug 2020 01:42:52 +1000
Subject: [PATCH 088/138] timeline: if an item is selected while deleted, emit
 the deselection signal

---
 app/widget/timelinewidget/timelinewidget.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp
index fae2a6910..07b74ca46 100644
--- a/app/widget/timelinewidget/timelinewidget.cpp
+++ b/app/widget/timelinewidget/timelinewidget.cpp
@@ -944,7 +944,14 @@ void TimelineWidget::RemoveBlock(Block *block)
   disconnect(block, &Block::LabelChanged, this, &TimelineWidget::BlockUpdated);
   disconnect(block, &Block::EnabledChanged, this, &TimelineWidget::BlockUpdated);
 
-  delete block_items_.take(block);
+  TimelineViewBlockItem* item = block_items_.take(block);
+
+  if (item->isSelected()) {
+    // Sending a list of one item all the time is not very efficient
+    emit BlocksDeselected({block});
+  }
+
+  delete item;
 }
 
 void TimelineWidget::AddTrack(TrackOutput *track, Timeline::TrackType type)

From c8def73b95b82772b0be87243061379de483dbc0 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 5 Aug 2020 01:56:28 +1000
Subject: [PATCH 089/138] cache: mild auto-cache overhaul

Shifted from CacheTask to functionality built into RenderBackend. It was
a lot easier to control behavior this way without having to juggle a ton
of threads and race conditions.

Could likely be multithreaded further.
---
 app/core.cpp                             |  35 +-
 app/node/output/viewer/viewer.cpp        |   4 +-
 app/node/output/viewer/viewer.h          |   3 +-
 app/panel/viewer/viewerbase.cpp          |  10 +
 app/panel/viewer/viewerbase.h            |   4 +
 app/render/backend/renderbackend.cpp     | 402 ++++++++++++++++++++---
 app/render/backend/renderbackend.h       | 122 ++++++-
 app/render/backend/renderticketwatcher.h |   5 +
 app/render/framehashcache.cpp            |  61 +++-
 app/render/framehashcache.h              |   9 +-
 app/task/cache/cache.cpp                 |   2 +-
 app/task/render/render.cpp               |   8 +-
 app/widget/viewer/viewer.cpp             | 271 ++++++---------
 app/widget/viewer/viewer.h               |  40 +--
 14 files changed, 692 insertions(+), 284 deletions(-)

diff --git a/app/core.cpp b/app/core.cpp
index d7014f408..25a0e6d07 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -1267,23 +1267,32 @@ void Core::CacheActiveSequence(bool in_out_only)
   TimeBasedPanel* p = PanelManager::instance()->MostRecentlyFocused<TimeBasedPanel>();
 
   if (p && p->GetConnectedViewer()) {
-    CacheTask* task = new CacheTask(p->GetConnectedViewer(),
-                                    p->GetConnectedViewer()->video_params(),
-                                    p->GetConnectedViewer()->audio_params(),
-                                    in_out_only);
+    // Hacky but works for now
 
-    // Stop any current auto-cache tasks
-    ViewerWidget::StopAllBackgroundCacheTasks(true);
-    ViewerWidget::SetBackgroundCacheTask(task);
+    // Find Viewer attached to this TimeBasedPanel
+    QList<ViewerPanel*> all_viewers = PanelManager::instance()->GetPanelsOfType<ViewerPanel>();
 
-    TaskDialog* dialog = new TaskDialog(task, tr("Caching Sequence"), main_window_);
+    ViewerPanel* found_panel = nullptr;
 
-    connect(dialog,
-            &TaskDialog::TaskSucceeded,
-            this,
-            [] { ViewerWidget::SetBackgroundCacheTask(nullptr); });
+    foreach (ViewerPanel* viewer, all_viewers) {
+      if (viewer->GetConnectedViewer() == p->GetConnectedViewer()) {
+        found_panel = viewer;
+        break;
+      }
+    }
 
-    dialog->open();
+    if (found_panel) {
+      if (in_out_only) {
+        found_panel->CacheSequenceInOut();
+      } else {
+        found_panel->CacheEntireSequence();
+      }
+    } else {
+      QMessageBox::critical(main_window_,
+                            tr("Failed to cache sequence"),
+                            tr("No active viewer found with this sequence."),
+                            QMessageBox::Ok);
+    }
   }
 }
 
diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp
index 457ce99de..0d96a049e 100644
--- a/app/node/output/viewer/viewer.cpp
+++ b/app/node/output/viewer/viewer.cpp
@@ -148,14 +148,14 @@ void ViewerOutput::set_video_params(const VideoParams &video)
     emit TimebaseChanged(video_params_.time_base());
   }
 
-  emit ParamsChanged();
+  emit VideoParamsChanged();
 }
 
 void ViewerOutput::set_audio_params(const AudioParams &audio)
 {
   audio_params_ = audio;
 
-  emit ParamsChanged();
+  emit AudioParamsChanged();
 }
 
 rational ViewerOutput::GetLength()
diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h
index e57406c46..c2b1c49e1 100644
--- a/app/node/output/viewer/viewer.h
+++ b/app/node/output/viewer/viewer.h
@@ -131,7 +131,8 @@ signals:
 
   void SizeChanged(int width, int height);
 
-  void ParamsChanged();
+  void VideoParamsChanged();
+  void AudioParamsChanged();
 
   void BlockAdded(Block* block, TrackReference track);
   void BlockRemoved(Block* block);
diff --git a/app/panel/viewer/viewerbase.cpp b/app/panel/viewer/viewerbase.cpp
index 13a8c7394..47ebbe0e0 100644
--- a/app/panel/viewer/viewerbase.cpp
+++ b/app/panel/viewer/viewerbase.cpp
@@ -90,6 +90,16 @@ void ViewerPanelBase::SetGizmos(Node *node)
   static_cast<ViewerWidget*>(GetTimeBasedWidget())->SetGizmos(node);
 }
 
+void ViewerPanelBase::CacheEntireSequence()
+{
+  static_cast<ViewerWidget*>(GetTimeBasedWidget())->CacheEntireSequence();
+}
+
+void ViewerPanelBase::CacheSequenceInOut()
+{
+  static_cast<ViewerWidget*>(GetTimeBasedWidget())->CacheSequenceInOut();
+}
+
 void ViewerPanelBase::CreateScopePanel(ScopePanel::Type type)
 {
   ViewerWidget* vw = static_cast<ViewerWidget*>(GetTimeBasedWidget());
diff --git a/app/panel/viewer/viewerbase.h b/app/panel/viewer/viewerbase.h
index a3261da50..36ac0aa35 100644
--- a/app/panel/viewer/viewerbase.h
+++ b/app/panel/viewer/viewerbase.h
@@ -57,6 +57,10 @@ public:
 public slots:
   void SetGizmos(Node* node);
 
+  void CacheEntireSequence();
+
+  void CacheSequenceInOut();
+
 protected:
   void CreateScopePanel(ScopePanel::Type type);
 
diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index aa891e722..75a609846 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -31,13 +31,27 @@
 
 OLIVE_NAMESPACE_ENTER
 
+QVector<RenderBackend*> RenderBackend::instances_;
+QMutex RenderBackend::instance_lock_;
+RenderBackend* RenderBackend::active_instance_ = nullptr;
+QThreadPool RenderBackend::thread_pool_;
+
 RenderBackend::RenderBackend(QObject *parent) :
   QObject(parent),
   viewer_node_(nullptr),
-  update_with_graph_(false),
+  autocache_enabled_(false),
+  autocache_paused_(false),
   preview_job_time_(0),
-  render_mode_(RenderMode::kOnline)
+  render_mode_(RenderMode::kOnline),
+  autocache_has_changed_(false),
+  use_custom_autocache_range_(false)
 {
+  instance_lock_.lock();
+  instances_.append(this);
+  instance_lock_.unlock();
+
+  // Set default autocache range
+  SetAutoCachePlayhead(rational());
 }
 
 RenderBackend::~RenderBackend()
@@ -53,22 +67,21 @@ void RenderBackend::SetViewerNode(ViewerOutput *viewer_node)
 
   ViewerOutput* old_viewer = viewer_node_;
   if (!viewer_node) {
-    // If setting to null, set it here before we wait for jobs to finish
-    viewer_node_ = viewer_node;
+    // If setting to null, set it here before we wait for jobs to finish to prevent WorkerFinished()
+    // from calling RunNextJob() again and preventing us from finishing
+    viewer_node_ = nullptr;
   }
 
   if (old_viewer) {
-    // Delete all of our copied nodes
-    pool_.clear();
-    pool_.waitForDone();
+    // Cancel any remaining tickets
+    ClearQueue();
 
-    // Cancel all tickets
-    foreach (RenderTicketPtr t, render_queue_) {
-      t->Cancel();
+    // Wait for any currently running jobs to finish
+    foreach (RenderTicketPtr ticket, running_tickets_) {
+      ticket->WaitForFinished();
     }
-    render_queue_.clear();
 
-    // Delete all the nodes
+    // Delete all of our copied nodes
     foreach (Node* c, copy_map_) {
       c->deleteLater();
     }
@@ -76,18 +89,27 @@ void RenderBackend::SetViewerNode(ViewerOutput *viewer_node)
     copied_viewer_node_ = nullptr;
     graph_update_queue_.clear();
 
+    // Disconnect signal (will be a no-op if the signal was never connected)
     disconnect(old_viewer,
                &ViewerOutput::GraphChangedFrom,
                this,
                &RenderBackend::NodeGraphChanged);
+
+    disconnect(old_viewer->video_frame_cache(),
+               &PlaybackCache::Invalidated,
+               this,
+               &RenderBackend::AutoCacheVideoInvalidated);
+
+    disconnect(old_viewer->audio_playback_cache(),
+               &PlaybackCache::Invalidated,
+               this,
+               &RenderBackend::AutoCacheAudioInvalidated);
   }
 
   if (viewer_node) {
     // If setting to non-null, set it now
     viewer_node_ = viewer_node;
-  }
 
-  if (viewer_node_) {
     // Copy graph
     copied_viewer_node_ = static_cast<ViewerOutput*>(viewer_node_->copy());
     copy_map_.insert(viewer_node_, copied_viewer_node_);
@@ -96,65 +118,92 @@ void RenderBackend::SetViewerNode(ViewerOutput *viewer_node)
     NodeGraphChanged(viewer_node_->samples_input());
     ProcessUpdateQueue();
 
-    if (update_with_graph_) {
+    if (autocache_enabled_) {
       connect(viewer_node_,
               &ViewerOutput::GraphChangedFrom,
               this,
               &RenderBackend::NodeGraphChanged);
+
+      connect(viewer_node_->video_frame_cache(),
+              &PlaybackCache::Invalidated,
+              this,
+              &RenderBackend::AutoCacheVideoInvalidated);
+
+      connect(viewer_node_->audio_playback_cache(),
+              &PlaybackCache::Invalidated,
+              this,
+              &RenderBackend::AutoCacheAudioInvalidated);
     }
   }
 }
 
-void RenderBackend::ClearVideoQueue()
+void RenderBackend::AutoCacheRange(const TimeRange &range)
 {
-  foreach (RenderTicketPtr t, render_queue_) {
-    t->Cancel();
-  }
-  render_queue_.clear();
+  Q_ASSERT(autocache_enabled_);
+
+  autocache_has_changed_ = true;
+  use_custom_autocache_range_ = true;
+  custom_autocache_range_ = range;
+
+  AutoCacheRequeueFrames();
 }
 
-RenderTicketPtr RenderBackend::Hash(const QVector<rational> &times)
+RenderTicketPtr RenderBackend::Hash(const QVector<rational> &times, bool prioritize)
 {
-  if (!viewer_node_) {
-    return nullptr;
-  }
+  Q_ASSERT(viewer_node_);
+
+  SetActiveInstance();
 
   RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeHash,
                                                           QVariant::fromValue(times));
 
-  render_queue_.push_back(ticket);
+  if (prioritize) {
+    render_queue_.push_front(ticket);
+  } else {
+    render_queue_.push_back(ticket);
+  }
 
   QMetaObject::invokeMethod(this, "RunNextJob", Qt::QueuedConnection);
 
   return ticket;
 }
 
-RenderTicketPtr RenderBackend::RenderFrame(const rational &time)
+RenderTicketPtr RenderBackend::RenderFrame(const rational &time, bool prioritize, const QByteArray& hash)
 {
-  if (!viewer_node_) {
-    return nullptr;
-  }
+  Q_ASSERT(viewer_node_);
+
+  SetActiveInstance();
 
   RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeVideo,
                                                           QVariant::fromValue(time));
 
-  render_queue_.push_back(ticket);
+  ticket->setProperty("hash", hash);
+
+  if (prioritize) {
+    render_queue_.push_front(ticket);
+  } else {
+    render_queue_.push_back(ticket);
+  }
 
   QMetaObject::invokeMethod(this, "RunNextJob", Qt::QueuedConnection);
 
   return ticket;
 }
 
-RenderTicketPtr RenderBackend::RenderAudio(const TimeRange &r)
+RenderTicketPtr RenderBackend::RenderAudio(const TimeRange &r, bool prioritize)
 {
-  if (!viewer_node_) {
-    return nullptr;
-  }
+  Q_ASSERT(viewer_node_);
+
+  SetActiveInstance();
 
   RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeAudio,
                                                           QVariant::fromValue(r));
 
-  render_queue_.push_back(ticket);
+  if (prioritize) {
+    render_queue_.push_front(ticket);
+  } else {
+    render_queue_.push_back(ticket);
+  }
 
   QMetaObject::invokeMethod(this, "RunNextJob", Qt::QueuedConnection);
 
@@ -194,6 +243,27 @@ std::list<TimeRange> RenderBackend::SplitRangeIntoChunks(const TimeRange &r)
   return split_ranges;
 }
 
+void RenderBackend::ClearVideoQueue()
+{
+  ClearQueueOfType(RenderTicket::kTypeVideo);
+
+  autocache_has_changed_ = true;
+  use_custom_autocache_range_ = false;
+}
+
+void RenderBackend::ClearAudioQueue()
+{
+  ClearQueueOfType(RenderTicket::kTypeAudio);
+}
+
+void RenderBackend::ClearQueue()
+{
+  foreach (RenderTicketPtr t, render_queue_) {
+    t->Cancel();
+  }
+  render_queue_.clear();
+}
+
 void RenderBackend::NodeGraphChanged(NodeInput *source)
 {
   // We need to determine:
@@ -259,6 +329,14 @@ void RenderBackend::RunNextJob()
 {
   // If queue is empty, nothing to be done
   if (render_queue_.empty()) {
+
+    // If we're the active instance, unset it
+    instance_lock_.lock();
+    if (active_instance_ == this) {
+      active_instance_ = nullptr;
+    }
+    instance_lock_.unlock();
+
     return;
   }
 
@@ -270,7 +348,7 @@ void RenderBackend::RunNextJob()
   }
 
   // If we have a value update queued, check if all workers are available and proceed from there
-  if (update_with_graph_ && !graph_update_queue_.isEmpty()) {
+  if (autocache_enabled_ && !graph_update_queue_.isEmpty()) {
     bool all_workers_available = true;
 
     foreach (const WorkerData& data, workers_) {
@@ -291,7 +369,7 @@ void RenderBackend::RunNextJob()
   // If we have no workers allocated, allocate them now
   if (workers_.isEmpty()) {
     // Allocate workers here
-    workers_.resize(pool_.maxThreadCount());
+    workers_.resize(thread_pool_.maxThreadCount());
 
     for (int i=0;i<workers_.size();i++) {
       RenderWorker* worker = CreateNewWorker();
@@ -323,9 +401,14 @@ void RenderBackend::RunNextJob()
       RenderTicketPtr ticket = render_queue_.front();
       render_queue_.pop_front();
 
+      running_tickets_.push_back(ticket);
+      RenderTicketWatcher* watcher = new RenderTicketWatcher();
+      connect(watcher, &RenderTicketWatcher::Finished, this, &RenderBackend::TicketFinished);
+      watcher->SetTicket(ticket);
+
       switch (ticket->GetType()) {
       case RenderTicket::kTypeHash:
-        QtConcurrent::run(&pool_,
+        QtConcurrent::run(&thread_pool_,
                           worker,
                           &RenderWorker::Hash,
                           ticket,
@@ -333,15 +416,24 @@ void RenderBackend::RunNextJob()
                           ticket->GetTime().value<QVector<rational> >());
         break;
       case RenderTicket::kTypeVideo:
-        QtConcurrent::run(&pool_,
+      {
+        rational frame = ticket->GetTime().value<rational>();
+
+        QtConcurrent::run(&thread_pool_,
                           worker,
                           &RenderWorker::RenderFrame,
                           ticket,
                           copied_viewer_node_,
-                          ticket->GetTime().value<rational>());
+                          frame);
+
+        QByteArray frame_hash = ticket->property("hash").toByteArray();
+        if (!frame_hash.isEmpty()) {
+          currently_caching_hashes_.append(frame_hash);
+        }
         break;
+      }
       case RenderTicket::kTypeAudio:
-        QtConcurrent::run(&pool_,
+        QtConcurrent::run(&thread_pool_,
                           worker,
                           &RenderWorker::RenderAudio,
                           ticket,
@@ -358,6 +450,162 @@ void RenderBackend::RunNextJob()
   }
 }
 
+void RenderBackend::TicketFinished()
+{
+  RenderTicketPtr ticket = static_cast<RenderTicketWatcher*>(sender())->GetTicket();
+  delete sender();
+
+  running_tickets_.remove(ticket);
+}
+
+void RenderBackend::AutoCacheVideoInvalidated(const TimeRange &range)
+{
+  ClearVideoQueue();
+
+  // Hash these frames since that should be relatively quick.
+  RenderTicketWatcher* watcher = new RenderTicketWatcher();
+  QVector<rational> frames = viewer_node_->video_frame_cache()->GetFrameListFromTimeRange({range});
+  autocache_hash_tasks_.insert(watcher, {frames, QDateTime::currentMSecsSinceEpoch()});
+  connect(watcher, &RenderTicketWatcher::Finished, this, &RenderBackend::AutoCacheHashesGenerated);
+  watcher->SetTicket(Hash(frames));
+}
+
+void RenderBackend::AutoCacheAudioInvalidated(const TimeRange &range)
+{
+  // Start a task to re-render the audio at this range
+  RenderTicketWatcher* watcher = new RenderTicketWatcher();
+  autocache_audio_tasks_.insert(watcher, {range, QDateTime::currentMSecsSinceEpoch()});
+  connect(watcher, &RenderTicketWatcher::Finished, this, &RenderBackend::AutoCacheAudioRendered);
+  watcher->SetTicket(RenderAudio(range, true));
+}
+
+void RenderBackend::SetHashes(FrameHashCache* cache, const QVector<rational>& times, const QVector<QByteArray>& hashes, qint64 job_time)
+{
+  std::vector<QByteArray> existing_hashes;
+
+  for (int i=0; i<times.size(); i++) {
+    // See if hash already exists in disk cache
+    const QByteArray& hash = hashes.at(i);
+    const rational& time = times.at(i);
+
+    // Check memory list since disk checking is slow
+    bool hash_exists = (std::find(existing_hashes.begin(), existing_hashes.end(), hash) != existing_hashes.end());
+
+    if (!hash_exists) {
+      hash_exists = QFileInfo::exists(cache->CachePathName(hash));
+
+      if (hash_exists) {
+        existing_hashes.push_back(hash);
+      }
+    }
+
+    cache->SetHash(time, hash, job_time, hash_exists);
+  }
+}
+
+void RenderBackend::AutoCacheHashesGenerated()
+{
+  RenderTicketWatcher* watcher = static_cast<RenderTicketWatcher*>(sender());
+
+  if (autocache_hash_tasks_.contains(watcher)) {
+    if (!watcher->WasCancelled()) {
+      const HashJobInfo& info = autocache_hash_tasks_.value(watcher);
+
+      QFutureWatcher<void>* hw = new QFutureWatcher<void>();
+      connect(hw, &QFutureWatcher<void>::finished, this, &RenderBackend::AutoCacheHashesProcessed);
+      autocache_hash_process_tasks_.append(hw);
+      hw->setFuture(QtConcurrent::run(this,
+                                      &RenderBackend::SetHashes,
+                                      viewer_node_->video_frame_cache(),
+                                      info.times,
+                                      watcher->Get().value<QVector<QByteArray> >(),
+                                      info.job_time));
+    }
+
+    autocache_hash_tasks_.remove(watcher);
+  }
+
+  delete watcher;
+}
+
+void RenderBackend::AutoCacheHashesProcessed()
+{
+  QFutureWatcher<void>* watcher = static_cast<QFutureWatcher<void>*>(sender());
+
+  if (autocache_hash_process_tasks_.contains(watcher)) {
+    autocache_hash_process_tasks_.removeOne(watcher);
+
+    AutoCacheRequeueFrames();
+  }
+
+  delete watcher;
+}
+
+void RenderBackend::AutoCacheAudioRendered()
+{
+  RenderTicketWatcher* watcher = static_cast<RenderTicketWatcher*>(sender());
+
+  if (autocache_audio_tasks_.contains(watcher)) {
+    if (!watcher->WasCancelled()) {
+      const AudioJobInfo& job_info = autocache_audio_tasks_.value(watcher);
+
+      viewer_node_->audio_playback_cache()->WritePCM(job_info.range,
+                                                     watcher->Get().value<SampleBufferPtr>(),
+                                                     job_info.job_time);
+    }
+
+    autocache_audio_tasks_.remove(watcher);
+  }
+
+  delete watcher;
+}
+
+void RenderBackend::AutoCacheVideoRendered()
+{
+  RenderTicketWatcher* watcher = static_cast<RenderTicketWatcher*>(sender());
+
+  if (autocache_video_tasks_.contains(watcher)) {
+    if (!watcher->WasCancelled()) {
+      const VideoJobInfo& info = autocache_video_tasks_.value(watcher);
+
+      // Download frame in another thread
+      QFutureWatcher<bool>* w = new QFutureWatcher<bool>();
+      autocache_video_download_tasks_.insert(w, info);
+      connect(w, &QFutureWatcher<bool>::finished, this, &RenderBackend::AutoCacheVideoDownloaded);
+      w->setFuture(QtConcurrent::run(FrameHashCache::SaveCacheFrame,
+                                     info.hash,
+                                     watcher->Get().value<FramePtr>()));
+    }
+
+    autocache_video_tasks_.remove(watcher);
+  }
+
+  delete watcher;
+}
+
+void RenderBackend::AutoCacheVideoDownloaded()
+{
+  QFutureWatcher<bool>* watcher = static_cast<QFutureWatcher<bool>*>(sender());
+
+  if (autocache_video_download_tasks_.contains(watcher)) {
+    if (!watcher->isCanceled()) {
+      if (watcher->result()) {
+        const VideoJobInfo& info = autocache_video_download_tasks_.value(watcher);
+
+        currently_caching_hashes_.removeOne(info.hash);
+
+        viewer_node_->video_frame_cache()->ValidateFramesWithHash(info.hash);
+      } else {
+        qCritical() << "Failed to download video frame";
+      }
+    }
+
+    autocache_video_download_tasks_.remove(watcher);
+  }
+
+  delete watcher;
+}
+
 //#define PRINT_UPDATE_QUEUE_INFO
 void RenderBackend::ProcessUpdateQueue()
 {
@@ -482,4 +730,76 @@ void RenderBackend::CopyNodeMakeConnection(NodeInput* src_input, NodeInput* dst_
   }
 }
 
+void RenderBackend::ClearQueueOfType(RenderTicket::Type type)
+{
+  std::list<RenderTicketPtr>::iterator i = render_queue_.begin();
+
+  while (i != render_queue_.end()) {
+    if ((*i)->GetType() == type) {
+      (*i)->Cancel();
+      i = render_queue_.erase(i);
+    } else {
+      i++;
+    }
+  }
+}
+
+void RenderBackend::SetActiveInstance()
+{
+  QMutexLocker locker(&instance_lock_);
+
+  if (active_instance_ != this) {
+    // Signal active instance to stop
+    QMetaObject::invokeMethod(active_instance_, "ClearVideoQueue", Qt::QueuedConnection);
+
+    active_instance_ = this;
+  }
+}
+
+void RenderBackend::AutoCacheRequeueFrames()
+{
+  if (viewer_node_
+      && viewer_node_->video_frame_cache()->HasInvalidatedRanges()
+      && autocache_hash_tasks_.isEmpty()
+      && autocache_hash_process_tasks_.isEmpty()
+      && autocache_has_changed_
+      && (!autocache_paused_ || use_custom_autocache_range_)) {
+    TimeRange using_range;
+
+    if (use_custom_autocache_range_) {
+      using_range = custom_autocache_range_;
+      use_custom_autocache_range_ = false;
+    } else {
+      using_range = autocache_range_;
+    }
+
+    QVector<rational> invalidated_ranges = viewer_node_->video_frame_cache()->GetInvalidatedFrames(using_range);
+
+    ClearVideoQueue();
+
+    // QMaps are automatically sorted by time which is always best for rendering
+    QList<QByteArray> queued_hashes;
+
+    foreach (const rational& t, invalidated_ranges) {
+      const QByteArray& hash = viewer_node_->video_frame_cache()->GetHash(t);
+
+      if (t >= using_range.in()
+          && t < using_range.out()
+          && !queued_hashes.contains(hash)
+          && !currently_caching_hashes_.contains(hash)) {
+        // Don't render any hash more than once
+        queued_hashes.append(hash);
+
+        RenderTicketWatcher* watcher = new RenderTicketWatcher();
+        connect(watcher, &RenderTicketWatcher::Finished, this, &RenderBackend::AutoCacheVideoRendered);
+        autocache_video_tasks_.insert(watcher, {hash, QDateTime::currentMSecsSinceEpoch()});
+
+        watcher->SetTicket(RenderFrame(t, false, hash));
+      }
+    }
+
+    autocache_has_changed_ = false;
+  }
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/backend/renderbackend.h b/app/render/backend/renderbackend.h
index 19ab3948f..1f0b5879d 100644
--- a/app/render/backend/renderbackend.h
+++ b/app/render/backend/renderbackend.h
@@ -23,12 +23,14 @@
 
 #include <QtConcurrent/QtConcurrent>
 
+#include "config/config.h"
 #include "dialog/rendercancel/rendercancel.h"
 #include "decodercache.h"
 #include "node/graph.h"
 #include "node/output/viewer/viewer.h"
 #include "render/backend/colorprocessorcache.h"
 #include "renderticket.h"
+#include "renderticketwatcher.h"
 #include "renderworker.h"
 
 OLIVE_NAMESPACE_ENTER
@@ -50,9 +52,42 @@ public:
 
   void SetViewerNode(ViewerOutput* viewer_node);
 
-  void SetUpdateWithGraph(bool e)
+  void SetAutoCacheEnabled(bool e)
   {
-    update_with_graph_ = e;
+    autocache_enabled_ = e;
+  }
+
+  bool IsAutoCachePaused() const
+  {
+    return autocache_paused_;
+  }
+
+  void SetAutoCachePaused(bool paused)
+  {
+    autocache_paused_ = paused;
+
+    if (autocache_paused_) {
+      // Pause the autocache
+      ClearVideoQueue();
+    } else {
+      // Unpause the cache
+      AutoCacheRequeueFrames();
+    }
+  }
+
+  void AutoCacheRange(const TimeRange& range);
+
+  void AutoCacheRequeueFrames();
+
+  void SetAutoCachePlayhead(const rational& playhead)
+  {
+    autocache_range_ = TimeRange(playhead - Config::Current()["DiskCacheBehind"].value<rational>(),
+                                 playhead + Config::Current()["DiskCacheAhead"].value<rational>());
+
+    autocache_has_changed_ = true;
+    use_custom_autocache_range_ = false;
+
+    AutoCacheRequeueFrames();
   }
 
   void SetRenderMode(RenderMode::Mode e)
@@ -65,24 +100,22 @@ public:
     preview_job_time_ = job_time;
   }
 
-  void ClearVideoQueue();
-
   void ProcessUpdateQueue();
 
   /**
    * @brief Asynchronously generate a hash at a given time
    */
-  RenderTicketPtr Hash(const QVector<rational> &times);
+  RenderTicketPtr Hash(const QVector<rational> &times, bool prioritize = false);
 
   /**
    * @brief Asynchronously generate a frame at a given time
    */
-  RenderTicketPtr RenderFrame(const rational& time);
+  RenderTicketPtr RenderFrame(const rational& time, bool prioritize = false, const QByteArray& hash = QByteArray());
 
   /**
    * @brief Asynchronously generate a chunk of audio
    */
-  RenderTicketPtr RenderAudio(const TimeRange& r);
+  RenderTicketPtr RenderAudio(const TimeRange& r, bool prioritize = false);
 
   const VideoParams& GetVideoParams() const
   {
@@ -105,6 +138,14 @@ public:
 public slots:
   void NodeGraphChanged(NodeInput *source);
 
+  void ClearVideoQueue();
+
+  void ClearAudioQueue();
+
+  void ClearQueue();
+
+signals:
+
 protected:
   virtual RenderWorker* CreateNewWorker() = 0;
 
@@ -113,6 +154,10 @@ private:
   Node *CopyNodeConnections(Node *src_node);
   void CopyNodeMakeConnection(NodeInput *src_input, NodeInput *dst_input);
 
+  void ClearQueueOfType(RenderTicket::Type type);
+
+  void SetHashes(FrameHashCache* cache, const QVector<rational>& times, const QVector<QByteArray>& hashes, qint64 job_time);
+
   ViewerOutput* viewer_node_;
 
   // VIDEO MEMBERS
@@ -126,10 +171,10 @@ private:
   QHash<Node*, Node*> copy_map_;
   ViewerOutput* copied_viewer_node_;
 
-  QThreadPool pool_;
-
   std::list<RenderTicketPtr> render_queue_;
 
+  std::list<RenderTicketPtr> running_tickets_;
+
   struct WorkerData {
     RenderWorker* worker;
     bool busy;
@@ -137,17 +182,74 @@ private:
 
   QVector<WorkerData> workers_;
 
-  bool update_with_graph_;
+  bool autocache_enabled_;
+  bool autocache_paused_;
 
   qint64 preview_job_time_;
 
   RenderMode::Mode render_mode_;
 
+  TimeRange autocache_range_;
+
+  bool autocache_has_changed_;
+
+  bool use_custom_autocache_range_;
+  TimeRange custom_autocache_range_;
+
+  static QVector<RenderBackend*> instances_;
+  static QMutex instance_lock_;
+  static RenderBackend* active_instance_;
+  static QThreadPool thread_pool_;
+  void SetActiveInstance();
+
+  struct HashJobInfo {
+    QVector<rational> times;
+    qint64 job_time;
+  };
+
+  struct AudioJobInfo {
+    TimeRange range;
+    qint64 job_time;
+  };
+
+  struct VideoJobInfo {
+    QByteArray hash;
+    qint64 job_time;
+  };
+
+  QMap<RenderTicketWatcher*, HashJobInfo> autocache_hash_tasks_;
+
+  QList<QFutureWatcher<void>*> autocache_hash_process_tasks_;
+
+  QMap<RenderTicketWatcher*, AudioJobInfo> autocache_audio_tasks_;
+
+  QMap<RenderTicketWatcher*, VideoJobInfo> autocache_video_tasks_;
+
+  QMap<QFutureWatcher<bool>*, VideoJobInfo> autocache_video_download_tasks_;
+
+  QVector<QByteArray> currently_caching_hashes_;
+
 private slots:
   void WorkerFinished();
 
   void RunNextJob();
 
+  void TicketFinished();
+
+  void AutoCacheVideoInvalidated(const OLIVE_NAMESPACE::TimeRange &range);
+
+  void AutoCacheAudioInvalidated(const OLIVE_NAMESPACE::TimeRange &range);
+
+  void AutoCacheHashesGenerated();
+
+  void AutoCacheHashesProcessed();
+
+  void AutoCacheAudioRendered();
+
+  void AutoCacheVideoRendered();
+
+  void AutoCacheVideoDownloaded();
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/backend/renderticketwatcher.h b/app/render/backend/renderticketwatcher.h
index e25c488fc..fba301a3b 100644
--- a/app/render/backend/renderticketwatcher.h
+++ b/app/render/backend/renderticketwatcher.h
@@ -31,6 +31,11 @@ class RenderTicketWatcher : public QObject
 public:
   RenderTicketWatcher(QObject* parent = nullptr);
 
+  RenderTicketPtr GetTicket() const
+  {
+    return ticket_;
+  }
+
   void SetTicket(RenderTicketPtr ticket);
 
   bool WasCancelled();
diff --git a/app/render/framehashcache.cpp b/app/render/framehashcache.cpp
index 34437fe9b..d215b6680 100644
--- a/app/render/framehashcache.cpp
+++ b/app/render/framehashcache.cpp
@@ -41,7 +41,7 @@ QByteArray FrameHashCache::GetHash(const rational &time)
   return time_hash_map_.value(time);
 }
 
-void FrameHashCache::SetHash(const rational &time, const QByteArray &hash, const qint64& job_time)
+void FrameHashCache::SetHash(const rational &time, const QByteArray &hash, const qint64& job_time, bool frame_exists)
 {
   QMutexLocker locker(lock());
 
@@ -63,13 +63,17 @@ void FrameHashCache::SetHash(const rational &time, const QByteArray &hash, const
 
   time_hash_map_.insert(time, hash);
 
-  TimeRange validated_range(time, time + timebase_);
-
-  NoLockValidate(validated_range);
+  TimeRange validated_range;
+  if (frame_exists) {
+    validated_range = TimeRange(time, time + timebase_);
+    NoLockValidate(validated_range);
+  }
 
   locker.unlock();
 
-  emit Validated(validated_range);
+  if (frame_exists) {
+    emit Validated(validated_range);
+  }
 }
 
 void FrameHashCache::SetTimebase(const rational &tb)
@@ -79,6 +83,33 @@ void FrameHashCache::SetTimebase(const rational &tb)
   timebase_ = tb;
 }
 
+void FrameHashCache::ValidateFramesWithHash(const QByteArray &hash)
+{
+  QMutexLocker locker(lock());
+
+  QMap<rational, QByteArray>::const_iterator iterator;
+
+  const TimeRangeList& invalidated_ranges = NoLockGetInvalidatedRanges();
+  TimeRangeList ranges_validated;
+
+  for (iterator=time_hash_map_.begin();iterator!=time_hash_map_.end();iterator++) {
+    if (iterator.value() == hash) {
+      TimeRange frame_range(iterator.key(), iterator.key() + timebase_);
+
+      if (invalidated_ranges.ContainsTimeRange(frame_range)) {
+        NoLockValidate(frame_range);
+        ranges_validated.InsertTimeRange(frame_range);
+      }
+    }
+  }
+
+  locker.unlock();
+
+  foreach (const TimeRange& range, ranges_validated) {
+    emit Validated(range);
+  }
+}
+
 QList<rational> FrameHashCache::GetFramesWithHash(const QByteArray &hash)
 {
   QMutexLocker locker(lock());
@@ -175,10 +206,17 @@ QVector<rational> FrameHashCache::GetInvalidatedFrames()
 {
   QMutexLocker locker(lock());
 
-  return GetFrameListFromTimeRange(NoLockGetInvalidatedRanges());
+  return GetFrameListFromTimeRange(NoLockGetInvalidatedRanges(), timebase_);
 }
 
-void FrameHashCache::SaveCacheFrame(const QByteArray& hash,
+QVector<rational> FrameHashCache::GetInvalidatedFrames(const TimeRange &intersecting)
+{
+  QMutexLocker locker(lock());
+
+  return GetFrameListFromTimeRange(NoLockGetInvalidatedRanges().Intersects(intersecting), timebase_);
+}
+
+bool FrameHashCache::SaveCacheFrame(const QByteArray& hash,
                                     char* data,
                                     const VideoParams& vparam,
                                     int linesize_bytes)
@@ -188,15 +226,20 @@ void FrameHashCache::SaveCacheFrame(const QByteArray& hash,
   if (SaveCacheFrame(fn, data, vparam, linesize_bytes)) {
     // Register frame with the disk manager
     DiskManager::instance()->CreatedFile(fn, hash);
+
+    return true;
+  } else {
+    return false;
   }
 }
 
-void FrameHashCache::SaveCacheFrame(const QByteArray &hash, FramePtr frame)
+bool FrameHashCache::SaveCacheFrame(const QByteArray &hash, FramePtr frame)
 {
   if (frame) {
-    SaveCacheFrame(hash, frame->data(), frame->video_params(), frame->linesize_bytes());
+    return SaveCacheFrame(hash, frame->data(), frame->video_params(), frame->linesize_bytes());
   } else {
     qWarning() << "Attempted to save a NULL frame to the cache. This may or may not be desirable.";
+    return false;
   }
 }
 
diff --git a/app/render/framehashcache.h b/app/render/framehashcache.h
index 96878059e..ca320b029 100644
--- a/app/render/framehashcache.h
+++ b/app/render/framehashcache.h
@@ -44,6 +44,8 @@ public:
 
   void SetTimebase(const rational& tb);
 
+  void ValidateFramesWithHash(const QByteArray& hash);
+
   /**
    * @brief Returns a list of frames that use a particular hash
    */
@@ -62,8 +64,8 @@ public:
   static QString CachePathName(const QByteArray &hash);
 
   static bool SaveCacheFrame(const QString& filename, char *data, const VideoParams &vparam, int linesize_bytes);
-  static void SaveCacheFrame(const QByteArray& hash, char *data, const VideoParams &vparam, int linesize_bytes);
-  static void SaveCacheFrame(const QByteArray& hash, FramePtr frame);
+  static bool SaveCacheFrame(const QByteArray& hash, char *data, const VideoParams &vparam, int linesize_bytes);
+  static bool SaveCacheFrame(const QByteArray& hash, FramePtr frame);
   static FramePtr LoadCacheFrame(const QByteArray& hash);
   static FramePtr LoadCacheFrame(const QString& fn);
 
@@ -72,9 +74,10 @@ public:
   static QVector<rational> GetFrameListFromTimeRange(TimeRangeList range_list, const rational& timebase);
   QVector<rational> GetFrameListFromTimeRange(const TimeRangeList &range);
   QVector<rational> GetInvalidatedFrames();
+  QVector<rational> GetInvalidatedFrames(const TimeRange& intersecting);
 
 public slots:
-  void SetHash(const OLIVE_NAMESPACE::rational& time, const QByteArray& hash, const qint64 &job_time);
+  void SetHash(const OLIVE_NAMESPACE::rational& time, const QByteArray& hash, const qint64 &job_time, bool frame_exists);
 
 protected:
   virtual void LengthChangedEvent(const rational& old, const rational& newlen) override;
diff --git a/app/task/cache/cache.cpp b/app/task/cache/cache.cpp
index bae2f6ab9..0b8d60279 100644
--- a/app/task/cache/cache.cpp
+++ b/app/task/cache/cache.cpp
@@ -72,7 +72,7 @@ QFuture<void> CacheTask::DownloadFrame(FramePtr frame, const QByteArray &hash)
 void CacheTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times)
 {
   foreach (const rational& t, times) {
-    viewer()->video_frame_cache()->SetHash(t, hash, job_time());
+    viewer()->video_frame_cache()->SetHash(t, hash, job_time(), true);
   }
 }
 
diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp
index 1b93fe61e..5d81a8643 100644
--- a/app/task/render/render.cpp
+++ b/app/task/render/render.cpp
@@ -189,10 +189,12 @@ void RenderTask::Render(const TimeRangeList& video_range,
 
     while (!IsCancelled() && i != render_lookup_table.end()) {
       if (i->frame_future->IsFinished()) {
-        FramePtr f = i->frame_future->Get().value<FramePtr>();
+        if (!i->frame_future->WasCancelled()) {
+          FramePtr f = i->frame_future->Get().value<FramePtr>();
 
-        // Start multithreaded download here
-        download_futures.push_back({i->hash, DownloadFrame(f, i->hash)});
+          // Start multithreaded download here
+          download_futures.push_back({i->hash, DownloadFrame(f, i->hash)});
+        }
 
         i = render_lookup_table.erase(i);
       } else {
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 40bf5379a..82d70cc15 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -44,12 +44,10 @@
 
 OLIVE_NAMESPACE_ENTER
 
+QVector<ViewerWidget*> ViewerWidget::instances_;
+
 const int kMaxPreQueueSize = 16;
 
-CacheTask* ViewerWidget::cache_background_task_ = nullptr;
-
-int ViewerWidget::busy_viewers_ = 0;
-
 ViewerWidget::ViewerWidget(QWidget *parent) :
   TimeBasedWidget(false, true, parent),
   playback_speed_(0),
@@ -57,10 +55,8 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
   color_menu_enabled_(true),
   override_color_manager_(nullptr),
   time_changed_from_timer_(false),
-  prequeuing_(false),
-  busy_(false),
-  our_cache_background_task_(nullptr),
-  autocache_(true)
+  pause_autocache_during_playback_(true),
+  prequeuing_(false)
 {
   // Set up main layout
   QVBoxLayout* layout = new QVBoxLayout(this);
@@ -112,26 +108,20 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
 
   // Start background renderer
   renderer_ = new OpenGLBackend(this);
-  renderer_->SetUpdateWithGraph(true);
+  renderer_->SetAutoCacheEnabled(true);
   renderer_->SetRenderMode(RenderMode::kOffline);
 
-  // Setup cache wait timer (waits a few seconds of inactivity before caching)
-  cache_wait_timer_.setInterval(Config::Current()["AutoCacheInterval"].toInt());
-  cache_wait_timer_.setSingleShot(true);
-  connect(&cache_wait_timer_, &QTimer::timeout, this, &ViewerWidget::StartBackgroundCaching);
-
-  // Remove pointer to cache task if it's removed from the task manager
-  connect(TaskManager::instance(), &TaskManager::TaskRemoved, this, &ViewerWidget::BackgroundCacheFinished);
-
   // Ensures that seeking on the waveform view updates the time as expected
   connect(waveform_view_, &AudioWaveformView::TimeChanged, this, &ViewerWidget::SetTimeAndSignal);
 
   // Ensures renderer is updated if the global pixel format is changed
-  connect(PixelFormat::instance(), &PixelFormat::FormatChanged, this, &ViewerWidget::UpdateRendererParameters);
+  connect(PixelFormat::instance(), &PixelFormat::FormatChanged, this, &ViewerWidget::UpdateRendererVideoParameters);
 
   connect(&playback_backup_timer_, &QTimer::timeout, this, &ViewerWidget::PlaybackTimerUpdate);
 
   SetAutoMaxScrollBar(true);
+
+  instances_.append(this);
 }
 
 ViewerWidget::~ViewerWidget()
@@ -161,6 +151,10 @@ void ViewerWidget::TimeChangedEvent(const int64_t &i)
       PushScrubbedAudio();
     }
 
+    if (!pause_autocache_during_playback_ || !IsPlaying()) {
+      renderer_->SetAutoCachePlayhead(time_set);
+    }
+
     display_widget_->SetTime(time_set);
   }
 
@@ -171,10 +165,10 @@ void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
 {
   connect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SizeChangedSlot);
   connect(n, &ViewerOutput::LengthChanged, this, &ViewerWidget::LengthChangedSlot);
-  connect(n, &ViewerOutput::ParamsChanged, this, &ViewerWidget::UpdateRendererParameters);
+  connect(n, &ViewerOutput::VideoParamsChanged, this, &ViewerWidget::UpdateRendererVideoParameters);
+  connect(n, &ViewerOutput::AudioParamsChanged, this, &ViewerWidget::UpdateRendererAudioParameters);
   connect(n->video_frame_cache(), &FrameHashCache::Invalidated, this, &ViewerWidget::ViewerInvalidatedVideoRange);
   connect(n->video_frame_cache(), &FrameHashCache::Shifted, this, &ViewerWidget::ViewerShiftedRange);
-  connect(n->audio_playback_cache(), &FrameHashCache::Invalidated, this, &ViewerWidget::ViewerInvalidatedRange);
   connect(n, &ViewerOutput::GraphChangedFrom, this, &ViewerWidget::UpdateStack);
 
   ruler()->SetPlaybackCache(n->video_frame_cache());
@@ -207,7 +201,8 @@ void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
     waveform_view_->ConnectTimelinePoints(GetConnectedTimelinePoints());
   }
 
-  UpdateRendererParameters();
+  UpdateRendererVideoParameters();
+  UpdateRendererAudioParameters();
 
   // Set texture to new texture (or null if no viewer node is available)
   ForceUpdate();
@@ -217,18 +212,12 @@ void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
 {
   PauseInternal();
 
-  if (cache_background_task_ == our_cache_background_task_) {
-    StopAllBackgroundCacheTasks(true);
-    cache_background_task_ = nullptr;
-  }
-  cache_wait_timer_.stop();
-
   disconnect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SizeChangedSlot);
   disconnect(n, &ViewerOutput::LengthChanged, this, &ViewerWidget::LengthChangedSlot);
-  disconnect(n, &ViewerOutput::ParamsChanged, this, &ViewerWidget::UpdateRendererParameters);
+  disconnect(n, &ViewerOutput::VideoParamsChanged, this, &ViewerWidget::UpdateRendererVideoParameters);
+  disconnect(n, &ViewerOutput::AudioParamsChanged, this, &ViewerWidget::UpdateRendererAudioParameters);
   disconnect(n->video_frame_cache(), &FrameHashCache::Invalidated, this, &ViewerWidget::ViewerInvalidatedVideoRange);
   disconnect(n->video_frame_cache(), &FrameHashCache::Shifted, this, &ViewerWidget::ViewerShiftedRange);
-  disconnect(n->audio_playback_cache(), &FrameHashCache::Invalidated, this, &ViewerWidget::ViewerInvalidatedRange);
   disconnect(n, &ViewerOutput::GraphChangedFrom, this, &ViewerWidget::UpdateStack);
 
   ruler()->SetPlaybackCache(nullptr);
@@ -261,23 +250,9 @@ void ViewerWidget::resizeEvent(QResizeEvent *event)
 {
   TimeBasedWidget::resizeEvent(event);
 
-  /*
-  int new_div = CalculateDivider();
-  if (new_div != divider_) {
-    divider_ = new_div;
-
-    UpdateRendererParameters();
-  }
-  */
-
   UpdateMinimumScale();
 }
 
-ViewerDisplayWidget *ViewerWidget::display_widget() const
-{
-  return display_widget_;
-}
-
 void ViewerWidget::TogglePlayPause()
 {
   if (IsPlaying()) {
@@ -359,13 +334,23 @@ void ViewerWidget::ForceUpdate()
 
 void ViewerWidget::SetAutoCacheEnabled(bool e)
 {
-  autocache_ = e;
+  renderer_->SetAutoCachePaused(!e);
+}
 
-  if (autocache_) {
-    StartBackgroundCaching();
-  } else if (cache_background_task_ == our_cache_background_task_) {
-    StopAllBackgroundCacheTasks(false);
-    cache_background_task_ = nullptr;
+void ViewerWidget::CacheEntireSequence()
+{
+  renderer_->AutoCacheRange(TimeRange(rational(), GetConnectedNode()->video_frame_cache()->GetLength()));
+}
+
+void ViewerWidget::CacheSequenceInOut()
+{
+  if (GetConnectedTimelinePoints() && GetConnectedTimelinePoints()->workarea()->enabled()) {
+    renderer_->AutoCacheRange(GetConnectedTimelinePoints()->workarea()->range());
+  } else {
+    QMessageBox::warning(this,
+                         tr("Error"),
+                         tr("No in or out points are set to cache."),
+                         QMessageBox::Ok);
   }
 }
 
@@ -375,23 +360,6 @@ void ViewerWidget::SetGizmos(Node *node)
   display_widget_->SetGizmos(node);
 }
 
-void ViewerWidget::StopAllBackgroundCacheTasks(bool wait)
-{
-  if (cache_background_task_) {
-    if (wait) {
-      TaskManager::instance()->CancelTaskAndWait(cache_background_task_);
-    } else {
-      cache_background_task_->Cancel();
-    }
-    cache_background_task_ = nullptr;
-  }
-}
-
-void ViewerWidget::SetBackgroundCacheTask(CacheTask *t)
-{
-  cache_background_task_ = t;
-}
-
 FramePtr DecodeCachedImage(const QString &fn, const rational& time)
 {
   FramePtr frame = FrameHashCache::LoadCacheFrame(fn);
@@ -497,14 +465,13 @@ void ViewerWidget::PlayInternal(int speed, bool in_to_out_only)
     }
   }
 
-  if (!busy_) {
-    busy_ = true;
-    busy_viewers_++;
+  // Kindly tell all viewers to stop caching
+  if (pause_autocache_during_playback_) {
+    foreach (ViewerWidget* viewer, instances_) {
+      viewer->renderer_->ClearVideoQueue();
+    }
   }
 
-  StopAllBackgroundCacheTasks(false);
-  cache_wait_timer_.stop();
-
   if (!prequeuing_) {
     FinishPlayPreprocess();
   }
@@ -554,20 +521,6 @@ void ViewerWidget::PushScrubbedAudio()
   }
 }
 
-/*
-int ViewerWidget::CalculateDivider()
-{
-  if (GetConnectedNode() && Config::Current()["AutoSelectDivider"].toBool()) {
-    int long_side_of_video = qMax(GetConnectedNode()->video_params().width(), GetConnectedNode()->video_params().height());
-    int long_side_of_widget = qMax(display_widget_->width(), display_widget_->height());
-
-    return qMax(1, int(qPow(2, qFloor(log2(double(long_side_of_video) / double(long_side_of_widget))))));
-  }
-
-  return divider_;
-}
-*/
-
 void ViewerWidget::UpdateMinimumScale()
 {
   if (!GetConnectedNode()) {
@@ -638,22 +591,23 @@ PixelFormat::Format ViewerWidget::GetCurrentPixelFormat() const
 RenderTicketPtr ViewerWidget::GetFrame(const rational &t, bool clear_render_queue)
 {
   QByteArray cached_hash = GetConnectedNode()->video_frame_cache()->GetHash(t);
-  if (cached_hash.isEmpty()) {
+
+  QString cache_fn = GetConnectedNode()->video_frame_cache()->CachePathName(cached_hash);
+
+  if (cached_hash.isEmpty() || !QFileInfo::exists(cache_fn)) {
     // Frame hasn't been cached, start render job
     if (clear_render_queue) {
       renderer_->ClearVideoQueue();
     }
 
-    return renderer_->RenderFrame(t);
+    return renderer_->RenderFrame(t, true);
   } else {
     // Frame has been cached, grab the frame
-    QString cache_fn = GetConnectedNode()->video_frame_cache()->CachePathName(cached_hash);
-
     RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeVideo,
                                                             QVariant::fromValue(t));
     QtConcurrent::run(DecodeCachedImage, ticket, cache_fn, t);
-    return ticket;
 
+    return ticket;
   }
 }
 
@@ -785,7 +739,7 @@ void ViewerWidget::RendererGeneratedFrame()
     }
   }
 
-  ticket->deleteLater();
+  delete ticket;
 }
 
 void ViewerWidget::RendererGeneratedFrameForQueue()
@@ -810,73 +764,7 @@ void ViewerWidget::RendererGeneratedFrameForQueue()
     }
   }
 
-  watcher->deleteLater();
-}
-
-//#define PRINT_INVALID_RANGES
-void ViewerWidget::StartBackgroundCaching()
-{
-  if (busy_) {
-    busy_viewers_--;
-    busy_ = false;
-  }
-
-#ifdef PRINT_INVALID_RANGES
-  if (GetConnectedNode()->video_frame_cache()->HasInvalidatedRanges()) {
-    qDebug() << "Video invalid:";
-    foreach (const TimeRange& r, GetConnectedNode()->video_frame_cache()->GetInvalidatedRanges()) {
-      qDebug() << "  " << r;
-    }
-  }
-
-  if (GetConnectedNode()->audio_playback_cache()->HasInvalidatedRanges()) {
-    qDebug() << "Audio invalid:";
-    foreach (const TimeRange& r, GetConnectedNode()->audio_playback_cache()->GetInvalidatedRanges()) {
-      qDebug() << "  " << r;
-    }
-  }
-#endif
-
-  if (autocache_
-      && GetConnectedNode()
-      && (GetConnectedNode()->video_frame_cache()->HasInvalidatedRanges()
-          || GetConnectedNode()->audio_playback_cache()->HasInvalidatedRanges())) {
-    if (cache_background_task_ || busy_viewers_) {
-
-      // Something else is caching right now, we don't want to do multiple at once so we'll check
-      // again in our next interval
-      cache_wait_timer_.start();
-
-    } else {
-      cache_background_task_ = new CacheTask(renderer_, false);
-
-      our_cache_background_task_ = cache_background_task_;
-
-      TaskManager::instance()->AddTask(cache_background_task_);
-    }
-  }
-}
-
-void ViewerWidget::BackgroundCacheFinished(Task* t)
-{
-  if (cache_background_task_ == t) {
-    cache_background_task_ = nullptr;
-  }
-}
-
-void ViewerWidget::UpdateRendererParameters()
-{
-  if (cache_background_task_ == our_cache_background_task_) {
-    StopAllBackgroundCacheTasks(false);
-  }
-
-  GetConnectedNode()->video_frame_cache()->InvalidateAll();
-  GetConnectedNode()->audio_playback_cache()->InvalidateAll();
-
-  renderer_->SetVideoParams(GetConnectedNode()->video_params());
-  renderer_->SetAudioParams(GetConnectedNode()->audio_params());
-
-  display_widget_->SetVideoParams(GetConnectedNode()->video_params());
+  delete watcher;
 }
 
 void ViewerWidget::ShowContextMenu(const QPoint &pos)
@@ -955,11 +843,34 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
   menu.addSeparator();
 
   {
+    Menu* cache_menu = new Menu(tr("Cache"), &menu);
+    menu.addMenu(cache_menu);
+
     // Auto-cache
-    QAction* autocache_action = menu.addAction(tr("Auto-Cache"));
+    QAction* autocache_action = cache_menu->addAction(tr("Auto-Cache"));
     autocache_action->setCheckable(true);
-    autocache_action->setChecked(autocache_);
+    autocache_action->setChecked(!renderer_->IsAutoCachePaused());
     connect(autocache_action, &QAction::triggered, this, &ViewerWidget::SetAutoCacheEnabled);
+
+    cache_menu->addSeparator();
+
+    // Stop auto-cache while playing
+    QAction* pause_autocache_while_playing = cache_menu->addAction(tr("Pause Auto-Cache During Playback"));
+    pause_autocache_while_playing->setCheckable(true);
+    pause_autocache_while_playing->setChecked(pause_autocache_during_playback_);
+    connect(pause_autocache_while_playing, &QAction::triggered, this, [this](bool e){
+      pause_autocache_during_playback_ = e;
+    });
+
+    cache_menu->addSeparator();
+
+    // Cache Entire Sequence
+    QAction* cache_entire_sequence = cache_menu->addAction(tr("Cache Entire Sequence"));
+    connect(cache_entire_sequence, &QAction::triggered, this, &ViewerWidget::CacheEntireSequence);
+
+    // Cache In/Out Sequence
+    QAction* cache_inout_sequence = cache_menu->addAction(tr("Cache Sequence In/Out"));
+    connect(cache_inout_sequence, &QAction::triggered, this, &ViewerWidget::CacheSequenceInOut);
   }
 
   menu.addSeparator();
@@ -992,7 +903,7 @@ void ViewerWidget::Play(bool in_to_out_only)
 {
   if (in_to_out_only) {
     if (GetConnectedTimelinePoints()
-      && GetConnectedTimelinePoints()->workarea()->enabled()) {
+        && GetConnectedTimelinePoints()->workarea()->enabled()) {
       // Jump to in point
       SetTimeAndSignal(Timecode::time_to_timestamp(GetConnectedTimelinePoints()->workarea()->in(), timebase()));
     } else {
@@ -1012,7 +923,7 @@ void ViewerWidget::Pause()
 {
   PauseInternal();
 
-  StartBackgroundCaching();
+  renderer_->SetAutoCachePlayhead(GetTime());
 }
 
 void ViewerWidget::ShuttleLeft()
@@ -1172,6 +1083,26 @@ void ViewerWidget::LengthChangedSlot(const rational &length)
   }
 }
 
+void ViewerWidget::UpdateRendererVideoParameters()
+{
+  renderer_->ClearVideoQueue();
+
+  renderer_->SetVideoParams(GetConnectedNode()->video_params());
+
+  GetConnectedNode()->video_frame_cache()->InvalidateAll();
+
+  display_widget_->SetVideoParams(GetConnectedNode()->video_params());
+}
+
+void ViewerWidget::UpdateRendererAudioParameters()
+{
+  renderer_->ClearAudioQueue();
+
+  renderer_->SetAudioParams(GetConnectedNode()->audio_params());
+
+  GetConnectedNode()->audio_playback_cache()->InvalidateAll();
+}
+
 void ViewerWidget::SetZoomFromMenu(QAction *action)
 {
   sizer_->SetZoom(action->data().toInt());
@@ -1179,22 +1110,10 @@ void ViewerWidget::SetZoomFromMenu(QAction *action)
 
 void ViewerWidget::ViewerInvalidatedVideoRange(const TimeRange &range)
 {
+  // If our current frame is within this range, we need to update
   if (GetTime() >= range.in() && (GetTime() < range.out() || range.in() == range.out())) {
     QMetaObject::invokeMethod(this, "ForceUpdate", Qt::QueuedConnection);
   }
-
-  ViewerInvalidatedRange();
-}
-
-void ViewerWidget::ViewerInvalidatedRange()
-{
-  // Restart the cache wait timer
-  cache_wait_timer_.stop();
-  StopAllBackgroundCacheTasks(false);
-
-  if (!(qApp->mouseButtons() & Qt::LeftButton)) {
-    cache_wait_timer_.start();
-  }
 }
 
 void ViewerWidget::ViewerShiftedRange(const rational &from, const rational &to)
diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h
index 64f892611..a1a45e0fc 100644
--- a/app/widget/viewer/viewer.h
+++ b/app/widget/viewer/viewer.h
@@ -97,9 +97,6 @@ public:
 
   void SetGizmos(Node* node);
 
-  static void StopAllBackgroundCacheTasks(bool wait);
-  static void SetBackgroundCacheTask(CacheTask* t);
-
 public slots:
   void Play(bool in_to_out_only);
 
@@ -124,6 +121,10 @@ public slots:
 
   void SetAutoCacheEnabled(bool e);
 
+  void CacheEntireSequence();
+
+  void CacheSequenceInOut();
+
 signals:
   /**
    * @brief Wrapper for ViewerGLWidget::CursorColor()
@@ -166,7 +167,10 @@ protected:
 
   PlaybackControls* controls_;
 
-  ViewerDisplayWidget* display_widget() const;
+  ViewerDisplayWidget* display_widget() const
+  {
+    return display_widget_;
+  }
 
 private:
   void UpdateTimeInternal(int64_t i);
@@ -179,8 +183,6 @@ private:
 
   void PushScrubbedAudio();
 
-  int CalculateDivider();
-
   void UpdateMinimumScale();
 
   void SetColorTransform(const ColorTransform& transform, ViewerDisplayWidget* sender);
@@ -221,6 +223,8 @@ private:
 
   bool play_in_to_out_only_;
 
+  bool pause_autocache_during_playback_;
+
   AudioWaveformView* waveform_view_;
 
   QList<ViewerWindow*> windows_;
@@ -241,21 +245,11 @@ private:
 
   QList<RenderTicketWatcher*> nonqueue_watchers_;
 
-  QTimer cache_wait_timer_;
-
-  bool busy_;
-
-  CacheTask* our_cache_background_task_;
-
   rational last_length_;
 
   int prequeue_length_;
 
-  bool autocache_;
-
-  static CacheTask* cache_background_task_;
-
-  static int busy_viewers_;
+  static QVector<ViewerWidget*> instances_;
 
 private slots:
   void PlaybackTimerUpdate();
@@ -264,16 +258,14 @@ private slots:
 
   void LengthChangedSlot(const rational& length);
 
-  void UpdateRendererParameters();
+  void UpdateRendererVideoParameters();
+
+  void UpdateRendererAudioParameters();
 
   void ShowContextMenu(const QPoint& pos);
 
   void SetZoomFromMenu(QAction* action);
 
-  void ViewerInvalidatedVideoRange(const OLIVE_NAMESPACE::TimeRange &range);
-
-  void ViewerInvalidatedRange();
-
   void ViewerShiftedRange(const OLIVE_NAMESPACE::rational& from, const OLIVE_NAMESPACE::rational& to);
 
   void UpdateStack();
@@ -294,9 +286,7 @@ private slots:
 
   void RendererGeneratedFrameForQueue();
 
-  void StartBackgroundCaching();
-
-  void BackgroundCacheFinished(Task *t);
+  void ViewerInvalidatedVideoRange(const OLIVE_NAMESPACE::TimeRange &range);
 
 };
 

From 9a4dcd8277da2170683ece2b3025df04829755fe Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 5 Aug 2020 22:31:14 +1000
Subject: [PATCH 090/138] ffmpegdecoder: handle unexpected EOF

---
 app/codec/ffmpeg/ffmpegdecoder.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp
index b0da1d794..36a57003f 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.cpp
+++ b/app/codec/ffmpeg/ffmpegdecoder.cpp
@@ -914,6 +914,7 @@ void FFmpegDecoderInstance::SetWorking(bool working)
 
 void FFmpegDecoderInstance::Seek(int64_t timestamp)
 {
+  qDebug() << "Seeking to" << timestamp;
   avcodec_flush_buffers(codec_ctx_);
   av_seek_frame(fmt_ctx_, avstream_->index, timestamp, AVSEEK_FLAG_BACKWARD);
 }
@@ -1061,7 +1062,11 @@ FFmpegFramePool::ElementPtr FFmpegDecoderInstance::RetrieveFrame(const int64_t&
       // Handle an "expected" EOF by using the last frame of our cache
       cache_at_eof_ = true;
 
-      return_frame = cached_frames_.last();
+      if (cached_frames_.isEmpty()) {
+        qCritical() << "Unexpected codec EOF - unable to retrieve frame";
+      } else {
+        return_frame = cached_frames_.last();
+      }
 
       cache_wait_cond_.wakeAll();
       cache_lock_.unlock();

From 07a53d45f05706b53b2cc49dbfbd236c864d8d07 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 5 Aug 2020 22:32:24 +1000
Subject: [PATCH 091/138] renderer: updated audio waveform generated for new
 cache overhaul

---
 app/core.cpp                         |  1 +
 app/render/backend/renderbackend.cpp | 66 ++++++++++++++-------
 app/render/backend/renderbackend.h   | 31 +++-------
 app/render/backend/renderticket.cpp  |  3 +-
 app/render/backend/renderticket.h    | 15 +++++
 app/render/backend/renderworker.cpp  | 88 +++++++++++-----------------
 app/render/backend/renderworker.h    | 19 ++----
 app/widget/viewer/viewer.cpp         |  1 +
 8 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/app/core.cpp b/app/core.cpp
index 25a0e6d07..1b6b8c74a 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -173,6 +173,7 @@ void Core::DeclareTypesForQt()
   qRegisterMetaType<OLIVE_NAMESPACE::GenerateJob>();
   qRegisterMetaType<OLIVE_NAMESPACE::VideoParams>();
   qRegisterMetaType<OLIVE_NAMESPACE::MainWindowLayoutInfo>();
+  qRegisterMetaType<OLIVE_NAMESPACE::RenderTicketPtr>();
 }
 
 void Core::Start()
diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index 75a609846..19fcb06f7 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -41,7 +41,7 @@ RenderBackend::RenderBackend(QObject *parent) :
   viewer_node_(nullptr),
   autocache_enabled_(false),
   autocache_paused_(false),
-  preview_job_time_(0),
+  generate_audio_previews_(false),
   render_mode_(RenderMode::kOnline),
   autocache_has_changed_(false),
   use_custom_autocache_range_(false)
@@ -374,6 +374,7 @@ void RenderBackend::RunNextJob()
     for (int i=0;i<workers_.size();i++) {
       RenderWorker* worker = CreateNewWorker();
 
+      connect(worker, &RenderWorker::WaveformGenerated, this, &RenderBackend::WorkerGeneratedWaveform);
       connect(worker, &RenderWorker::FinishedJob, this, &RenderBackend::WorkerFinished);
 
       workers_.replace(i, {worker, false});
@@ -393,19 +394,22 @@ void RenderBackend::RunNextJob()
       worker->SetAudioParams(audio_params_);
       worker->SetVideoDownloadMatrix(video_download_matrix_);
       worker->SetRenderMode(render_mode_);
-      if (preview_job_time_) {
-        worker->EnablePreviewGeneration(viewer_node_->audio_playback_cache(), preview_job_time_);
-      }
+      worker->SetPreviewGenerationEnabled(generate_audio_previews_);
       worker->SetCopyMap(&copy_map_);
 
+      // Move ticket from queue to running list
       RenderTicketPtr ticket = render_queue_.front();
       render_queue_.pop_front();
-
       running_tickets_.push_back(ticket);
+
+      // Create watcher to remove from running list
       RenderTicketWatcher* watcher = new RenderTicketWatcher();
       connect(watcher, &RenderTicketWatcher::Finished, this, &RenderBackend::TicketFinished);
       watcher->SetTicket(ticket);
 
+      // Set job time to now
+      ticket->SetJobTime();
+
       switch (ticket->GetType()) {
       case RenderTicket::kTypeHash:
         QtConcurrent::run(&thread_pool_,
@@ -458,6 +462,28 @@ void RenderBackend::TicketFinished()
   running_tickets_.remove(ticket);
 }
 
+void RenderBackend::WorkerGeneratedWaveform(RenderTicketPtr ticket, TrackOutput *track, AudioVisualWaveform samples, TimeRange range)
+{
+  qDebug() << "Hello?";
+
+  QList<TimeRange> valid_ranges = viewer_node_->audio_playback_cache()->GetValidRanges(range,
+                                                                                       ticket->GetJobTime());
+  if (!valid_ranges.isEmpty()) {
+    // Generate visual waveform in this background thread
+    track->waveform_lock()->lock();
+
+    track->waveform().set_channel_count(audio_params_.channel_count());
+
+    foreach (const TimeRange& r, valid_ranges) {
+      track->waveform().OverwriteSums(samples, r.in(), r.in() - range.in(), r.length());
+    }
+
+    track->waveform_lock()->unlock();
+
+    emit track->PreviewChanged();
+  }
+}
+
 void RenderBackend::AutoCacheVideoInvalidated(const TimeRange &range)
 {
   ClearVideoQueue();
@@ -465,7 +491,7 @@ void RenderBackend::AutoCacheVideoInvalidated(const TimeRange &range)
   // Hash these frames since that should be relatively quick.
   RenderTicketWatcher* watcher = new RenderTicketWatcher();
   QVector<rational> frames = viewer_node_->video_frame_cache()->GetFrameListFromTimeRange({range});
-  autocache_hash_tasks_.insert(watcher, {frames, QDateTime::currentMSecsSinceEpoch()});
+  autocache_hash_tasks_.insert(watcher, frames);
   connect(watcher, &RenderTicketWatcher::Finished, this, &RenderBackend::AutoCacheHashesGenerated);
   watcher->SetTicket(Hash(frames));
 }
@@ -474,7 +500,7 @@ void RenderBackend::AutoCacheAudioInvalidated(const TimeRange &range)
 {
   // Start a task to re-render the audio at this range
   RenderTicketWatcher* watcher = new RenderTicketWatcher();
-  autocache_audio_tasks_.insert(watcher, {range, QDateTime::currentMSecsSinceEpoch()});
+  autocache_audio_tasks_.insert(watcher, range);
   connect(watcher, &RenderTicketWatcher::Finished, this, &RenderBackend::AutoCacheAudioRendered);
   watcher->SetTicket(RenderAudio(range, true));
 }
@@ -509,17 +535,15 @@ void RenderBackend::AutoCacheHashesGenerated()
 
   if (autocache_hash_tasks_.contains(watcher)) {
     if (!watcher->WasCancelled()) {
-      const HashJobInfo& info = autocache_hash_tasks_.value(watcher);
-
       QFutureWatcher<void>* hw = new QFutureWatcher<void>();
       connect(hw, &QFutureWatcher<void>::finished, this, &RenderBackend::AutoCacheHashesProcessed);
       autocache_hash_process_tasks_.append(hw);
       hw->setFuture(QtConcurrent::run(this,
                                       &RenderBackend::SetHashes,
                                       viewer_node_->video_frame_cache(),
-                                      info.times,
+                                      autocache_hash_tasks_.value(watcher),
                                       watcher->Get().value<QVector<QByteArray> >(),
-                                      info.job_time));
+                                      watcher->GetTicket()->GetJobTime()));
     }
 
     autocache_hash_tasks_.remove(watcher);
@@ -547,11 +571,9 @@ void RenderBackend::AutoCacheAudioRendered()
 
   if (autocache_audio_tasks_.contains(watcher)) {
     if (!watcher->WasCancelled()) {
-      const AudioJobInfo& job_info = autocache_audio_tasks_.value(watcher);
-
-      viewer_node_->audio_playback_cache()->WritePCM(job_info.range,
+      viewer_node_->audio_playback_cache()->WritePCM(autocache_audio_tasks_.value(watcher),
                                                      watcher->Get().value<SampleBufferPtr>(),
-                                                     job_info.job_time);
+                                                     watcher->GetTicket()->GetJobTime());
     }
 
     autocache_audio_tasks_.remove(watcher);
@@ -566,14 +588,14 @@ void RenderBackend::AutoCacheVideoRendered()
 
   if (autocache_video_tasks_.contains(watcher)) {
     if (!watcher->WasCancelled()) {
-      const VideoJobInfo& info = autocache_video_tasks_.value(watcher);
+      const QByteArray& hash = autocache_video_tasks_.value(watcher);
 
       // Download frame in another thread
       QFutureWatcher<bool>* w = new QFutureWatcher<bool>();
-      autocache_video_download_tasks_.insert(w, info);
+      autocache_video_download_tasks_.insert(w, hash);
       connect(w, &QFutureWatcher<bool>::finished, this, &RenderBackend::AutoCacheVideoDownloaded);
       w->setFuture(QtConcurrent::run(FrameHashCache::SaveCacheFrame,
-                                     info.hash,
+                                     hash,
                                      watcher->Get().value<FramePtr>()));
     }
 
@@ -590,11 +612,11 @@ void RenderBackend::AutoCacheVideoDownloaded()
   if (autocache_video_download_tasks_.contains(watcher)) {
     if (!watcher->isCanceled()) {
       if (watcher->result()) {
-        const VideoJobInfo& info = autocache_video_download_tasks_.value(watcher);
+        const QByteArray& hash = autocache_video_download_tasks_.value(watcher);
 
-        currently_caching_hashes_.removeOne(info.hash);
+        currently_caching_hashes_.removeOne(hash);
 
-        viewer_node_->video_frame_cache()->ValidateFramesWithHash(info.hash);
+        viewer_node_->video_frame_cache()->ValidateFramesWithHash(hash);
       } else {
         qCritical() << "Failed to download video frame";
       }
@@ -792,7 +814,7 @@ void RenderBackend::AutoCacheRequeueFrames()
 
         RenderTicketWatcher* watcher = new RenderTicketWatcher();
         connect(watcher, &RenderTicketWatcher::Finished, this, &RenderBackend::AutoCacheVideoRendered);
-        autocache_video_tasks_.insert(watcher, {hash, QDateTime::currentMSecsSinceEpoch()});
+        autocache_video_tasks_.insert(watcher, hash);
 
         watcher->SetTicket(RenderFrame(t, false, hash));
       }
diff --git a/app/render/backend/renderbackend.h b/app/render/backend/renderbackend.h
index 1f0b5879d..aaaeab98f 100644
--- a/app/render/backend/renderbackend.h
+++ b/app/render/backend/renderbackend.h
@@ -95,9 +95,9 @@ public:
     render_mode_ = e;
   }
 
-  void EnablePreviewGeneration(qint64 job_time)
+  void SetPreviewGenerationEnabled(bool e)
   {
-    preview_job_time_ = job_time;
+    generate_audio_previews_ = e;
   }
 
   void ProcessUpdateQueue();
@@ -185,7 +185,7 @@ private:
   bool autocache_enabled_;
   bool autocache_paused_;
 
-  qint64 preview_job_time_;
+  bool generate_audio_previews_;
 
   RenderMode::Mode render_mode_;
 
@@ -202,30 +202,15 @@ private:
   static QThreadPool thread_pool_;
   void SetActiveInstance();
 
-  struct HashJobInfo {
-    QVector<rational> times;
-    qint64 job_time;
-  };
-
-  struct AudioJobInfo {
-    TimeRange range;
-    qint64 job_time;
-  };
-
-  struct VideoJobInfo {
-    QByteArray hash;
-    qint64 job_time;
-  };
-
-  QMap<RenderTicketWatcher*, HashJobInfo> autocache_hash_tasks_;
+  QMap<RenderTicketWatcher*, QVector<rational> > autocache_hash_tasks_;
 
   QList<QFutureWatcher<void>*> autocache_hash_process_tasks_;
 
-  QMap<RenderTicketWatcher*, AudioJobInfo> autocache_audio_tasks_;
+  QMap<RenderTicketWatcher*, TimeRange> autocache_audio_tasks_;
 
-  QMap<RenderTicketWatcher*, VideoJobInfo> autocache_video_tasks_;
+  QMap<RenderTicketWatcher*, QByteArray> autocache_video_tasks_;
 
-  QMap<QFutureWatcher<bool>*, VideoJobInfo> autocache_video_download_tasks_;
+  QMap<QFutureWatcher<bool>*, QByteArray> autocache_video_download_tasks_;
 
   QVector<QByteArray> currently_caching_hashes_;
 
@@ -236,6 +221,8 @@ private slots:
 
   void TicketFinished();
 
+  void WorkerGeneratedWaveform(OLIVE_NAMESPACE::RenderTicketPtr ticket, OLIVE_NAMESPACE::TrackOutput* track, OLIVE_NAMESPACE::AudioVisualWaveform samples, OLIVE_NAMESPACE::TimeRange range);
+
   void AutoCacheVideoInvalidated(const OLIVE_NAMESPACE::TimeRange &range);
 
   void AutoCacheAudioInvalidated(const OLIVE_NAMESPACE::TimeRange &range);
diff --git a/app/render/backend/renderticket.cpp b/app/render/backend/renderticket.cpp
index 1e719a5f6..027683cd1 100644
--- a/app/render/backend/renderticket.cpp
+++ b/app/render/backend/renderticket.cpp
@@ -26,7 +26,8 @@ RenderTicket::RenderTicket(Type type, const QVariant &time) :
   finished_(false),
   cancelled_(false),
   time_(time),
-  type_(type)
+  type_(type),
+  job_time_(0)
 {
 }
 
diff --git a/app/render/backend/renderticket.h b/app/render/backend/renderticket.h
index 22fe46c8d..f4fca0c6b 100644
--- a/app/render/backend/renderticket.h
+++ b/app/render/backend/renderticket.h
@@ -21,6 +21,7 @@
 #ifndef RENDERTICKET_H
 #define RENDERTICKET_H
 
+#include <QDateTime>
 #include <QMutex>
 #include <QWaitCondition>
 
@@ -42,6 +43,16 @@ public:
 
   RenderTicket(Type type, const QVariant& time);
 
+  qint64 GetJobTime() const
+  {
+    return job_time_;
+  }
+
+  void SetJobTime()
+  {
+    job_time_ = QDateTime::currentMSecsSinceEpoch();
+  }
+
   const QVariant& GetTime() const
   {
     return time_;
@@ -87,10 +98,14 @@ private:
 
   Type type_;
 
+  qint64 job_time_;
+
 };
 
 using RenderTicketPtr = std::shared_ptr<RenderTicket>;
 
 OLIVE_NAMESPACE_EXIT
 
+Q_DECLARE_METATYPE(OLIVE_NAMESPACE::RenderTicketPtr)
+
 #endif // RENDERTICKET_H
diff --git a/app/render/backend/renderworker.cpp b/app/render/backend/renderworker.cpp
index 31194a105..8eb34ef8f 100644
--- a/app/render/backend/renderworker.cpp
+++ b/app/render/backend/renderworker.cpp
@@ -34,14 +34,15 @@ OLIVE_NAMESPACE_ENTER
 RenderWorker::RenderWorker(RenderBackend* parent) :
   parent_(parent),
   available_(true),
-  audio_mode_is_preview_(false),
-  preview_cache_(nullptr),
+  generate_audio_previews_(false),
   render_mode_(RenderMode::kOnline)
 {
 }
 
 void RenderWorker::Hash(RenderTicketPtr ticket, ViewerOutput *viewer, const QVector<rational> &times)
 {
+  ticket_ = ticket;
+
   QVector<QByteArray> hashes(times.size());
 
   for (int i=0;i<hashes.size();i++) {
@@ -73,6 +74,8 @@ QByteArray RenderWorker::HashNode(const Node *n, const VideoParams &params, cons
 
 void RenderWorker::RenderFrame(RenderTicketPtr ticket, ViewerOutput* viewer, const rational &time)
 {
+  ticket_ = ticket;
+
   NodeValueTable table = ProcessInput(viewer->texture_input(),
                                       TimeRange(time, time + video_params_.time_base()));
 
@@ -109,6 +112,8 @@ void RenderWorker::RenderFrame(RenderTicketPtr ticket, ViewerOutput* viewer, con
 
 void RenderWorker::RenderAudio(RenderTicketPtr ticket, ViewerOutput* viewer, const TimeRange &range)
 {
+  ticket_ = ticket;
+
   NodeValueTable table = ProcessInput(viewer->samples_input(), range);
 
   QVariant samples = table.Get(NodeParam::kSamples);
@@ -168,38 +173,26 @@ NodeValueTable RenderWorker::GenerateBlockTable(const TrackOutput *track, const
       NodeValueTable::Merge({merged_table, table});
     }
 
-    if (preview_cache_) {
+    if (generate_audio_previews_) {
       // Find original track object
       TrackOutput* original_track = nullptr;
 
-      QList<TimeRange> valid_ranges = preview_cache_->GetValidRanges(range, preview_job_time_);
-      if (!valid_ranges.isEmpty()) {
-        QHash<Node*, Node*>::const_iterator i;
-        for (i=copy_map_->constBegin(); i!=copy_map_->constEnd(); i++) {
-          if (i.value() == track) {
-            original_track = static_cast<TrackOutput*>(i.key());
-            break;
-          }
+      // Have to do a manual loop since our track is const and QHash won't take it
+      QHash<Node*, Node*>::const_iterator i;
+      for (i=copy_map_->constBegin(); i!=copy_map_->constEnd(); i++) {
+        if (i.value() == track) {
+          original_track = static_cast<TrackOutput*>(i.key());
+          break;
         }
+      }
 
-        // Generate visual waveform in this background thread
-        if (original_track) {
-          AudioVisualWaveform visual_waveform;
-          visual_waveform.set_channel_count(audio_params_.channel_count());
-          visual_waveform.OverwriteSamples(block_range_buffer, audio_params_.sample_rate());
+      if (original_track) {
+        // Generate a visual waveform and send it back to the main thread
+        AudioVisualWaveform visual_waveform;
+        visual_waveform.set_channel_count(audio_params_.channel_count());
+        visual_waveform.OverwriteSamples(block_range_buffer, audio_params_.sample_rate());
 
-          original_track->waveform_lock()->lock();
-
-          original_track->waveform().set_channel_count(audio_params_.channel_count());
-
-          foreach (const TimeRange& r, valid_ranges) {
-            original_track->waveform().OverwriteSums(visual_waveform, r.in(), r.in() - range.in(), r.length());
-          }
-
-          original_track->waveform_lock()->unlock();
-
-          emit original_track->PreviewChanged();
-        }
+        emit WaveformGenerated(ticket_, original_track, visual_waveform, range);
       }
     }
 
@@ -386,37 +379,24 @@ QVariant RenderWorker::ProcessAudioFootage(StreamPtr stream, const TimeRange &in
     // See if we have a conformed version of this audio
     if (!decoder->HasConformedVersion(audio_params())) {
 
-      // If not, check what audio mode we're in
-      if (audio_mode_is_preview_) {
+      // If not, the audio needs to be conformed
+      // For online rendering/export, it's a waste of time to render the audio until we have
+      // all we need, so we try to handle the conform ourselves
+      AudioStreamPtr as = std::static_pointer_cast<AudioStream>(stream);
 
-        // For preview, we report the conform is missing and finish the render without it
-        // temporarily. The backend that picks up this signal will recache this section once the
-        // conform is available.
-        emit AudioConformUnavailable(decoder->stream(),
-                                     audio_render_time_,
-                                     input_time.out(),
-                                     audio_params());
+      // Check if any other threads are conforming this audio
+      if (as->try_start_conforming(audio_params())) {
+
+        // If not, conform it ourselves
+        decoder->ConformAudio(&IsCancelled(), audio_params());
 
       } else {
 
-        // For online rendering/export, it's a waste of time to render the audio until we have
-        // all we need, so we try to handle the conform ourselves
-        AudioStreamPtr as = std::static_pointer_cast<AudioStream>(stream);
+        // If another thread is conforming already, hackily try to wait until it's done.
+        do {
+          QThread::msleep(1000);
+        } while (!as->has_conformed_version(audio_params()) && !IsCancelled());
 
-        // Check if any other threads are conforming this audio
-        if (as->try_start_conforming(audio_params())) {
-
-          // If not, conform it ourselves
-          decoder->ConformAudio(&IsCancelled(), audio_params());
-
-        } else {
-
-          // If another thread is conforming already, hackily try to wait until it's done.
-          do {
-            QThread::msleep(1000);
-          } while (!as->has_conformed_version(audio_params()) && !IsCancelled());
-
-        }
       }
 
     }
diff --git a/app/render/backend/renderworker.h b/app/render/backend/renderworker.h
index 65655a2b2..44b945b5a 100644
--- a/app/render/backend/renderworker.h
+++ b/app/render/backend/renderworker.h
@@ -63,11 +63,6 @@ public:
     video_download_matrix_ = mat;
   }
 
-  void SetAudioModeIsPreview(bool audio_mode_is_preview)
-  {
-    audio_mode_is_preview_ = audio_mode_is_preview;
-  }
-
   void SetCopyMap(QHash<Node*, Node*>* copy_map)
   {
     copy_map_ = copy_map;
@@ -78,10 +73,9 @@ public:
     render_mode_ = mode;
   }
 
-  void EnablePreviewGeneration(AudioPlaybackCache* cache, qint64 job_time)
+  void SetPreviewGenerationEnabled(bool e)
   {
-    preview_cache_ = cache;
-    preview_job_time_ = job_time;
+    generate_audio_previews_ = e;
   }
 
   void Hash(RenderTicketPtr ticket, ViewerOutput* viewer, const QVector<rational>& times);
@@ -143,7 +137,7 @@ signals:
 
   void FinishedJob();
 
-  void WaveformGenerated(OLIVE_NAMESPACE::TrackOutput* track, OLIVE_NAMESPACE::AudioVisualWaveform samples, OLIVE_NAMESPACE::TimeRange start);
+  void WaveformGenerated(OLIVE_NAMESPACE::RenderTicketPtr ticket, OLIVE_NAMESPACE::TrackOutput* track, OLIVE_NAMESPACE::AudioVisualWaveform samples, OLIVE_NAMESPACE::TimeRange range);
 
 private:
   DecoderPtr ResolveDecoderFromInput(StreamPtr stream);
@@ -152,6 +146,8 @@ private:
 
   RenderBackend* parent_;
 
+  RenderTicketPtr ticket_;
+
   VideoParams video_params_;
 
   AudioParams audio_params_;
@@ -173,10 +169,7 @@ private:
   TimeRange audio_render_time_;
   bool available_;
 
-  bool audio_mode_is_preview_;
-
-  AudioPlaybackCache* preview_cache_;
-  qint64 preview_job_time_;
+  bool generate_audio_previews_;
 
   QHash<Node*, Node*>* copy_map_;
 
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 82d70cc15..9ae33e60c 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -110,6 +110,7 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
   renderer_ = new OpenGLBackend(this);
   renderer_->SetAutoCacheEnabled(true);
   renderer_->SetRenderMode(RenderMode::kOffline);
+  renderer_->SetPreviewGenerationEnabled(true);
 
   // Ensures that seeking on the waveform view updates the time as expected
   connect(waveform_view_, &AudioWaveformView::TimeChanged, this, &ViewerWidget::SetTimeAndSignal);

From d5dce29b227b1980ea493365eaa198f51378e094 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 5 Aug 2020 23:45:18 +1000
Subject: [PATCH 092/138] cache: merged cachetask and footagecache into one
 precache task

Since the actual auto-cache now happens elsewhere, this cleans up a lot of
dead code.
---
 app/core.cpp                                  |  1 -
 app/render/backend/renderbackend.cpp          |  2 -
 app/task/CMakeLists.txt                       |  2 +-
 app/task/cache/footagecache.cpp               | 53 --------------
 app/task/cache/footagecache.h                 | 48 -------------
 app/task/export/export.cpp                    |  8 ++-
 app/task/export/export.h                      |  4 +-
 app/task/{cache => precache}/CMakeLists.txt   |  6 +-
 .../cache.cpp => precache/precachetask.cpp}   | 71 +++++++++----------
 .../cache.h => precache/precachetask.h}       | 30 ++++----
 app/task/render/render.cpp                    | 43 ++++-------
 app/task/render/render.h                      | 18 +----
 .../projectexplorer/projectexplorer.cpp       |  4 +-
 .../timelinewidget/view/timelineviewbase.cpp  |  2 +-
 app/widget/viewer/viewer.h                    |  1 -
 15 files changed, 78 insertions(+), 215 deletions(-)
 delete mode 100644 app/task/cache/footagecache.cpp
 delete mode 100644 app/task/cache/footagecache.h
 rename app/task/{cache => precache}/CMakeLists.txt (88%)
 rename app/task/{cache/cache.cpp => precache/precachetask.cpp} (52%)
 rename app/task/{cache/cache.h => precache/precachetask.h} (69%)

diff --git a/app/core.cpp b/app/core.cpp
index 1b6b8c74a..fbecb02bf 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -51,7 +51,6 @@
 #include "render/diskmanager.h"
 #include "render/pixelformat.h"
 #include "render/shaderinfo.h"
-#include "task/cache/cache.h"
 #include "task/project/import/import.h"
 #include "task/project/load/load.h"
 #include "task/project/save/save.h"
diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index 19fcb06f7..762dfeabd 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -464,8 +464,6 @@ void RenderBackend::TicketFinished()
 
 void RenderBackend::WorkerGeneratedWaveform(RenderTicketPtr ticket, TrackOutput *track, AudioVisualWaveform samples, TimeRange range)
 {
-  qDebug() << "Hello?";
-
   QList<TimeRange> valid_ranges = viewer_node_->audio_playback_cache()->GetValidRanges(range,
                                                                                        ticket->GetJobTime());
   if (!valid_ranges.isEmpty()) {
diff --git a/app/task/CMakeLists.txt b/app/task/CMakeLists.txt
index 02eaab8e4..3498e2910 100644
--- a/app/task/CMakeLists.txt
+++ b/app/task/CMakeLists.txt
@@ -14,9 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-add_subdirectory(cache)
 add_subdirectory(conform)
 add_subdirectory(export)
+add_subdirectory(precache)
 add_subdirectory(project)
 add_subdirectory(render)
 
diff --git a/app/task/cache/footagecache.cpp b/app/task/cache/footagecache.cpp
deleted file mode 100644
index 9a21bc9f8..000000000
--- a/app/task/cache/footagecache.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/***
-
-  Olive - Non-Linear Video Editor
-  Copyright (C) 2019 Olive Team
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-***/
-
-#include "footagecache.h"
-
-#include "common/timecodefunctions.h"
-
-OLIVE_NAMESPACE_ENTER
-
-FootageCacheTask::FootageCacheTask(VideoStreamPtr footage, Sequence *sequence) :
-  CacheTask(new ViewerOutput(), sequence->video_params(), sequence->audio_params(), false),
-  footage_(footage)
-{
-  viewer()->set_video_params(sequence->video_params());
-  viewer()->set_audio_params(sequence->audio_params());
-  backend()->SetVideoParams(sequence->video_params());
-  backend()->SetAudioParams(sequence->audio_params());
-
-  video_node_ = new VideoInput();
-  video_node_->SetFootage(footage);
-
-  NodeParam::ConnectEdge(video_node_->output(), viewer()->texture_input());
-
-  SetTitle(tr("Pre-caching %1:%2").arg(footage->footage()->filename(),
-                                       QString::number(footage->index())));
-
-  backend()->ProcessUpdateQueue();
-}
-
-FootageCacheTask::~FootageCacheTask()
-{
-  delete viewer();
-  delete video_node_;
-}
-
-OLIVE_NAMESPACE_EXIT
diff --git a/app/task/cache/footagecache.h b/app/task/cache/footagecache.h
deleted file mode 100644
index f48218532..000000000
--- a/app/task/cache/footagecache.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/***
-
-  Olive - Non-Linear Video Editor
-  Copyright (C) 2019 Olive Team
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-***/
-
-#ifndef FOOTAGECACHETASK_H
-#define FOOTAGECACHETASK_H
-
-#include "cache.h"
-#include "node/input/media/video/video.h"
-#include "project/item/footage/footage.h"
-#include "project/item/sequence/sequence.h"
-
-OLIVE_NAMESPACE_ENTER
-
-class FootageCacheTask : public CacheTask
-{
-  Q_OBJECT
-public:
-  FootageCacheTask(VideoStreamPtr footage, Sequence* sequence);
-
-  virtual ~FootageCacheTask() override;
-
-private:
-  VideoStreamPtr footage_;
-
-  VideoInput* video_node_;
-
-};
-
-OLIVE_NAMESPACE_EXIT
-
-#endif // FOOTAGECACHETASK_H
diff --git a/app/task/export/export.cpp b/app/task/export/export.cpp
index 57f23df6d..bcbdc083b 100644
--- a/app/task/export/export.cpp
+++ b/app/task/export/export.cpp
@@ -148,8 +148,10 @@ QFuture<void> ExportTask::DownloadFrame(FramePtr frame, const QByteArray &hash)
   return QtConcurrent::run(FrameColorConvert, color_processor_, frame);
 }
 
-void ExportTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times)
+void ExportTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times, qint64 job_time)
 {
+  Q_UNUSED(job_time)
+
   FramePtr f = rendered_frame_.value(hash);
 
   foreach (const rational& t, times) {
@@ -173,8 +175,10 @@ void ExportTask::FrameDownloaded(const QByteArray &hash, const std::list<rationa
   }
 }
 
-void ExportTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples)
+void ExportTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples, qint64 job_time)
 {
+  Q_UNUSED(job_time)
+
   TimeRange adjusted_range = range;
 
   if (params_.has_custom_range()) {
diff --git a/app/task/export/export.h b/app/task/export/export.h
index 5c92adea3..58e392ad5 100644
--- a/app/task/export/export.h
+++ b/app/task/export/export.h
@@ -40,9 +40,9 @@ protected:
 
   virtual QFuture<void> DownloadFrame(FramePtr frame, const QByteArray &hash) override;
 
-  virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times) override;
+  virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times, qint64 job_time) override;
 
-  virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) override;
+  virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples, qint64 job_time) override;
 
 private:
   QHash<QByteArray, FramePtr> rendered_frame_;
diff --git a/app/task/cache/CMakeLists.txt b/app/task/precache/CMakeLists.txt
similarity index 88%
rename from app/task/cache/CMakeLists.txt
rename to app/task/precache/CMakeLists.txt
index 5557f3f39..872149bae 100644
--- a/app/task/cache/CMakeLists.txt
+++ b/app/task/precache/CMakeLists.txt
@@ -16,9 +16,7 @@
 
 set(OLIVE_SOURCES
   ${OLIVE_SOURCES}
-  task/cache/cache.h
-  task/cache/cache.cpp
-  task/cache/footagecache.h
-  task/cache/footagecache.cpp
+  task/precache/precachetask.h
+  task/precache/precachetask.cpp
   PARENT_SCOPE
 )
diff --git a/app/task/cache/cache.cpp b/app/task/precache/precachetask.cpp
similarity index 52%
rename from app/task/cache/cache.cpp
rename to app/task/precache/precachetask.cpp
index 0b8d60279..220fb36f2 100644
--- a/app/task/cache/cache.cpp
+++ b/app/task/precache/precachetask.cpp
@@ -18,81 +18,80 @@
 
 ***/
 
-#include "cache.h"
-
-#include <QLinkedList>
-#include <QMatrix4x4>
-
-#include "project/item/sequence/sequence.h"
+#include "precachetask.h"
 
 OLIVE_NAMESPACE_ENTER
 
-CacheTask::CacheTask(RenderBackend *backend, bool in_out_only) :
-  RenderTask(backend),
-  in_out_only_(in_out_only)
+PreCacheTask::PreCacheTask(VideoStreamPtr footage, Sequence* sequence) :
+  RenderTask(new ViewerOutput(), sequence->video_params(), sequence->audio_params()),
+  footage_(footage)
 {
-  Init();
+  viewer()->set_video_params(sequence->video_params());
+  viewer()->set_audio_params(sequence->audio_params());
+
+  // Render fastest quality
+  backend()->SetRenderMode(RenderMode::kOffline);
+
+  video_node_ = new VideoInput();
+  video_node_->SetFootage(footage);
+
+  NodeParam::ConnectEdge(video_node_->output(), viewer()->texture_input());
+
+  SetTitle(tr("Pre-caching %1:%2").arg(footage->footage()->filename(),
+                                       QString::number(footage->index())));
+
+  backend()->NodeGraphChanged(viewer()->texture_input());
+  backend()->ProcessUpdateQueue();
 }
 
-CacheTask::CacheTask(ViewerOutput* viewer, const VideoParams& vparams, const AudioParams &aparams, bool in_out_only) :
-  RenderTask(viewer, vparams, aparams),
-  in_out_only_(in_out_only)
+PreCacheTask::~PreCacheTask()
 {
-  Init();
+  delete viewer();
+  delete video_node_;
 }
 
-bool CacheTask::Run()
+bool PreCacheTask::Run()
 {
   // Get list of invalidated ranges
   TimeRangeList video_range = viewer()->video_frame_cache()->GetInvalidatedRanges();
-  TimeRangeList audio_range = viewer()->audio_playback_cache()->GetInvalidatedRanges();
 
   // If we're caching only in-out, limit the range to that
+  /*
   if (in_out_only_) {
     Sequence* s = static_cast<Sequence*>(viewer()->parent());
 
     if (s->workarea()->enabled()) {
       video_range = video_range.Intersects(s->workarea()->range());
-      audio_range = audio_range.Intersects(s->workarea()->range());
     }
   }
+  */
 
-  Render(video_range, audio_range, true);
+  Render(video_range, TimeRangeList(), true);
 
   download_threads_.waitForDone();
 
   return true;
 }
 
-QFuture<void> CacheTask::DownloadFrame(FramePtr frame, const QByteArray &hash)
+QFuture<void> PreCacheTask::DownloadFrame(FramePtr frame, const QByteArray &hash)
 {
   return QtConcurrent::run(&download_threads_, FrameHashCache::SaveCacheFrame, hash, frame);
 }
 
-void CacheTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times)
+void PreCacheTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times, qint64 job_time)
 {
   foreach (const rational& t, times) {
-    viewer()->video_frame_cache()->SetHash(t, hash, job_time(), true);
+    viewer()->video_frame_cache()->SetHash(t, hash, job_time, true);
   }
 }
 
-void CacheTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples)
+void PreCacheTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples, qint64 job_time)
 {
-  if (samples) {
-    viewer()->audio_playback_cache()->WritePCM(range, samples, job_time());
-  } else {
-    viewer()->audio_playback_cache()->WriteSilence(range);
-  }
-}
+  // Pre-cache doesn't cache any audio
 
-void CacheTask::Init()
-{
-  SetTitle(tr("Caching \"%1\"").arg(viewer()->media_name()));
-
-  backend()->EnablePreviewGeneration(job_time());
-
-  // Render fastest quality
-  backend()->SetRenderMode(RenderMode::kOffline);
+  Q_UNUSED(range)
+  Q_UNUSED(samples)
+  Q_UNUSED(job_time)
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/task/cache/cache.h b/app/task/precache/precachetask.h
similarity index 69%
rename from app/task/cache/cache.h
rename to app/task/precache/precachetask.h
index c17344713..090fedd44 100644
--- a/app/task/cache/cache.h
+++ b/app/task/precache/precachetask.h
@@ -18,38 +18,36 @@
 
 ***/
 
-#ifndef CACHETASK_H
-#define CACHETASK_H
-
-#include <QtConcurrent/QtConcurrent>
+#ifndef PRECACHETASK_H
+#define PRECACHETASK_H
 
+#include "node/input/media/video/video.h"
+#include "project/item/footage/footage.h"
+#include "project/item/sequence/sequence.h"
 #include "task/render/render.h"
 
 OLIVE_NAMESPACE_ENTER
 
-class CacheTask : public RenderTask
+class PreCacheTask : public RenderTask
 {
-  Q_OBJECT
 public:
-  CacheTask(RenderBackend* backend, bool in_out_only);
-  CacheTask(ViewerOutput* viewer,
-            const VideoParams &vparams,
-            const AudioParams &aparams,
-            bool in_out_only);
+  PreCacheTask(VideoStreamPtr footage, Sequence* sequence);
+
+  virtual ~PreCacheTask() override;
 
 protected:
   virtual bool Run() override;
 
   virtual QFuture<void> DownloadFrame(FramePtr frame, const QByteArray &hash) override;
 
-  virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times) override;
+  virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times, qint64 job_time) override;
 
-  virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) override;
+  virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples, qint64 job_time) override;
 
 private:
-  void Init();
+  VideoStreamPtr footage_;
 
-  bool in_out_only_;
+  VideoInput* video_node_;
 
   QThreadPool download_threads_;
 
@@ -57,4 +55,4 @@ private:
 
 OLIVE_NAMESPACE_EXIT
 
-#endif // CACHETASK_H
+#endif // PRECACHETASK_H
diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp
index 5d81a8643..45bede9e4 100644
--- a/app/task/render/render.cpp
+++ b/app/task/render/render.cpp
@@ -24,31 +24,17 @@
 
 OLIVE_NAMESPACE_ENTER
 
-RenderTask::RenderTask(RenderBackend *backend) :
-  backend_(backend)
-{
-  job_time_ = QDateTime::currentMSecsSinceEpoch();
-
-  backend_is_ours_ = false;
-}
-
 RenderTask::RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams)
 {
-  job_time_ = QDateTime::currentMSecsSinceEpoch();
-
   backend_ = new OpenGLBackend();
   backend_->SetViewerNode(viewer);
   backend_->SetVideoParams(vparams);
   backend_->SetAudioParams(aparams);
-
-  backend_is_ours_ = true;
 }
 
 RenderTask::~RenderTask()
 {
-  if (backend_is_ours_) {
-    backend_->deleteLater();
-  }
+  delete backend_;
 }
 
 struct TimeHashFuturePair {
@@ -74,6 +60,7 @@ struct RangeSampleFuturePair {
 struct HashDownloadFuturePair {
   QByteArray hash;
   QFuture<void> download_future;
+  qint64 job_time;
 };
 
 void RenderTask::Render(const TimeRangeList& video_range,
@@ -99,16 +86,16 @@ void RenderTask::Render(const TimeRangeList& video_range,
   QVector<rational> times;
   QVector<QByteArray> hashes;
   std::list<HashTimePair> frame_queue;
+  qint64 hash_job_time;
 
   if (!video_range.isEmpty()) {
-    QList<QByteArray> existing_hashes;
-
     times = viewer()->video_frame_cache()->GetFrameListFromTimeRange(video_range);
 
     total_length += video_frame_sz * times.size();
 
     RenderTicketPtr hash_future = backend_->Hash(times);
     hashes = hash_future->Get().value<QVector<QByteArray> >();
+    hash_job_time = hash_future->GetJobTime();
 
     if (!hash_future->WasCancelled()) {
       for (int i=0;i<times.size();i++) {
@@ -136,6 +123,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
              || !audio_lookup_table.empty())) {
 
     if (!IsCancelled() && !frame_queue.empty()) {
+
       // Pop another frame off the frame queue
       const HashTimePair& p = frame_queue.front();
 
@@ -163,7 +151,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
 
           if (hash_exists) {
             // Already exists, no need to render it again
-            FrameDownloaded(p.hash, {p.time});
+            FrameDownloaded(p.hash, {p.time}, hash_job_time);
             progress_counter += video_frame_sz;
             emit ProgressChanged(progress_counter / total_length);
           }
@@ -193,7 +181,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
           FramePtr f = i->frame_future->Get().value<FramePtr>();
 
           // Start multithreaded download here
-          download_futures.push_back({i->hash, DownloadFrame(f, i->hash)});
+          download_futures.push_back({i->hash, DownloadFrame(f, i->hash), i->frame_future->GetJobTime()});
         }
 
         i = render_lookup_table.erase(i);
@@ -215,7 +203,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
           }
         }
 
-        FrameDownloaded(j->hash, times_with_hash);
+        FrameDownloaded(j->hash, times_with_hash, j->job_time);
 
         existing_hashes.push_back(j->hash);
 
@@ -234,7 +222,9 @@ void RenderTask::Render(const TimeRangeList& video_range,
 
     while (!IsCancelled() && k != audio_lookup_table.end()) {
       if (k->sample_future->IsFinished()) {
-        AudioDownloaded(k->range, k->sample_future->Get().value<SampleBufferPtr>());
+        AudioDownloaded(k->range,
+                        k->sample_future->Get().value<SampleBufferPtr>(),
+                        k->sample_future->GetJobTime());
 
         progress_counter += k->range.length().toDouble();
         emit ProgressChanged(progress_counter / total_length);
@@ -246,15 +236,8 @@ void RenderTask::Render(const TimeRangeList& video_range,
     }
   }
 
-  if (backend_is_ours_) {
-    // `Close` will block until all jobs are done making a safe deletion
-    backend_->Close();
-  }
-}
-
-void RenderTask::SetAnchorPoint(const rational &r)
-{
-  anchor_point_ = r;
+  // `Close` will block until all jobs are done making a safe deletion
+  backend_->Close();
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/task/render/render.h b/app/task/render/render.h
index 77b655c24..8571c0894 100644
--- a/app/task/render/render.h
+++ b/app/task/render/render.h
@@ -32,7 +32,6 @@ OLIVE_NAMESPACE_ENTER
 class RenderTask : public Task
 {
 public:
-  RenderTask(RenderBackend* backend);
   RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams);
 
   virtual ~RenderTask() override;
@@ -44,9 +43,9 @@ protected:
 
   virtual QFuture<void> DownloadFrame(FramePtr frame, const QByteArray &hash) = 0;
 
-  virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times) = 0;
+  virtual void FrameDownloaded(const QByteArray& hash, const std::list<rational>& times, qint64 job_time) = 0;
 
-  virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples) = 0;
+  virtual void AudioDownloaded(const TimeRange& range, SampleBufferPtr samples, qint64 job_time) = 0;
 
   ViewerOutput* viewer() const
   {
@@ -63,27 +62,14 @@ protected:
     return backend_->GetAudioParams();
   }
 
-  void SetAnchorPoint(const rational& r);
-
-  const qint64& job_time() const
-  {
-    return job_time_;
-  }
-
   RenderBackend* backend()
   {
     return backend_;
   }
 
 private:
-  rational anchor_point_;
-
   RenderBackend* backend_;
 
-  bool backend_is_ours_;
-
-  qint64 job_time_;
-
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/projectexplorer/projectexplorer.cpp b/app/widget/projectexplorer/projectexplorer.cpp
index c5b4ab690..0a1dd0ab7 100644
--- a/app/widget/projectexplorer/projectexplorer.cpp
+++ b/app/widget/projectexplorer/projectexplorer.cpp
@@ -31,7 +31,7 @@
 #include "core.h"
 #include "dialog/footageproperties/footageproperties.h"
 #include "dialog/sequence/sequence.h"
-#include "task/cache/footagecache.h"
+#include "task/precache/precachetask.h"
 #include "task/taskmanager.h"
 #include "widget/menu/menu.h"
 #include "widget/menu/menushared.h"
@@ -427,7 +427,7 @@ void ProjectExplorer::ContextMenuStartProxy(QAction *a)
 
   // Start a background task for proxying
   foreach (VideoStreamPtr video_stream, video_streams) {
-    FootageCacheTask* proxy_task = new FootageCacheTask(video_stream, sequence);
+    PreCacheTask* proxy_task = new PreCacheTask(video_stream, sequence);
     TaskManager::instance()->AddTask(proxy_task);
   }
 }
diff --git a/app/widget/timelinewidget/view/timelineviewbase.cpp b/app/widget/timelinewidget/view/timelineviewbase.cpp
index d0eb9e4c3..68acb08c7 100644
--- a/app/widget/timelinewidget/view/timelineviewbase.cpp
+++ b/app/widget/timelinewidget/view/timelineviewbase.cpp
@@ -136,7 +136,7 @@ void TimelineViewBase::drawForeground(QPainter *painter, const QRectF &rect)
 
     // Get playhead highlight color
     QColor highlight = palette().text().color();
-    highlight.setAlpha(128);
+    highlight.setAlpha(32);
     painter->setPen(Qt::NoPen);
     painter->setBrush(highlight);
     painter->drawRect(playhead_rect);
diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h
index a1a45e0fc..6e75c8327 100644
--- a/app/widget/viewer/viewer.h
+++ b/app/widget/viewer/viewer.h
@@ -34,7 +34,6 @@
 #include "panel/scope/scope.h"
 #include "render/backend/opengl/openglbackend.h"
 #include "render/backend/renderticketwatcher.h"
-#include "task/cache/cache.h"
 #include "viewerdisplay.h"
 #include "viewerplaybacktimer.h"
 #include "viewerqueue.h"

From 02c0fb73160d932ba33c59ca24e7e086f8978f71 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Wed, 5 Aug 2020 23:56:42 +1000
Subject: [PATCH 093/138] nodeview: automatically deselect blocks that have
 been removed

Fixes segfault attempting to access and select an item that's already been
removed.
---
 app/widget/nodeview/nodeview.cpp | 9 +++++++++
 app/widget/nodeview/nodeview.h   | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp
index cba47d257..4dbbd72f1 100644
--- a/app/widget/nodeview/nodeview.cpp
+++ b/app/widget/nodeview/nodeview.cpp
@@ -74,6 +74,7 @@ void NodeView::SetGraph(NodeGraph *graph)
   if (graph_ != nullptr) {
     disconnect(graph_, &NodeGraph::NodeAdded, &scene_, &NodeViewScene::AddNode);
     disconnect(graph_, &NodeGraph::NodeRemoved, &scene_, &NodeViewScene::RemoveNode);
+    disconnect(graph_, &NodeGraph::NodeRemoved, this, &NodeView::GraphNodeRemoved);
     disconnect(graph_, &NodeGraph::EdgeAdded, this, &NodeView::GraphEdgeAdded);
     disconnect(graph_, &NodeGraph::EdgeRemoved, this, &NodeView::GraphEdgeRemoved);
   }
@@ -89,6 +90,7 @@ void NodeView::SetGraph(NodeGraph *graph)
   if (graph_ != nullptr) {
     connect(graph_, &NodeGraph::NodeAdded, &scene_, &NodeViewScene::AddNode);
     connect(graph_, &NodeGraph::NodeRemoved, &scene_, &NodeViewScene::RemoveNode);
+    connect(graph_, &NodeGraph::NodeRemoved, this, &NodeView::GraphNodeRemoved);
     connect(graph_, &NodeGraph::EdgeAdded, this, &NodeView::GraphEdgeAdded);
     connect(graph_, &NodeGraph::EdgeRemoved, this, &NodeView::GraphEdgeRemoved);
 
@@ -977,6 +979,13 @@ void NodeView::AssociatedNodeDestroyed()
   DisassociateNode(static_cast<Node*>(sender()), true);
 }
 
+void NodeView::GraphNodeRemoved(Node *node)
+{
+  if (selected_blocks_.contains(static_cast<Block*>(node))) {
+    DeselectBlocks({static_cast<Block*>(node)});
+  }
+}
+
 void NodeView::GraphEdgeAdded(NodeEdgePtr edge)
 {
   Node* input_node = edge->input()->parentNode();
diff --git a/app/widget/nodeview/nodeview.h b/app/widget/nodeview/nodeview.h
index d2c7d7a95..573aaa79d 100644
--- a/app/widget/nodeview/nodeview.h
+++ b/app/widget/nodeview/nodeview.h
@@ -145,6 +145,8 @@ private slots:
 
   void AssociatedNodeDestroyed();
 
+  void GraphNodeRemoved(Node* node);
+
   void GraphEdgeAdded(NodeEdgePtr edge);
 
   void GraphEdgeRemoved(NodeEdgePtr edge);

From fa02430d489db14fd3f9664162f14892afb5c2b3 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 6 Aug 2020 01:30:51 +1000
Subject: [PATCH 094/138] cache: reimplemented disk manager to enforce limit in
 preferences

---
 app/render/framehashcache.cpp | 47 +++++++++++++++++++++++++----------
 app/render/framehashcache.h   | 10 +++-----
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/app/render/framehashcache.cpp b/app/render/framehashcache.cpp
index d215b6680..6d5b19463 100644
--- a/app/render/framehashcache.cpp
+++ b/app/render/framehashcache.cpp
@@ -34,6 +34,14 @@
 
 OLIVE_NAMESPACE_ENTER
 
+FrameHashCache::FrameHashCache(QObject *parent) :
+  PlaybackCache(parent)
+{
+  if (DiskManager::instance()) {
+    connect(DiskManager::instance(), &DiskManager::DeletedFrame, this, &FrameHashCache::HashDeleted);
+  }
+}
+
 QByteArray FrameHashCache::GetHash(const rational &time)
 {
   QMutexLocker locker(lock());
@@ -318,19 +326,6 @@ void FrameHashCache::LengthChangedEvent(const rational &old, const rational &new
   }
 }
 
-void FrameHashCache::InvalidateEvent(const TimeRange &r)
-{
-  QMap<rational, QByteArray>::iterator i = time_hash_map_.begin();
-
-  while (i != time_hash_map_.end()) {
-    if (i.key() >= r.in() && i.key() < r.out()) {
-      i = time_hash_map_.erase(i);
-    } else {
-      i++;
-    }
-  }
-}
-
 struct HashTimePair {
   rational time;
   QByteArray hash;
@@ -372,6 +367,29 @@ void FrameHashCache::ShiftEvent(const rational &from, const rational &to)
   }
 }
 
+void FrameHashCache::HashDeleted(const QByteArray &hash)
+{
+  QMutexLocker locker(lock());
+
+  TimeRangeList invalidated;
+
+  QMap<rational, QByteArray>::const_iterator i;
+  for (i=time_hash_map_.constBegin(); i!=time_hash_map_.constEnd(); i++) {
+    if (i.value() == hash) {
+      TimeRange r(i.key(), i.key() + timebase_);
+
+      NoLockInvalidate(r);
+      invalidated.InsertTimeRange(r);
+    }
+  }
+
+  locker.unlock();
+
+  foreach (const TimeRange& r, invalidated) {
+    emit Invalidated(r);
+  }
+}
+
 QString FrameHashCache::CachePathName(const QByteArray& hash)
 {
   QString ext = GetFormatExtension();
@@ -381,6 +399,9 @@ QString FrameHashCache::CachePathName(const QByteArray& hash)
 
   QString filename = QStringLiteral("%1%2").arg(QString(hash.mid(1).toHex()), ext);
 
+  // Register that in some way this hash has been accessed
+  DiskManager::instance()->Accessed(hash);
+
   return cache_dir.filePath(filename);
 }
 
diff --git a/app/render/framehashcache.h b/app/render/framehashcache.h
index ca320b029..60bac1042 100644
--- a/app/render/framehashcache.h
+++ b/app/render/framehashcache.h
@@ -35,10 +35,7 @@ class FrameHashCache : public PlaybackCache
 {
   Q_OBJECT
 public:
-  FrameHashCache(QObject* parent = nullptr) :
-    PlaybackCache(parent)
-  {
-  }
+  FrameHashCache(QObject* parent = nullptr);
 
   QByteArray GetHash(const rational& time);
 
@@ -82,8 +79,6 @@ public slots:
 protected:
   virtual void LengthChangedEvent(const rational& old, const rational& newlen) override;
 
-  virtual void InvalidateEvent(const TimeRange& range) override;
-
   virtual void ShiftEvent(const rational& from, const rational& to) override;
 
 private:
@@ -91,6 +86,9 @@ private:
 
   rational timebase_;
 
+private slots:
+  void HashDeleted(const QByteArray& hash);
+
 };
 
 OLIVE_NAMESPACE_EXIT

From a34d696138d042022f84aada160f7b409f056c2e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 6 Aug 2020 01:50:49 +1000
Subject: [PATCH 095/138] various: fixed issues on some compilers

---
 app/dialog/sequence/presetmanager.h | 2 ++
 app/task/render/render.cpp          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/dialog/sequence/presetmanager.h b/app/dialog/sequence/presetmanager.h
index 6836e724e..08f88f89f 100644
--- a/app/dialog/sequence/presetmanager.h
+++ b/app/dialog/sequence/presetmanager.h
@@ -41,6 +41,8 @@ class Preset
 public:
   Preset() = default;
 
+  virtual ~Preset(){}
+
   const QString& GetName() const
   {
     return name_;
diff --git a/app/task/render/render.cpp b/app/task/render/render.cpp
index 45bede9e4..abeff4120 100644
--- a/app/task/render/render.cpp
+++ b/app/task/render/render.cpp
@@ -86,7 +86,7 @@ void RenderTask::Render(const TimeRangeList& video_range,
   QVector<rational> times;
   QVector<QByteArray> hashes;
   std::list<HashTimePair> frame_queue;
-  qint64 hash_job_time;
+  qint64 hash_job_time = 0;
 
   if (!video_range.isEmpty()) {
     times = viewer()->video_frame_cache()->GetFrameListFromTimeRange(video_range);

From f8f3aa982dde24f6ce5e13b427f5c57964b5555e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 7 Aug 2020 01:24:11 +1000
Subject: [PATCH 096/138] ui: added plus and minus buttons

Didn't end up using these, but they may come in handy later. Also updated
the theme build scripts since they hadn't been updated in like a year.
---
 app/ui/icons/icons.cpp                     |   4 +
 app/ui/icons/icons.h                       |   2 +
 app/ui/style/generate-style.sh             |   1 +
 app/ui/style/olive-dark/olive-dark.qrc     |  10 +-
 app/ui/style/olive-dark/png/minus.128.png  | Bin 0 -> 760 bytes
 app/ui/style/olive-dark/png/minus.16.png   | Bin 0 -> 312 bytes
 app/ui/style/olive-dark/png/minus.32.png   | Bin 0 -> 372 bytes
 app/ui/style/olive-dark/png/minus.64.png   | Bin 0 -> 483 bytes
 app/ui/style/olive-dark/png/plus.128.png   | Bin 0 -> 1328 bytes
 app/ui/style/olive-dark/png/plus.16.png    | Bin 0 -> 403 bytes
 app/ui/style/olive-dark/png/plus.32.png    | Bin 0 -> 478 bytes
 app/ui/style/olive-dark/png/plus.64.png    | Bin 0 -> 743 bytes
 app/ui/style/olive-dark/svg/minus.svg      | 817 +++++++++++++++++++++
 app/ui/style/olive-dark/svg/plus.svg       | 817 +++++++++++++++++++++
 app/ui/style/olive-light/olive-light.qrc   |  10 +-
 app/ui/style/olive-light/png/minus.128.png | Bin 0 -> 923 bytes
 app/ui/style/olive-light/png/minus.16.png  | Bin 0 -> 323 bytes
 app/ui/style/olive-light/png/minus.32.png  | Bin 0 -> 403 bytes
 app/ui/style/olive-light/png/minus.64.png  | Bin 0 -> 562 bytes
 app/ui/style/olive-light/png/plus.128.png  | Bin 0 -> 1621 bytes
 app/ui/style/olive-light/png/plus.16.png   | Bin 0 -> 446 bytes
 app/ui/style/olive-light/png/plus.32.png   | Bin 0 -> 531 bytes
 app/ui/style/olive-light/png/plus.64.png   | Bin 0 -> 885 bytes
 app/ui/style/olive-light/svg/minus.svg     | 817 +++++++++++++++++++++
 app/ui/style/olive-light/svg/plus.svg      | 817 +++++++++++++++++++++
 25 files changed, 3293 insertions(+), 2 deletions(-)
 create mode 100644 app/ui/style/olive-dark/png/minus.128.png
 create mode 100644 app/ui/style/olive-dark/png/minus.16.png
 create mode 100644 app/ui/style/olive-dark/png/minus.32.png
 create mode 100644 app/ui/style/olive-dark/png/minus.64.png
 create mode 100644 app/ui/style/olive-dark/png/plus.128.png
 create mode 100644 app/ui/style/olive-dark/png/plus.16.png
 create mode 100644 app/ui/style/olive-dark/png/plus.32.png
 create mode 100644 app/ui/style/olive-dark/png/plus.64.png
 create mode 100644 app/ui/style/olive-dark/svg/minus.svg
 create mode 100644 app/ui/style/olive-dark/svg/plus.svg
 create mode 100644 app/ui/style/olive-light/png/minus.128.png
 create mode 100644 app/ui/style/olive-light/png/minus.16.png
 create mode 100644 app/ui/style/olive-light/png/minus.32.png
 create mode 100644 app/ui/style/olive-light/png/minus.64.png
 create mode 100644 app/ui/style/olive-light/png/plus.128.png
 create mode 100644 app/ui/style/olive-light/png/plus.16.png
 create mode 100644 app/ui/style/olive-light/png/plus.32.png
 create mode 100644 app/ui/style/olive-light/png/plus.64.png
 create mode 100644 app/ui/style/olive-light/svg/minus.svg
 create mode 100644 app/ui/style/olive-light/svg/plus.svg

diff --git a/app/ui/icons/icons.cpp b/app/ui/icons/icons.cpp
index 6c278df0f..a7e655373 100644
--- a/app/ui/icons/icons.cpp
+++ b/app/ui/icons/icons.cpp
@@ -73,6 +73,8 @@ QIcon icon::Error;
 QIcon icon::DirUp;
 QIcon icon::Clock;
 QIcon icon::Diamond;
+QIcon icon::Plus;
+QIcon icon::Minus;
 
 void icon::LoadAll(const QString& theme)
 {
@@ -122,6 +124,8 @@ void icon::LoadAll(const QString& theme)
   DirUp = Create(theme, "dirup");
   Clock = Create(theme, "clock");
   Diamond = Create(theme, "diamond");
+  Plus = Create(theme, "plus");
+  Minus = Create(theme, "minus");
 }
 
 QIcon icon::Create(const QString& theme, const QString &name)
diff --git a/app/ui/icons/icons.h b/app/ui/icons/icons.h
index ba26805bc..51bffe5eb 100644
--- a/app/ui/icons/icons.h
+++ b/app/ui/icons/icons.h
@@ -81,6 +81,8 @@ extern QIcon Error;
 extern QIcon DirUp;
 extern QIcon Clock;
 extern QIcon Diamond;
+extern QIcon Plus;
+extern QIcon Minus;
 
 /**
  * @brief Create an icon object loaded from file
diff --git a/app/ui/style/generate-style.sh b/app/ui/style/generate-style.sh
index 21192314e..327ae81c5 100755
--- a/app/ui/style/generate-style.sh
+++ b/app/ui/style/generate-style.sh
@@ -60,6 +60,7 @@ truncate -s 0 $QRCFILE
 echo "<RCC>" >> $QRCFILE
 echo "  <qresource prefix=\"/style/$PACKNAME\">" >> $QRCFILE
 echo "    <file>style.css</file>" >> $QRCFILE
+echo "    <file>palette.ini</file>" >> $QRCFILE
 
 OutputPng() {
   echo Creating $2...
diff --git a/app/ui/style/olive-dark/olive-dark.qrc b/app/ui/style/olive-dark/olive-dark.qrc
index bb2749a2b..d8d71e21e 100644
--- a/app/ui/style/olive-dark/olive-dark.qrc
+++ b/app/ui/style/olive-dark/olive-dark.qrc
@@ -1,7 +1,7 @@
 <RCC>
   <qresource prefix="/style/olive-dark">
-    <file>palette.ini</file>
     <file>style.css</file>
+    <file>palette.ini</file>
     <file>png/add-button.16.png</file>
     <file>png/add-button.32.png</file>
     <file>png/add-button.64.png</file>
@@ -94,6 +94,10 @@
     <file>png/magnet.32.png</file>
     <file>png/magnet.64.png</file>
     <file>png/magnet.128.png</file>
+    <file>png/minus.16.png</file>
+    <file>png/minus.32.png</file>
+    <file>png/minus.64.png</file>
+    <file>png/minus.128.png</file>
     <file>png/new.16.png</file>
     <file>png/new.32.png</file>
     <file>png/new.64.png</file>
@@ -114,6 +118,10 @@
     <file>png/play.32.png</file>
     <file>png/play.64.png</file>
     <file>png/play.128.png</file>
+    <file>png/plus.16.png</file>
+    <file>png/plus.32.png</file>
+    <file>png/plus.64.png</file>
+    <file>png/plus.128.png</file>
     <file>png/prev.16.png</file>
     <file>png/prev.32.png</file>
     <file>png/prev.64.png</file>
diff --git a/app/ui/style/olive-dark/png/minus.128.png b/app/ui/style/olive-dark/png/minus.128.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db41bae72beff90ee6cb80d09ba376d740f737e
GIT binary patch
literal 760
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z$hLzpWB=2SsX#%=64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S<K#Cko
zOEU6{7<?0pN;2~lf=Y|C^UJoMJ~I<2ZwxV{v?w{1A)}<Ez)D{~IX^cyKd)G?JTp5p
zH#H?Q5oDY`h^HTtn3tX(pP8JW7dKyH0s{k+n5T<lNX4ADx9r#ZW{R*sxUa2rQAkPX
zu1krK*1{bNA1Hf#5#H*y&_VO#a<Q+y?;ASVrb_NTY2u>N@=fee(456{j{JUCYyPP6
z)#vE<p4V<!KYz1V2<R&8Ab~UYTvBMM#mSc{%O}ZrZBjq^&hq>Z-dxq6GoF-AQuq9q
zwf3)d_{T`L1*`g0c1{WXe6y~9(w)4ud*?)Dd}0W>`cvilq&IV-y7lI7mTKA^+~p(H
zuxi)5Cx@m;`E0uxwcASSo}tv5Roxf=%s<$=>Q}LeO$qyoRgXR2r5|E2T&?eUZu_-=
zFM0dSK74A?`Fwlg6R*(H_zQP^*Q}cC+4uF?jWYMib6)WF#vFalW~B2tCqE&D!3@Ys
zUTl8Blp%Dh_Q}S3&Jkx0miF(9elMF)pH^3MW=+(jTHD5Zj4RHa-@Ip?+*iH>yYDea
zgs4{D7k(ktaP8J|mHcWWomXdfx!=!y5`W-vBhTp<@6MiJu#q^ip{IRs<2%NTwYI*W
z%Jchjzwg=lZH>9fFPr~vVfqR`ENjlKQoq~Amhku5%WEFfatk+a{g$L+@y9KHZ|5e<
zS?Ol8*KVy|oT#0+f1Uh(p>Joaq<;iWGA_RQq&_rk|F`#NHp<$3kNP1W$$N17)(?9(
zirHNao5b%Kr&>AdNnrNd{qn!3Vvi!AXhU2)qoi@llk9h#F(5^ru6{1-oD!M<M+`#c

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-dark/png/minus.16.png b/app/ui/style/olive-dark/png/minus.16.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb62f33a8df7d298a48e10427730c7594dc7722a
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zFmD85#;?t9J%NIfC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F
zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq<tSft9{~a(-@ZeqOO&d1iKI
zZfZ(qBFH#>5KliOF)uwoJ~KH#FK)iZ1fcdXPZ!4!i{7{A5Ar$$h`3z*e4&}I<gi=d
zs*MY!WiuYtOAC6tBt3qYHfi?B51(xrEuS;VzUsc$rKuFORou31_G8s!N&G*T)fDWz
muxRHC-5JVCwzB^!C-Xje#W%@k#{3AN4Gf;HelF{r5}E+WhHeS~

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-dark/png/minus.32.png b/app/ui/style/olive-dark/png/minus.32.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a694721dd2074b3076440de013a5b4ad99f8666
GIT binary patch
literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
z*pon*(V}YRZJ?lJiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0u_AVrR)
zB^mie48Dm)C7F2&L8Zmn`DNQrpP31iH-;EeT9lm1kWo@nV5P60oS&PUpI59`o|&DQ
zo0^iD2r^C|#M2K+%uCOY&rHtGi<_@80jPbFr;B4qMC;p28#xaJh_pWZ-_bgCs@@}+
zz6TPL4ndJGg!~pfkcxEiUfu8{%Eh_E^J%x)^VfR(?=1QCX3U)Vcjhf;mop7K5zO63
zBF!H#y-}U&%)0G>T4BNUz@UGD3Q8;@2Wp-$l_#ibGN>uHe_eUYIrzcV7k`?WmVbZG
xxNPom*$)fs4y8VNp#4=)PUyX<vGMP7!ac{O>aYJjIT`3W22WQ%mvv4FO#mNniX;F4

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-dark/png/minus.64.png b/app/ui/style/olive-dark/png/minus.64.png
new file mode 100644
index 0000000000000000000000000000000000000000..85d53427097fa7b5ae78ff90042a94c9a9279c8b
GIT binary patch
literal 483
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S<K#Cko
zOEU6{7<?0pN;2~lf=Y|C^UJoMJ~I<2ZwxV{v?w{1A)}<Ez)D{~IX^cyKd)G?JTp5p
zH#H?Q5oDY`h^HTtn3tX(pP8JW7dKyH0s{jhqo<2wNX4AD*L=N>I0&>o+#Vx&Q2NY|
z=IwzJdmHrJ_D<EdZEU*drqpa6AW{C*seGAnljkvm_nX(|{aBSTiOF-43Iyf0MU*NS
zmp5=fV6k9WHP86(RiPD)?hnkArscLrvrm}Wet>tw{m4Cudl{|^22SS_0SfItz-;i=
z?)n0;13F6gW_LyFim#Wb|IAQ*Aa&&pvxdv>Hm^Awx$=TV!<jV=p817s=4a2mUFP(X
zHKjlC-_&D_E=SluSQSjO)7@A7YvEhzg8RWUN;SSc%HL3;t#q%!GXC_Dh^q(oT(S9+
zC%Ueo_<@8)lFaH4#vfSjtc_|_g*khRrX3^mZIiZM&5o(Suw?Lb^>bP0l+XkKyPLeY

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-dark/png/plus.128.png b/app/ui/style/olive-dark/png/plus.128.png
new file mode 100644
index 0000000000000000000000000000000000000000..02f7da28a6b1288b61ebc8294db71d44f108d2f7
GIT binary patch
literal 1328
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z$hLzpWB=2SsX#%=64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S<K#Cko
zOEU6{7<?0pN;2~lf=Y|C^UJoMJ~I<2ZwxV{v?w{1A)}<Ez)D{~IX^cyKd)G?JTp5p
zH#H?Q5oDY`h^HTtn3tX(pP8JW7dKyH0??g)o-U3d6?5L+wa<tPl{o(K{pF~GSCgg&
zsdv8!$%x(3m8pB<sO^M<O$zJECcawWB&c<(%kP#i&$@NT#6;HyuipG$ELTA1ZH9xi
zeEWB{tqRZPRG<4>Jnw!w@A=8w@8ri#diE?vKoABd9=mx%KSAf+KJFXLIZWnf-h7`J
ze@WvI%Y%1pGHiX!-Usgf`F(#sUk%%unKzd%jK3e@1eD@uT;9NZTV^NIp1id1S9@1w
zX4o;5+cWOrc;g{+m*pJO`<XMR*Tn{3EMa(8Cl&E-XWG>>ae5!CmT7!lon&_BujH@z
zng-GG`dtU+d1if*J#bf^#g3^=ENUmGO={YG(Oc${YxgnFS#sy-^4ni)4%SY-7y~rN
zzF^6rSIO_{;#>DF&eCIe5V3S`SmF1KD4quwyLQX3-cc>0%eG<rqj$BU<^79}GL)S!
z`K|$!?3?*c&b6D-gNapO4ikqTBg=AzreKDHnhg&`916G;EXWXE_d?L{?n55;$UmLm
z_8ypP^5c66^KFJa27BgsCh@axeg~cI28GcEi)l|YI%_}e*JDWco)dY+nxQ<NEsino
z^=|J;Ih#5j+_m$rVtw##J(G5AnMeNKbB1UBsa?1`-&wq#E9}nSn|B_rDF+5BOHD^z
z*NiUv##H0qR;32tnf6^s4m)+5anF^x9rJ8v9J$NS%pUxF$u8ythgUjV#veUyoR%Wt
zzl`q*%Z4e2%7-JoWIebJ+|6fy=lNH~XvW^Vrnk0TDQ~bfsXA1l%(Fu~Rl&3&ZT_5#
z6P9F8kvgz`<$MRWrw6u9X<Wi^<_-UY=~E;nuT+)yZqt3fyulx2^2zIJ>J3|aBqfij
zuVg;SSi&Eg^RKeXxa8)UeO|Js{{H`CtW(FRczMIgN3&E;b1nG2_VR4Y%|S<{)4uth
zOZb-mWtVkeSn>0vGeV86=UcCdKJ+a6PxPT}CFRWXS>|bM4gNQI^N+m$F`c`cz3+?d
zoA1gJy}k9l+xFJ)TNz{6>zMQy#m~Gs9&~#4@2t}A@>%c9H~%&L&hNXul$G*Wg(r=z
z5(nIl-rXO1$F@t1d57KQyNfdn8@_h!ULOV)`H{42xBJB;2Jw}}bJmvco_#5X;qFFF
zQ@txuCnsAjTeOqG>UqO#*6(*&?rH7FH=4zB;LJYOIPD#uN=_c%>gPF`kzvNo-%~7)
z7hFAKr?DY@(kyG0S7Gn!m@HV|_{g%}Gu*trd;bc~Ogjc(+@E+9+1|d*vPjZma`m5A
zb6PkOx_8?jdUP?XpZRy*&kvywiXS|l6TJPoRtUrYC+~Lu_|52jJ!t+GMI|^e60T>w
YJ^QTV#Xk?4fdvzTr>mdKI;Vst0LY|67XSbN

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-dark/png/plus.16.png b/app/ui/style/olive-dark/png/plus.16.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8280ca599087c3ad68b3529932ad5c8ca1205ec
GIT binary patch
literal 403
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zFmD85#;?t9J%NIfC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F
zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq<tSft9{~a(-@ZeqOO&d1iKI
zZfZ(qBFH#>5KliOF)uwoJ~KH#FK)iZ1fcefo-U3d7QII&ZR9=Vz~egKxom;s6deXx
z;|2lACcSI}UMH_>4XgsZB{~!R4+`G7)2YlFzv;>D{J)>=rP&T8wJc#;(ZFXhD{}f$
zolNbQQc1$AwS}aFr~B6n{@`k6^?G5S!`mZk{(a|?xz_d#$Ik3BiU~Pj_wj;J%W)2i
zJ-Qm3Kg+T0Z51^rzSGp-Yg|xthc#pJZpD>l)d9y}{j)zd<-pyi+am%cl^fcwuVA><
dv+UCc7Ev*4MdwvVOo5JP@O1TaS?83{1OTS>ksSa4

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-dark/png/plus.32.png b/app/ui/style/olive-dark/png/plus.32.png
new file mode 100644
index 0000000000000000000000000000000000000000..27e50d8ce885b00a3e0de0a208d8c35694879547
GIT binary patch
literal 478
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
z*pon*(V}YRZJ?lJiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0u_AVrR)
zB^mie48Dm)C7F2&L8Zmn`DNQrpP31iH-;EeT9lm1kWo@nV5P60oS&PUpI59`o|&DQ
zo0^iD2r^C|#M2K+%uCOY&rHtGi<_@80jT|tr;B4qMC;q>{$7V2B;4<-JMAu7YW{&`
zo^$>K!#h{A3ZFXZKjajt>ix!I>$tl_Rb+m*3#Z{UvwFd2j$)s^e>_vIF-}yt$nbSV
zW^WYhm5o-+Vy}Ysh9CD$<rCZy8oo3;XnELO|BA?ov0pU{cBNmN>5#3`sA90gL4^Hh
zUYYZ@bJ@D9Wpf%VKZpp**K?j}cs)&B@3W8~|9+M$3}Od7k2AeL;OfG0_{)Lx!Vk(5
zr1ySR`0(rRH-_U&XZIhNwubY3)VvDcYc1!G8myXsw|Cd7Q_7G2T!?CZ&+Mtd`6s&3
z*LB;w;DmkY*LYuf>^;q|>Rr03uS!^>!{wj2@0DlVYCRcpJ<c6Dz;IyjboFyt=akR{
E03>v|e*gdg

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-dark/png/plus.64.png b/app/ui/style/olive-dark/png/plus.64.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e82c2fdc9262e6f0d1d4951c1aef2ce1ed9010a
GIT binary patch
literal 743
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S<K#Cko
zOEU6{7<?0pN;2~lf=Y|C^UJoMJ~I<2ZwxV{v?w{1A)}<Ez)D{~IX^cyKd)G?JTp5p
zH#H?Q5oDY`h^HTtn3tX(pP8JW7dKyH0s{jRtEY=&NX4ADvmJ|s0tMRkpX=I~q_-er
zktOdmLvaIcp(3r)h2j%jilnA;+;h-QxvqCFWTMkOg+s6Tmh4x(e5K~Exappk=FE-)
zERFoDqE=>|zU;Whf5ob52Yw5tc~|878|^;Cxzt7en!&bUm3{;Nfy+K8IV?mcE}S|!
zl3~>^jvq`m(E(Mwd&DMs7HTFOf23lnu9GL1AYTz3mfDrdFxP3TcB15ggF;*NyCcse
zNIHbBC{xv8-Z9;U;U3dHoP^FCj;oXB2tN?bj7Th7{%yWbgQ5Y0o!%@RQ=lu@4_H6=
zdFxBgPPQsv<6}8MS4iw&xb^zGQ7Vf}=ZW`~?6cP~rsvdsp73nK@}14TjC&&YcS|4N
z$z04FaJB2tn>yjl=Vc3u_A}^e6tABl-OzD|$-Xz%%V<^gukK~p4*Mtcu-}Y(lyC5T
zZPoN`-cdd|TFwh*XUqM|)r^_=?UmIM+1b7kT=mTB8vM0&Td#Mns*7C~=fdZ`^Ul+Q
z_j%p$dMko$!<o(d&5!D&ZQyxOz3|plAeGg5%h9k~Qiokhw7~OLLT-}BtcSVRAAc%!
zw!JjL=s5p_JF6-`RHmj)-x6MarsR<go89ENnJ4)Sw)2JNR_-?uWpVtl;3sp}xq`UL
TJITDj^u*xl>gTe~DWM4f1iUH3

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-dark/svg/minus.svg b/app/ui/style/olive-dark/svg/minus.svg
new file mode 100644
index 000000000..e0607b229
--- /dev/null
+++ b/app/ui/style/olive-dark/svg/minus.svg
@@ -0,0 +1,817 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="add-button.svg"
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="/Users/pablo/olive_pablo/icons/add-button.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs14">
+    <linearGradient
+       id="linearGradient3253">
+      <stop
+         id="stop3255"
+         offset="0"
+         style="stop-color:#89d5f8;stop-opacity:1;" />
+      <stop
+         id="stop3257"
+         offset="1"
+         style="stop-color:#00899e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11979">
+      <stop
+         id="stop11981"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop11983"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5736"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient2846">
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2848" />
+      <stop
+         style="stop-color:#484848;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2850" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2366">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2368" />
+      <stop
+         id="stop2374"
+         offset="0.50000000"
+         style="stop-color:#ffffff;stop-opacity:0.21904762;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2370" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4467">
+      <stop
+         id="stop4469"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4471"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.24761905;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4454">
+      <stop
+         id="stop4456"
+         offset="0.0000000"
+         style="stop-color:#729fcf;stop-opacity:0.20784314;" />
+      <stop
+         id="stop4458"
+         offset="1.0000000"
+         style="stop-color:#729fcf;stop-opacity:0.67619050;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4440">
+      <stop
+         id="stop4442"
+         offset="0"
+         style="stop-color:#7d7d7d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#b1b1b1;stop-opacity:1.0000000;"
+         offset="0.50000000"
+         id="stop4448" />
+      <stop
+         id="stop4444"
+         offset="1.0000000"
+         style="stop-color:#686868;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient2097"
+       cx="23.070683"
+       cy="35.127438"
+       fx="23.070683"
+       fy="35.127438"
+       r="10.31934"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7922"
+       x1="16.874998"
+       y1="22.851799"
+       x2="27.900846"
+       y2="34.976799"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7186"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient7184"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient7180"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7189"
+       gradientUnits="userSpaceOnUse"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientTransform="rotate(180,23.96967,25.01237)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7185"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1322"
+       id="linearGradient4975"
+       x1="34.892849"
+       y1="36.422989"
+       x2="45.918697"
+       y2="48.547989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.01785,-13.57119)" />
+    <linearGradient
+       id="linearGradient1322">
+      <stop
+         id="stop1324"
+         offset="0.0000000"
+         style="stop-color:#729fcf" />
+      <stop
+         id="stop1326"
+         offset="1.0000000"
+         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient1491"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       id="linearGradient2402">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop2404" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop2406" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2871">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2873" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop2875" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient2696"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2690">
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:1;"
+         offset="0"
+         id="stop2692" />
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:0;"
+         offset="1"
+         id="stop2694" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2682"
+       id="linearGradient2688"
+       x1="36.713837"
+       y1="31.455952"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         style="stop-color:#3977c3;stop-opacity:1;"
+         offset="0"
+         id="stop2684" />
+      <stop
+         style="stop-color:#89aedc;stop-opacity:0;"
+         offset="1"
+         id="stop2686" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2380">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop2382" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop2384" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient1486"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.30498,-6.043298)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2833" />
+      <stop
+         id="stop2855"
+         offset="0.33333334"
+         style="stop-color:#5b86be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#83a8d8;stop-opacity:0;"
+         offset="1"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient1488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(180,-0.62124,20.04085)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient1503"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2833" />
+    <linearGradient
+       id="linearGradient3864">
+      <stop
+         id="stop3866"
+         offset="0"
+         style="stop-color:#71b2f8;stop-opacity:1;" />
+      <stop
+         id="stop3868"
+         offset="1"
+         style="stop-color:#002795;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient2571"
+       gradientUnits="userSpaceOnUse"
+       cx="342.58258"
+       cy="27.256668"
+       fx="342.58258"
+       fy="27.256668"
+       r="19.571428"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3352"
+       gradientUnits="userSpaceOnUse"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428"
+       gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <linearGradient
+       id="linearGradient3593">
+      <stop
+         style="stop-color:#c8e0f9;stop-opacity:1;"
+         offset="0"
+         id="stop3595" />
+      <stop
+         style="stop-color:#637dca;stop-opacity:1;"
+         offset="1"
+         id="stop3597" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3354"
+       gradientUnits="userSpaceOnUse"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428"
+       gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3372" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)"
+       cx="342.58258"
+       cy="27.256668"
+       fx="342.58258"
+       fy="27.256668"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3380"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       cx="320.44025"
+       cy="113.23357"
+       fx="320.44025"
+       fy="113.23357"
+       r="19.571428" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="linearGradient3914"
+       x1="6.94525"
+       y1="36.838673"
+       x2="48.691113"
+       y2="36.838673"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="linearGradient3792"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)"
+       x1="6.8300767"
+       y1="34.146042"
+       x2="48.691113"
+       y2="36.838673" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3812"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       cx="320.44025"
+       cy="113.23357"
+       fx="320.44025"
+       fy="113.23357"
+       r="19.571428" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2734" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient3850"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient3850-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective5736-4" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       r="10.31934"
+       fy="35.127438"
+       fx="23.070683"
+       cy="35.127438"
+       cx="23.070683"
+       id="radialGradient2097-2"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <radialGradient
+       r="15.644737"
+       fy="36.421127"
+       fx="24.837126"
+       cy="36.421127"
+       cx="24.837126"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1503-3"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2833-5"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)"
+       r="19.571428"
+       fy="27.256668"
+       fx="342.58258"
+       cy="27.256668"
+       cx="342.58258"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2571-4"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="translate(-0.1767767,-2.6516504)"
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3352-1"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="translate(-0.1767767,-2.6516504)"
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3354-1"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3372-5"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="19.571428"
+       fy="27.256668"
+       fx="342.58258"
+       cy="27.256668"
+       cx="342.58258"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3369-3"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3372-9"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3375-2"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="113.23357"
+       fx="320.44025"
+       cy="113.23357"
+       cx="320.44025"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3380-0"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3812-9"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3814-9"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="113.23357"
+       fx="320.44025"
+       cy="113.23357"
+       cx="320.44025"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3816-2"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2734-9"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-8"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-4-2"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="30.888147"
+     inkscape:cx="33.014148"
+     inkscape:zoom="10.726351"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#ffffff"
+     pagecolor="#000000"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid0001"
+       color="#ffffff"
+       opacity="0.15686275"
+       empcolor="#ffffff"
+       empopacity="0.31372549"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid0002"
+       spacingx="32"
+       spacingy="32"
+       empspacing="2"
+       empcolor="#ffffff"
+       empopacity="0.47058824"
+       color="#ffffff"
+       opacity="0.31372549"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1"
+     transform="translate(0,16)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.86274511;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 12 26 A 6.0006 6.0006 0 1 0 12 38 L 52 38 A 6.0006 6.0006 0 1 0 52 26 L 38 26 z "
+       transform="translate(0,-16)"
+       id="path11935" />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-dark/svg/plus.svg b/app/ui/style/olive-dark/svg/plus.svg
new file mode 100644
index 000000000..7f2db112c
--- /dev/null
+++ b/app/ui/style/olive-dark/svg/plus.svg
@@ -0,0 +1,817 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="add-button.svg"
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="/Users/pablo/olive_pablo/icons/add-button.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs14">
+    <linearGradient
+       id="linearGradient3253">
+      <stop
+         id="stop3255"
+         offset="0"
+         style="stop-color:#89d5f8;stop-opacity:1;" />
+      <stop
+         id="stop3257"
+         offset="1"
+         style="stop-color:#00899e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11979">
+      <stop
+         id="stop11981"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop11983"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5736"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient2846">
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2848" />
+      <stop
+         style="stop-color:#484848;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2850" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2366">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2368" />
+      <stop
+         id="stop2374"
+         offset="0.50000000"
+         style="stop-color:#ffffff;stop-opacity:0.21904762;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2370" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4467">
+      <stop
+         id="stop4469"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4471"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.24761905;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4454">
+      <stop
+         id="stop4456"
+         offset="0.0000000"
+         style="stop-color:#729fcf;stop-opacity:0.20784314;" />
+      <stop
+         id="stop4458"
+         offset="1.0000000"
+         style="stop-color:#729fcf;stop-opacity:0.67619050;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4440">
+      <stop
+         id="stop4442"
+         offset="0"
+         style="stop-color:#7d7d7d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#b1b1b1;stop-opacity:1.0000000;"
+         offset="0.50000000"
+         id="stop4448" />
+      <stop
+         id="stop4444"
+         offset="1.0000000"
+         style="stop-color:#686868;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient2097"
+       cx="23.070683"
+       cy="35.127438"
+       fx="23.070683"
+       fy="35.127438"
+       r="10.31934"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7922"
+       x1="16.874998"
+       y1="22.851799"
+       x2="27.900846"
+       y2="34.976799"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7186"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient7184"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient7180"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7189"
+       gradientUnits="userSpaceOnUse"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientTransform="rotate(180,23.96967,25.01237)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7185"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1322"
+       id="linearGradient4975"
+       x1="34.892849"
+       y1="36.422989"
+       x2="45.918697"
+       y2="48.547989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.01785,-13.57119)" />
+    <linearGradient
+       id="linearGradient1322">
+      <stop
+         id="stop1324"
+         offset="0.0000000"
+         style="stop-color:#729fcf" />
+      <stop
+         id="stop1326"
+         offset="1.0000000"
+         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient1491"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       id="linearGradient2402">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop2404" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop2406" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2871">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2873" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop2875" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient2696"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2690">
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:1;"
+         offset="0"
+         id="stop2692" />
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:0;"
+         offset="1"
+         id="stop2694" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2682"
+       id="linearGradient2688"
+       x1="36.713837"
+       y1="31.455952"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         style="stop-color:#3977c3;stop-opacity:1;"
+         offset="0"
+         id="stop2684" />
+      <stop
+         style="stop-color:#89aedc;stop-opacity:0;"
+         offset="1"
+         id="stop2686" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2380">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop2382" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop2384" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient1486"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.30498,-6.043298)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2833" />
+      <stop
+         id="stop2855"
+         offset="0.33333334"
+         style="stop-color:#5b86be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#83a8d8;stop-opacity:0;"
+         offset="1"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient1488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(180,-0.62124,20.04085)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient1503"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2833" />
+    <linearGradient
+       id="linearGradient3864">
+      <stop
+         id="stop3866"
+         offset="0"
+         style="stop-color:#71b2f8;stop-opacity:1;" />
+      <stop
+         id="stop3868"
+         offset="1"
+         style="stop-color:#002795;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient2571"
+       gradientUnits="userSpaceOnUse"
+       cx="342.58258"
+       cy="27.256668"
+       fx="342.58258"
+       fy="27.256668"
+       r="19.571428"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3352"
+       gradientUnits="userSpaceOnUse"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428"
+       gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <linearGradient
+       id="linearGradient3593">
+      <stop
+         style="stop-color:#c8e0f9;stop-opacity:1;"
+         offset="0"
+         id="stop3595" />
+      <stop
+         style="stop-color:#637dca;stop-opacity:1;"
+         offset="1"
+         id="stop3597" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3354"
+       gradientUnits="userSpaceOnUse"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428"
+       gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3372" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)"
+       cx="342.58258"
+       cy="27.256668"
+       fx="342.58258"
+       fy="27.256668"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3380"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       cx="320.44025"
+       cy="113.23357"
+       fx="320.44025"
+       fy="113.23357"
+       r="19.571428" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="linearGradient3914"
+       x1="6.94525"
+       y1="36.838673"
+       x2="48.691113"
+       y2="36.838673"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="linearGradient3792"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)"
+       x1="6.8300767"
+       y1="34.146042"
+       x2="48.691113"
+       y2="36.838673" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3812"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       cx="320.44025"
+       cy="113.23357"
+       fx="320.44025"
+       fy="113.23357"
+       r="19.571428" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2734" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient3850"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient3850-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective5736-4" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       r="10.31934"
+       fy="35.127438"
+       fx="23.070683"
+       cy="35.127438"
+       cx="23.070683"
+       id="radialGradient2097-2"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <radialGradient
+       r="15.644737"
+       fy="36.421127"
+       fx="24.837126"
+       cy="36.421127"
+       cx="24.837126"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1503-3"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2833-5"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)"
+       r="19.571428"
+       fy="27.256668"
+       fx="342.58258"
+       cy="27.256668"
+       cx="342.58258"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2571-4"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="translate(-0.1767767,-2.6516504)"
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3352-1"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="translate(-0.1767767,-2.6516504)"
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3354-1"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3372-5"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="19.571428"
+       fy="27.256668"
+       fx="342.58258"
+       cy="27.256668"
+       cx="342.58258"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3369-3"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3372-9"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3375-2"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="113.23357"
+       fx="320.44025"
+       cy="113.23357"
+       cx="320.44025"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3380-0"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3812-9"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3814-9"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="113.23357"
+       fx="320.44025"
+       cy="113.23357"
+       cx="320.44025"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3816-2"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2734-9"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-8"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-4-2"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="30.888147"
+     inkscape:cx="33.014148"
+     inkscape:zoom="10.726351"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#ffffff"
+     pagecolor="#000000"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid0001"
+       color="#ffffff"
+       opacity="0.15686275"
+       empcolor="#ffffff"
+       empopacity="0.31372549"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid0002"
+       spacingx="32"
+       spacingy="32"
+       empspacing="2"
+       empcolor="#ffffff"
+       empopacity="0.47058824"
+       color="#ffffff"
+       opacity="0.31372549"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1"
+     transform="translate(0,16)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.86274511;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 31.910156 5.9160156 A 6.0006 6.0006 0 0 0 26 12 L 26 26 L 12 26 A 6.0006 6.0006 0 1 0 12 38 L 26 38 L 26 52 A 6.0006 6.0006 0 1 0 38 52 L 38 38 L 52 38 A 6.0006 6.0006 0 1 0 52 26 L 38 26 L 38 12 A 6.0006 6.0006 0 0 0 31.910156 5.9160156 z "
+       transform="translate(0,-16)"
+       id="path11935" />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-light/olive-light.qrc b/app/ui/style/olive-light/olive-light.qrc
index a1469343d..cd2f5eec6 100644
--- a/app/ui/style/olive-light/olive-light.qrc
+++ b/app/ui/style/olive-light/olive-light.qrc
@@ -1,7 +1,7 @@
 <RCC>
   <qresource prefix="/style/olive-light">
-    <file>palette.ini</file>
     <file>style.css</file>
+    <file>palette.ini</file>
     <file>png/add-button.16.png</file>
     <file>png/add-button.32.png</file>
     <file>png/add-button.64.png</file>
@@ -94,6 +94,10 @@
     <file>png/magnet.32.png</file>
     <file>png/magnet.64.png</file>
     <file>png/magnet.128.png</file>
+    <file>png/minus.16.png</file>
+    <file>png/minus.32.png</file>
+    <file>png/minus.64.png</file>
+    <file>png/minus.128.png</file>
     <file>png/new.16.png</file>
     <file>png/new.32.png</file>
     <file>png/new.64.png</file>
@@ -114,6 +118,10 @@
     <file>png/play.32.png</file>
     <file>png/play.64.png</file>
     <file>png/play.128.png</file>
+    <file>png/plus.16.png</file>
+    <file>png/plus.32.png</file>
+    <file>png/plus.64.png</file>
+    <file>png/plus.128.png</file>
     <file>png/prev.16.png</file>
     <file>png/prev.32.png</file>
     <file>png/prev.64.png</file>
diff --git a/app/ui/style/olive-light/png/minus.128.png b/app/ui/style/olive-light/png/minus.128.png
new file mode 100644
index 0000000000000000000000000000000000000000..e538ac4302d9a36031db050f71b19fd15a84a706
GIT binary patch
literal 923
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z$hLzpWB=2SsX#%=64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S<K#Cko
zOEU6{7<?0pN;2~lf=Y|C^UJoMJ~I<2ZwxV{v?w{1A)}<Ez)D{~IX^cyKd)G?JTp5p
zH#H?Q5oDY`h^HTtn3tX(pP8JW7dKyH0s{lnPEQxdkcv5PZ*9yH2^2Z@u{f<cVXCZn
zx$C2}7}pjDmbEHMiekSwDqBL7%*4W`IVQj5?(k2T>@w+4gk@M**X%PoLLD0At2z>&
z-&nF?(jDu`h7bN<uTR&TV|@6`Tx}+x1Bn2$7L<xf^RR`V+7x53IeJyq!87MNPQ0{Q
z|55%{_*MBdv!JWn14Z^q^0m)@trd5gLB+G^>KVDN6Hc;UKa{W9CFgqa^TUE4E3?*y
zU1jo|q%-R#x8Tl@tzvyS3QFB?%YGlQoF1kblF2Yhr7|gv-$i9r5WAz2;LPsFJ08!u
z&7&)1!vNGY^JY+n+}4?M=gj#NDdKuzvce151^3_I?^yI=>deCD^BGn}&AOR1Emgi|
zvm<ZMq8EZ^?JfDLKSnU+WxQAW_WQ4;@$PrC4{zLUW@}q}+5Cwu!>X$D=FMp<Ud7(`
zIgwmrr_h{s<~Q3OwuH2_XHz=neBR43D>3ake|1Sp9P@)Yuf5LRKE7hAm}}uR^#`U5
ztFr1|J6^7-eqze7H!k1bMWSi)>0Ni<na^*y&afo2YQd`Ab=gkAAz!m+En~NvIbnT6
zZv)S)hj*plGisbJx(c**#?4vz$Eq1V+1wAh>a|}X&_1+we(Fu@`!N^l_RZ8?oh3QR
z^>0XNPTFb3n+xtAbPas7?e^PvB_r`k?t9O?$(;9mz4NAn&l%?wXUZIx6`aYtw((WS
z*VJjL+6#YrsW;6jo?R&OzVk%x!;pZ*A*E|pX<J)cpI>!lWsTYe%kLX6zg*Mh;qRiy
z6@B#hS(lWxSF`TkzjtrlAJ?$#&C8Z8)ART7x%2aJM1{MBSlrcptLn@*$AoS__W0wk
m43l4<){C<ekz9aE{`_GJJAWv&WRt`mkOogzKbLh*2~7Y5v3m&s

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-light/png/minus.16.png b/app/ui/style/olive-light/png/minus.16.png
new file mode 100644
index 0000000000000000000000000000000000000000..4056ce82803a59a60a1026612d9e7c198bd9c311
GIT binary patch
literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zFmD85#;?t9J%NIfC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F
zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq<tSft9{~a(-@ZeqOO&d1iKI
zZfZ(qBFH#>5KliOF)uwoJ~KH#FK)iZ1fcdrPZ!4!i{9h}307u)iG?PUo0^*BnVFj{
zCjN@EtN4&0%*=e)UW^S0EG>6F`2YX^_Q^?`_w2Fxe7K$ex{>40|DG3ncqZ(9@caM&
wdecQFhDP_QK0G*>#>UoG|0K$WYXv96B2n>|ue`l<fR-_My85}Sb4q9e06bi8djJ3c

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-light/png/minus.32.png b/app/ui/style/olive-light/png/minus.32.png
new file mode 100644
index 0000000000000000000000000000000000000000..f87eb8fe8e7fb92162e761c1139fd7e98e448c46
GIT binary patch
literal 403
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
z*pon*(V}YRZJ?lJiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0u_AVrR)
zB^mie48Dm)C7F2&L8Zmn`DNQrpP31iH-;EeT9lm1kWo@nV5P60oS&PUpI59`o|&DQ
zo0^iD2r^C|#M2K+%uCOY&rHtGi<_@80jPbWr;B4qMC;p2hFnaB0<910r!=hLh+eYg
zhIR$N;GTx%8@_N<3tF@4Cp=gD#=^xN9i@`2$bIve)23TzuAlvIg2(fKL~_qhW6$nY
ztI}5O5}&wr)vq&~<qjOR3^(`v{ATuLlfY?D8E-JUK6}VeoFM8HQ4(AJcJ^cyg;l#G
z6F)R`<ap-QeNwcZHbd+sla|tRd7T2LE&6Qr2deA44aE*j`ab(<347nUox5^xPxzUW
e+++BxTL1A|b?L1vSMLBF&*16m=d#Wzp$Pybj+d|i

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-light/png/minus.64.png b/app/ui/style/olive-light/png/minus.64.png
new file mode 100644
index 0000000000000000000000000000000000000000..e80dc8d4dc3f15042000719eb7c44dc74b9303de
GIT binary patch
literal 562
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S<K#Cko
zOEU6{7<?0pN;2~lf=Y|C^UJoMJ~I<2ZwxV{v?w{1A)}<Ez)D{~IX^cyKd)G?JTp5p
zH#H?Q5oDY`h^HTtn3tX(pP8JW7dKyH0s{kMfTxRNNX4AD*Eaec3J_s?@IPdUl9`{5
z@5a(ci85a}Wdh_6l`|&C%$2E`;TMx-E~Dbq&{7~1QT;k0zwt-?YfJN=@8>Vu$smXX
z{_=mi?Ih8*{A}9iu+a4kDhyHQg8!a%a&cq0cm4HO?|IL=H$A<?^vGf#ivfc`xWooO
zwgZPNY~*f=+1y@m{WUAYyn-Fm*|){N*>L&goSR~6Sl5KDu4ag3U-+u*V&3-mInLRP
z4C`cDZgPh1-FTLZyJOLcrK=|H_SpJb&9f-TL_=r6#f%lVZGJD_z>s_<$mP?n!xmE{
zlc%{hZ>m2qd$GY*VZqn2Ygm8mvuF75P$h8hrk^!-TX@&9F3J4GyP*GV@}q!WmnHTy
zebTnIF5Yzc^2;yU98KYZGb`tn^C>VC#FU=u(sfY@z4{#Jxf!W9pRZ#^^0?qdyB~}h
Xd;A@$H6oS)qlUrL)z4*}Q$iB}qB7g`

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-light/png/plus.128.png b/app/ui/style/olive-light/png/plus.128.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf6563f68f6ee823f2d70ff23bc803145c6d298d
GIT binary patch
literal 1621
zcmb_di#OD182+(XqFEEI+$O1wwaj4LM#}9cx2Rl0ZaWxE3^Rjq2}_!v6b<V#DD7BO
z%a97?64{1b6G^$IaSO%7G%Jc>XHL8Sz@B~1dB692p6~sh^M2>N=X}|xT<v%7QrQIn
zz-~te&`p@rMIkLET)U42_X(2($;Qz`T8I?s5J<>nVjO%(0H974g;?GjUZ_x1Cfl7M
zyA#653BklrAR!?E84-;qVS{5rkpv>H?7fAGut-r<WF1EiClCRbU?MppTEi`lgeSx|
z_p#~1bMzOJI3hL_2q%+c%uy&TAu5UxO+qF_;3J|!Ln4Ajb|?`;c?3t}2!Rn;LUcfd
z_Ei9oBsqfC9+YzK<N!f2RIP`%vaYOefEb_L?HAE{WY!6~D6wZG=UYh{hzhWXHR5F;
z<cJ2W0+y_f(_b@|L2d84G9`b!@;KW#pR&h4zDYjcqy&e7epyaAI$Cnwp<)adUp=tS
zfB1Z1g33-#yC*lWM@-oB7g$X(8ck0XMK`w|xx{E+OA^qsva*twmX>B4*FB_=$zQqu
z&W%sbrUxEoRDwqKe%ssZlmf`BQP&RvqZT`j&%U@NedA^1(WuLb#SkoNVTt~rICRXu
zd%D4Ub=XO1%h@XbP`xs?A3hjB4dt^+ym2_3Y3=<-iuap!q|MXKaxD)rOuy%#uN`1i
z`PL0L3^OT{XR;(zt<-wz6$Vui$JJ|JMjpg-J-@lDqt&|(#Hv~T!RA0vaVI_T+~ve7
z&dSbvY(Qa&@DW#sI*`ZUGzj!5YUknu3MG`RYKF#6f~bw_KWO&&)eX;fEEMUr0IXRa
zFXK2#(a!EE(j`VresG#0mD5WSGUpgEeSXSMca?HV{fnl=<!LO}a?wVEK}}d(cDt|-
zFtY;wJOI3rPbW%SVI*#-iJyXrX;XopZU2MZhJX*fC4a>E#Ge3RXp%GdPH}3drmV4*
zy;Tg=8uABNB{_oBoznX00C9)>IT<*{1?)*-XMT;Hmt~clJYVi(#KV|7=9kOUP}$lo
zv+g>zwxE{DfI<19eqXle%6T}(j)FQZg<9A*57ThWFVG|!t|YC_PqEo-%gRCR5wtaP
z9pJ{d;xB*l1y_6Pfv|pX4lJ$i?-`$en9eFmh~fQ)<@>hTV-U~!mF`SNqq2M5nM*ff
zs554%tT-A8C|ls#N*eH;nfMPDSN1=>BUL?nb4k1gfT@|S%EOPo`|J{A4u+)iRiet=
zf#LDPl1Yy#8WbZHZmiFgB7n}BNDUf4TTgQbNF)*-ydZtsx%BD$!#<%yQu}KuG>15$
za6%T%Szb$0MdCkfDX!Y)8tbd~kFYT5x_w3dBb{WZH*v(cUrdhL?aWr&T6oJfVyArP
zGStUhA_|TLg8llWBAnhv4;u@|6yTzmX)wf<<IQ0>+zNcq?fTkOF_dDV27A<Z*JNEF
zY%rkC3ok#|)rJltvbQ`-t8sj0#bT}op6gWS<#&*=Ad?{JvKO64|Fj&WzY&s;QQ#<q
z*9qzd!*z$!Dp-Pj)80?)6g18E+YS1S)CX2<Xc^Wk;bUWCIZXf7fLBC6N@k4T#;@-U
z`B89XLw*&Hk`f#jw{|kHJ2UwnD|XAC#vd}8^q$*_=w532A7<>|K|KqJz0!-+NALK*
zSZ<V10?-^}WD}%l(yH4fsiA2qtCm*TIaVc&1j4p&-5k?&8x>Wh8_a9&C6(7fy-&pF
zi*#Cm&w_2^FyxGl-lhe;QYS+;9fIhV2N|0P``3Al#qyrSLId7`)1D!9?f&&6D^M?d
zKOdaS><Vg_!Fs)vPzK<%`yX%Tk>pGVrZ-;=HR))L0?@W)&ngU!qHXqF)8{K?c4>^j
zYmeAH6O)Jg;M1<r=?~a!b<I*vze-q#4OsKsNYFGoS%_-E&L9ru&f-iheYp^%8!bSG
zby$OzmwML|T_<1P@{nxsY@V2GZ)$3yLN~|GF<Vogi#~>b&<W$ASbHhQE*i?HiX=xn
KSCDBFl<_zJnAQ#e

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-light/png/plus.16.png b/app/ui/style/olive-light/png/plus.16.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a456e85dbc47ef4dbb98b39b8c851cff4b11ead
GIT binary patch
literal 446
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zFmD85#;?t9J%NIfC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6dzfD}2F
zmSp4?G597Hm1O2A1eF$N=a+3ieP$+5-WXy?X;E@2Lq<tSft9{~a(-@ZeqOO&d1iKI
zZfZ(qBFH#>5KliOF)uwoJ~KH#FK)iZ1fcdio-U3d7QII&+U7AC3b@^$!2Kr7<V2Zh
zr`1X)UrCiEPo%b3I!&2Yy};uk&yps&6~{_mmgyf@!uTYqx6Jimc<<L^_x~L1t=e&@
z>fFxli!|CwW8X8pPI<6*e%A?c1HIEmVWC@d*Gw`NnCSSa<fd8ig0*>O6E+8OBr<&w
z{+5)c%pe%axS#WP@KyN-8Vu)lmJ9xT6Y)p+*ba;S3l)pZyxc2HHy`H~s5INWJa~`c
z=F&soR_)r;b76_Vp)+UFmh%^f&NY8}_kYiI9zIW*V$Ykh47Tt8iYOfW!7H=->$RZ&
YmJGHW0{h#{f&OIhboFyt=akR{03D&O@&Et;

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-light/png/plus.32.png b/app/ui/style/olive-light/png/plus.32.png
new file mode 100644
index 0000000000000000000000000000000000000000..25283189a50a1a7c2b1c72539cfe67861771d086
GIT binary patch
literal 531
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
z*pon*(V}YRZJ?lJiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0u_AVrR)
zB^mie48Dm)C7F2&L8Zmn`DNQrpP31iH-;EeT9lm1kWo@nV5P60oS&PUpI59`o|&DQ
zo0^iD2r^C|#M2K+%uCOY&rHtGi<_@8fq{Y1(9^{+B%<~0bX%_@0V1vYU;jvu5DZ!(
zGU*WSj{cA9!@~_*Ti3P<h$k&Qlyl&m>yjB;j0HTFAAAy(q0qQs^7JDLPhP)Me81=L
z@133rOJuEcd5@$`c>g>2K~$(eqv*u+2YFkg_L_dZwUu+hD((l1LgJa^599{xuT~YA
zSlL^a^Eg%1A@pwUmU~PkCnXYi3@RGD)W6i$uUf?|IP-SgYWW)s-pM`!Z4avz{Z9E?
z^c6G5FmCQsXTQPRw@K%=|D-2N1x`mRtg5<n_=u>>lR1}8@fWgvDhlKa*mL#QGtLW(
zR?K0%UK;<|W<Dc(&D+T7YZ}>srX4Q~>j=BgJnwmHX_bg;yYF7M_sq!+h6ncZZdiHo
zTD@e#&ZXb9!~U}#o1x%)xwB(Vt#|*i8P(G3w{c9nTe9SVaK>U^NvXFVfq}=s;OXk;
Jvd$@?2>=zI)xQ7$

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-light/png/plus.64.png b/app/ui/style/olive-light/png/plus.64.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4f69a0c2119e7c837d95d50bde6174f092e0bd6
GIT binary patch
literal 885
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1S<K#Cko
zOEU6{7<?0pN;2~lf=Y|C^UJoMJ~I<2ZwxV{v?w{1A)}<Ez)D{~IX^cyKd)G?JTp5p
zH#H?Q5oDY`h^HTtn3tX(pP8JW7dKyH0s{lnWKS2zkcv5PXP?g#3KVItf6nFnzaw^|
z<nl8ip1<^@{_kms-SS9z#t*%vhP~F07j=G(_2@an@bb_ujg1bR2G?CLZg{|#u=Dwr
zmw%_-asKh_w8H~FW(yg<cIP$)j%$lGq9&Ipyc1s&qSfDaIB{x6T-I87f4Mxti=GPu
zR$P7k_5K{YHH@d8eiB}KW#Tm}gB}w`85Pe<4~mkwAN>C3W;g#o*8-b#6S@B5`nTSe
z%|Gm2xQBzGV&3-lpX~e$6N6s$=FZ>0ftBGy&PB(iR}O79Z`EzMR+Zj)bGcdUvWGUz
z*L2U`<2c8#T}a#^%0UVjF>9x_)4uolKx3D0t>aT*daS?o{}O)}UWVn1FTSX_cP=Qc
z!GNcnL57JVT;qf%&w^Q7k7v|yzj^mgj8W#{J2{(z+GE$emR@qc++cVh!JvXW;dYaV
z`O~v!&oW<5y4L<co7+e!V{QEGYiVp8O$oNi@Bis-%H73eYV4pl{c>4t9=|d3k-{2R
zm)tzbZj;9r`(|yO@Kv%P$+JyX$w;o-&|zVK1<Qp^Nk_al-+p_|r~4Sg<kee#@Azj_
z7@jF`@!!v%KbK}caJ;tJdhR*bjS+u*T&8=i)MapG_!%0#Zib!U)ved$FPr?mkYiS#
z%DXvMmhbR~-$tK3Cxztf^eKK{&%2A^64Rv}xQGI_h#&j+yIk3<X~Y}Np!93wksn5z
z&6_^+{Mhy)Vb-$cX0FQ;xecUx`!?SA7NzWa*?(H;zk^~4MN_wRy`HV)qrz~n@UAw)
znVZ5frgQzCANssUf8KLm#vcsZ)Vy_-tloXCdVl`hxw;~&P9fKev%dHS^R*u?T>q0f
YxMiu1Q}MxgVCrV@boFyt=akR{03XnOaR2}S

literal 0
HcmV?d00001

diff --git a/app/ui/style/olive-light/svg/minus.svg b/app/ui/style/olive-light/svg/minus.svg
new file mode 100644
index 000000000..d10c9606a
--- /dev/null
+++ b/app/ui/style/olive-light/svg/minus.svg
@@ -0,0 +1,817 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="add-button.svg"
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="/Users/pablo/olive_pablo/icons/add-button.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs14">
+    <linearGradient
+       id="linearGradient3253">
+      <stop
+         id="stop3255"
+         offset="0"
+         style="stop-color:#89d5f8;stop-opacity:1;" />
+      <stop
+         id="stop3257"
+         offset="1"
+         style="stop-color:#00899e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11979">
+      <stop
+         id="stop11981"
+         offset="0"
+         style="stop-color:#202020;stop-opacity:1;" />
+      <stop
+         id="stop11983"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5736"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient2846">
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2848" />
+      <stop
+         style="stop-color:#484848;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2850" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2366">
+      <stop
+         style="stop-color:#202020;stop-opacity:1;"
+         offset="0"
+         id="stop2368" />
+      <stop
+         id="stop2374"
+         offset="0.50000000"
+         style="stop-color:#202020;stop-opacity:0.21904762;" />
+      <stop
+         style="stop-color:#202020;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2370" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4467">
+      <stop
+         id="stop4469"
+         offset="0"
+         style="stop-color:#202020;stop-opacity:1;" />
+      <stop
+         id="stop4471"
+         offset="1.0000000"
+         style="stop-color:#202020;stop-opacity:0.24761905;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4454">
+      <stop
+         id="stop4456"
+         offset="0.0000000"
+         style="stop-color:#729fcf;stop-opacity:0.20784314;" />
+      <stop
+         id="stop4458"
+         offset="1.0000000"
+         style="stop-color:#729fcf;stop-opacity:0.67619050;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4440">
+      <stop
+         id="stop4442"
+         offset="0"
+         style="stop-color:#7d7d7d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#b1b1b1;stop-opacity:1.0000000;"
+         offset="0.50000000"
+         id="stop4448" />
+      <stop
+         id="stop4444"
+         offset="1.0000000"
+         style="stop-color:#686868;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient2097"
+       cx="23.070683"
+       cy="35.127438"
+       fx="23.070683"
+       fy="35.127438"
+       r="10.31934"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7922"
+       x1="16.874998"
+       y1="22.851799"
+       x2="27.900846"
+       y2="34.976799"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7186"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient7184"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient7180"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7189"
+       gradientUnits="userSpaceOnUse"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientTransform="rotate(180,23.96967,25.01237)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7185"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1322"
+       id="linearGradient4975"
+       x1="34.892849"
+       y1="36.422989"
+       x2="45.918697"
+       y2="48.547989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.01785,-13.57119)" />
+    <linearGradient
+       id="linearGradient1322">
+      <stop
+         id="stop1324"
+         offset="0.0000000"
+         style="stop-color:#729fcf" />
+      <stop
+         id="stop1326"
+         offset="1.0000000"
+         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient1491"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       id="linearGradient2402">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop2404" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop2406" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2871">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2873" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop2875" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient2696"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2690">
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:1;"
+         offset="0"
+         id="stop2692" />
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:0;"
+         offset="1"
+         id="stop2694" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2682"
+       id="linearGradient2688"
+       x1="36.713837"
+       y1="31.455952"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         style="stop-color:#3977c3;stop-opacity:1;"
+         offset="0"
+         id="stop2684" />
+      <stop
+         style="stop-color:#89aedc;stop-opacity:0;"
+         offset="1"
+         id="stop2686" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2380">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop2382" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop2384" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient1486"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.30498,-6.043298)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2833" />
+      <stop
+         id="stop2855"
+         offset="0.33333334"
+         style="stop-color:#5b86be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#83a8d8;stop-opacity:0;"
+         offset="1"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient1488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(180,-0.62124,20.04085)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient1503"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2833" />
+    <linearGradient
+       id="linearGradient3864">
+      <stop
+         id="stop3866"
+         offset="0"
+         style="stop-color:#71b2f8;stop-opacity:1;" />
+      <stop
+         id="stop3868"
+         offset="1"
+         style="stop-color:#002795;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient2571"
+       gradientUnits="userSpaceOnUse"
+       cx="342.58258"
+       cy="27.256668"
+       fx="342.58258"
+       fy="27.256668"
+       r="19.571428"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3352"
+       gradientUnits="userSpaceOnUse"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428"
+       gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <linearGradient
+       id="linearGradient3593">
+      <stop
+         style="stop-color:#c8e0f9;stop-opacity:1;"
+         offset="0"
+         id="stop3595" />
+      <stop
+         style="stop-color:#637dca;stop-opacity:1;"
+         offset="1"
+         id="stop3597" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3354"
+       gradientUnits="userSpaceOnUse"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428"
+       gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3372" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)"
+       cx="342.58258"
+       cy="27.256668"
+       fx="342.58258"
+       fy="27.256668"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3380"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       cx="320.44025"
+       cy="113.23357"
+       fx="320.44025"
+       fy="113.23357"
+       r="19.571428" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="linearGradient3914"
+       x1="6.94525"
+       y1="36.838673"
+       x2="48.691113"
+       y2="36.838673"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="linearGradient3792"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)"
+       x1="6.8300767"
+       y1="34.146042"
+       x2="48.691113"
+       y2="36.838673" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3812"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       cx="320.44025"
+       cy="113.23357"
+       fx="320.44025"
+       fy="113.23357"
+       r="19.571428" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2734" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient3850"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient3850-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective5736-4" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       r="10.31934"
+       fy="35.127438"
+       fx="23.070683"
+       cy="35.127438"
+       cx="23.070683"
+       id="radialGradient2097-2"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <radialGradient
+       r="15.644737"
+       fy="36.421127"
+       fx="24.837126"
+       cy="36.421127"
+       cx="24.837126"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1503-3"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2833-5"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)"
+       r="19.571428"
+       fy="27.256668"
+       fx="342.58258"
+       cy="27.256668"
+       cx="342.58258"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2571-4"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="translate(-0.1767767,-2.6516504)"
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3352-1"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="translate(-0.1767767,-2.6516504)"
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3354-1"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3372-5"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="19.571428"
+       fy="27.256668"
+       fx="342.58258"
+       cy="27.256668"
+       cx="342.58258"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3369-3"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3372-9"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3375-2"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="113.23357"
+       fx="320.44025"
+       cy="113.23357"
+       cx="320.44025"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3380-0"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3812-9"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3814-9"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="113.23357"
+       fx="320.44025"
+       cy="113.23357"
+       cx="320.44025"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3816-2"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2734-9"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-8"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-4-2"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="30.888147"
+     inkscape:cx="33.014148"
+     inkscape:zoom="10.726351"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#202020"
+     pagecolor="#000000"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid0001"
+       color="#202020"
+       opacity="0.15686275"
+       empcolor="#202020"
+       empopacity="0.31372549"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid0002"
+       spacingx="32"
+       spacingy="32"
+       empspacing="2"
+       empcolor="#202020"
+       empopacity="0.47058824"
+       color="#202020"
+       opacity="0.31372549"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1"
+     transform="translate(0,16)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#202020;fill-opacity:0.86274511;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 12 26 A 6.0006 6.0006 0 1 0 12 38 L 52 38 A 6.0006 6.0006 0 1 0 52 26 L 38 26 z "
+       transform="translate(0,-16)"
+       id="path11935" />
+  </g>
+</svg>
diff --git a/app/ui/style/olive-light/svg/plus.svg b/app/ui/style/olive-light/svg/plus.svg
new file mode 100644
index 000000000..f7483d8b1
--- /dev/null
+++ b/app/ui/style/olive-light/svg/plus.svg
@@ -0,0 +1,817 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="add-button.svg"
+   inkscape:version="0.91+devel+osxmenu r12922"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   viewBox="0 0 64 64"
+   inkscape:export-filename="/Users/pablo/olive_pablo/icons/add-button.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <defs
+     id="defs14">
+    <linearGradient
+       id="linearGradient3253">
+      <stop
+         id="stop3255"
+         offset="0"
+         style="stop-color:#89d5f8;stop-opacity:1;" />
+      <stop
+         id="stop3257"
+         offset="1"
+         style="stop-color:#00899e;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11979">
+      <stop
+         id="stop11981"
+         offset="0"
+         style="stop-color:#202020;stop-opacity:1;" />
+      <stop
+         id="stop11983"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective5736"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 24 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient2846">
+      <stop
+         style="stop-color:#8a8a8a;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2848" />
+      <stop
+         style="stop-color:#484848;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2850" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2366">
+      <stop
+         style="stop-color:#202020;stop-opacity:1;"
+         offset="0"
+         id="stop2368" />
+      <stop
+         id="stop2374"
+         offset="0.50000000"
+         style="stop-color:#202020;stop-opacity:0.21904762;" />
+      <stop
+         style="stop-color:#202020;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2370" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4467">
+      <stop
+         id="stop4469"
+         offset="0"
+         style="stop-color:#202020;stop-opacity:1;" />
+      <stop
+         id="stop4471"
+         offset="1.0000000"
+         style="stop-color:#202020;stop-opacity:0.24761905;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4454">
+      <stop
+         id="stop4456"
+         offset="0.0000000"
+         style="stop-color:#729fcf;stop-opacity:0.20784314;" />
+      <stop
+         id="stop4458"
+         offset="1.0000000"
+         style="stop-color:#729fcf;stop-opacity:0.67619050;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4440">
+      <stop
+         id="stop4442"
+         offset="0"
+         style="stop-color:#7d7d7d;stop-opacity:1;" />
+      <stop
+         style="stop-color:#b1b1b1;stop-opacity:1.0000000;"
+         offset="0.50000000"
+         id="stop4448" />
+      <stop
+         id="stop4444"
+         offset="1.0000000"
+         style="stop-color:#686868;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient2097"
+       cx="23.070683"
+       cy="35.127438"
+       fx="23.070683"
+       fy="35.127438"
+       r="10.31934"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7922"
+       x1="16.874998"
+       y1="22.851799"
+       x2="27.900846"
+       y2="34.976799"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient7186"
+       gradientUnits="userSpaceOnUse"
+       x1="46.834816"
+       y1="45.264122"
+       x2="45.380436"
+       y2="50.939667" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2402"
+       id="linearGradient7184"
+       gradientUnits="userSpaceOnUse"
+       x1="18.935766"
+       y1="23.667896"
+       x2="53.588623"
+       y2="26.649363" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2380"
+       id="linearGradient7180"
+       gradientUnits="userSpaceOnUse"
+       x1="62.513836"
+       y1="36.061237"
+       x2="15.984863"
+       y2="20.60858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7189"
+       gradientUnits="userSpaceOnUse"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientTransform="rotate(180,23.96967,25.01237)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient7185"
+       x1="13.435029"
+       y1="13.604306"
+       x2="22.374878"
+       y2="23.554308"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1322"
+       id="linearGradient4975"
+       x1="34.892849"
+       y1="36.422989"
+       x2="45.918697"
+       y2="48.547989"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.01785,-13.57119)" />
+    <linearGradient
+       id="linearGradient1322">
+      <stop
+         id="stop1324"
+         offset="0.0000000"
+         style="stop-color:#729fcf" />
+      <stop
+         id="stop1326"
+         offset="1.0000000"
+         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="linearGradient1491"
+       gradientUnits="userSpaceOnUse"
+       x1="5.9649177"
+       y1="26.048164"
+       x2="52.854095"
+       y2="26.048164" />
+    <linearGradient
+       id="linearGradient2402">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop2404" />
+      <stop
+         style="stop-color:#528ac5;stop-opacity:1;"
+         offset="1"
+         id="stop2406" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2871">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2873" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop2875" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient2696"
+       x1="32.647972"
+       y1="30.748846"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2690">
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:1;"
+         offset="0"
+         id="stop2692" />
+      <stop
+         style="stop-color:#c4d7eb;stop-opacity:0;"
+         offset="1"
+         id="stop2694" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2682"
+       id="linearGradient2688"
+       x1="36.713837"
+       y1="31.455952"
+       x2="37.124462"
+       y2="24.842253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.77039,-5.765705)" />
+    <linearGradient
+       id="linearGradient2682">
+      <stop
+         style="stop-color:#3977c3;stop-opacity:1;"
+         offset="0"
+         id="stop2684" />
+      <stop
+         style="stop-color:#89aedc;stop-opacity:0;"
+         offset="1"
+         id="stop2686" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2380">
+      <stop
+         style="stop-color:#b9cfe7;stop-opacity:1"
+         offset="0"
+         id="stop2382" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop2384" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2831"
+       id="linearGradient1486"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48.30498,-6.043298)"
+       x1="13.478554"
+       y1="10.612206"
+       x2="15.419417"
+       y2="19.115122" />
+    <linearGradient
+       id="linearGradient2831">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop2833" />
+      <stop
+         id="stop2855"
+         offset="0.33333334"
+         style="stop-color:#5b86be;stop-opacity:1;" />
+      <stop
+         style="stop-color:#83a8d8;stop-opacity:0;"
+         offset="1"
+         id="stop2835" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2871"
+       id="linearGradient1488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(180,-0.62124,20.04085)"
+       x1="37.128052"
+       y1="29.729605"
+       x2="37.065414"
+       y2="26.194071" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient1503"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       cx="24.837126"
+       cy="36.421127"
+       fx="24.837126"
+       fy="36.421127"
+       r="15.644737" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2833" />
+    <linearGradient
+       id="linearGradient3864">
+      <stop
+         id="stop3866"
+         offset="0"
+         style="stop-color:#71b2f8;stop-opacity:1;" />
+      <stop
+         id="stop3868"
+         offset="1"
+         style="stop-color:#002795;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient2571"
+       gradientUnits="userSpaceOnUse"
+       cx="342.58258"
+       cy="27.256668"
+       fx="342.58258"
+       fy="27.256668"
+       r="19.571428"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3352"
+       gradientUnits="userSpaceOnUse"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428"
+       gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <linearGradient
+       id="linearGradient3593">
+      <stop
+         style="stop-color:#c8e0f9;stop-opacity:1;"
+         offset="0"
+         id="stop3595" />
+      <stop
+         style="stop-color:#637dca;stop-opacity:1;"
+         offset="1"
+         id="stop3597" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3354"
+       gradientUnits="userSpaceOnUse"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428"
+       gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3372" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3369"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)"
+       cx="342.58258"
+       cy="27.256668"
+       fx="342.58258"
+       fy="27.256668"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3375"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3380"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       cx="320.44025"
+       cy="113.23357"
+       fx="320.44025"
+       fy="113.23357"
+       r="19.571428" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="linearGradient3914"
+       x1="6.94525"
+       y1="36.838673"
+       x2="48.691113"
+       y2="36.838673"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="linearGradient3792"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)"
+       x1="6.8300767"
+       y1="34.146042"
+       x2="48.691113"
+       y2="36.838673" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3812"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="radialGradient3814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       cx="345.28433"
+       cy="15.560534"
+       fx="345.28433"
+       fy="15.560534"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient3816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       cx="320.44025"
+       cy="113.23357"
+       fx="320.44025"
+       fy="113.23357"
+       r="19.571428" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2734" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient3850"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4467"
+       id="radialGradient3850-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective5736-4" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.914812,0.01265023,-0.00821502,0.213562,2.253914,27.18889)"
+       r="10.31934"
+       fy="35.127438"
+       fx="23.070683"
+       cy="35.127438"
+       cx="23.070683"
+       id="radialGradient2097-2"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <radialGradient
+       r="15.644737"
+       fy="36.421127"
+       fx="24.837126"
+       cy="36.421127"
+       cx="24.837126"
+       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1503-3"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2833-5"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)"
+       r="19.571428"
+       fy="27.256668"
+       fx="342.58258"
+       cy="27.256668"
+       cx="342.58258"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2571-4"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="translate(-0.1767767,-2.6516504)"
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3352-1"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientTransform="translate(-0.1767767,-2.6516504)"
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3354-1"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective3372-5"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="19.571428"
+       fy="27.256668"
+       fx="342.58258"
+       cy="27.256668"
+       cx="342.58258"
+       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3369-3"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3372-9"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3375-2"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="113.23357"
+       fx="320.44025"
+       cy="113.23357"
+       cx="320.44025"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3380-0"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3812-9"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="15.560534"
+       fx="345.28433"
+       cy="15.560534"
+       cx="345.28433"
+       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3814-9"
+       xlink:href="#linearGradient3593"
+       inkscape:collect="always" />
+    <radialGradient
+       r="19.571428"
+       fy="113.23357"
+       fx="320.44025"
+       cy="113.23357"
+       cx="320.44025"
+       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3816-2"
+       xlink:href="#linearGradient3864"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2734-9"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-8"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-4-2"
+       xlink:href="#linearGradient4467"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     stroke="#3465a4"
+     inkscape:window-y="23"
+     inkscape:window-x="47"
+     inkscape:window-height="927"
+     inkscape:window-width="1633"
+     inkscape:showpageshadow="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="30.888147"
+     inkscape:cx="33.014148"
+     inkscape:zoom="10.726351"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1"
+     bordercolor="#202020"
+     pagecolor="#000000"
+     id="base"
+     fill="#729fcf"
+     inkscape:window-maximized="0"
+     borderlayer="true"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid0001"
+       color="#202020"
+       opacity="0.15686275"
+       empcolor="#202020"
+       empopacity="0.31372549"
+       dotted="false"
+       empspacing="8"
+       spacingx="1"
+       spacingy="1"
+       visible="true"
+       snapvisiblegridlinesonly="true" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid0002"
+       spacingx="32"
+       spacingy="32"
+       empspacing="2"
+       empcolor="#202020"
+       empopacity="0.47058824"
+       color="#202020"
+       opacity="0.31372549"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Martin Ruskov</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1"
+     transform="translate(0,16)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:none;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#202020;fill-opacity:0.86274511;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 31.910156 5.9160156 A 6.0006 6.0006 0 0 0 26 12 L 26 26 L 12 26 A 6.0006 6.0006 0 1 0 12 38 L 26 38 L 26 52 A 6.0006 6.0006 0 1 0 38 52 L 38 38 L 52 38 A 6.0006 6.0006 0 1 0 52 26 L 38 26 L 38 12 A 6.0006 6.0006 0 0 0 31.910156 5.9160156 z "
+       transform="translate(0,-16)"
+       id="path11935" />
+  </g>
+</svg>

From 00d84cfda0af6cea0b2b83a6bf525f17a2b1d236 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 7 Aug 2020 01:24:31 +1000
Subject: [PATCH 097/138] mainmenu: added project properties keyboard shortcut

It just seemed like the right thing to do.
---
 app/window/mainwindow/mainmenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp
index 07db2641b..ac2d4b76c 100644
--- a/app/window/mainwindow/mainmenu.cpp
+++ b/app/window/mainwindow/mainmenu.cpp
@@ -61,7 +61,7 @@ MainMenu::MainMenu(MainWindow *parent) :
   file_menu_->addSeparator();
   file_export_item_ = file_menu_->AddItem("export", Core::instance(), &Core::DialogExportShow, "Ctrl+M");
   file_menu_->addSeparator();
-  file_project_properties_item_ = file_menu_->AddItem("projectproperties", Core::instance(), &Core::DialogProjectPropertiesShow);
+  file_project_properties_item_ = file_menu_->AddItem("projectproperties", Core::instance(), &Core::DialogProjectPropertiesShow, "Shift+F10");
   file_menu_->addSeparator();
   file_close_project_item_ = file_menu_->AddItem("closeproj", Core::instance(), &Core::CloseActiveProject);
   file_close_all_projects_item_ = file_menu_->AddItem("closeallproj", Core::instance(), static_cast<bool(Core::*)()>(&Core::CloseAllProjects));

From df14c2aaa756ce5cc4a49341720597d8a5d1d7e1 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 7 Aug 2020 02:31:46 +1000
Subject: [PATCH 098/138] cache: better implemented changing disk cache folders

Not complete yet, but getting there.
---
 app/codec/decoder.cpp                         |   7 +
 app/codec/decoder.h                           |  10 +-
 app/codec/ffmpeg/ffmpegdecoder.cpp            |  54 ----
 app/codec/ffmpeg/ffmpegdecoder.h              |   6 -
 app/codec/oiio/oiiodecoder.cpp                |   5 -
 app/codec/oiio/oiiodecoder.h                  |   2 -
 app/common/define.h                           |   2 +
 app/common/filefunctions.cpp                  |  76 +++--
 app/common/filefunctions.h                    |  10 +-
 app/config/config.cpp                         |   3 -
 app/core.cpp                                  |   4 -
 .../preferences/tabs/preferencesdisktab.cpp   |  87 +++---
 .../preferences/tabs/preferencesdisktab.h     |  12 +-
 .../projectproperties/projectproperties.cpp   | 126 ++++----
 .../projectproperties/projectproperties.h     |  45 +--
 app/project/project.h                         |   6 +-
 app/render/audioplaybackcache.cpp             |   2 +-
 app/render/backend/renderbackend.cpp          |   4 +-
 app/render/backend/renderworker.cpp           |  22 +-
 app/render/backend/renderworker.h             |   7 +
 app/render/diskmanager.cpp                    | 289 +++++++++++-------
 app/render/diskmanager.h                      | 116 +++++--
 app/render/framehashcache.cpp                 |  34 ++-
 app/render/framehashcache.h                   |  14 +-
 app/render/playbackcache.cpp                  |  25 ++
 app/render/playbackcache.h                    |   2 +
 app/task/precache/precachetask.cpp            |   2 +-
 app/widget/CMakeLists.txt                     |   1 +
 app/widget/path/CMakeLists.txt                |  22 ++
 app/widget/path/pathwidget.cpp                |  68 +++++
 app/widget/path/pathwidget.h                  |  57 ++++
 app/widget/viewer/viewer.cpp                  |   8 +-
 app/widget/viewer/viewer.h                    |   4 +
 33 files changed, 701 insertions(+), 431 deletions(-)
 create mode 100644 app/widget/path/CMakeLists.txt
 create mode 100644 app/widget/path/pathwidget.cpp
 create mode 100644 app/widget/path/pathwidget.h

diff --git a/app/codec/decoder.cpp b/app/codec/decoder.cpp
index 00b3fe8a4..7b5fc8912 100644
--- a/app/codec/decoder.cpp
+++ b/app/codec/decoder.cpp
@@ -29,7 +29,9 @@
 #include "codec/oiio/oiiodecoder.h"
 #include "codec/waveinput.h"
 #include "codec/waveoutput.h"
+#include "common/filefunctions.h"
 #include "task/taskmanager.h"
+#include "project/project.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -175,6 +177,11 @@ QString Decoder::GetConformedFilename(const AudioParams &params)
   return index_fn;
 }
 
+QString Decoder::GetIndexFilename()
+{
+  return QDir(stream_->footage()->project()->cache_path()).filePath(FileFunctions::GetUniqueFileIdentifier(stream()->footage()->filename()).append(QString::number(stream()->index())));
+}
+
 bool Decoder::ConformAudio(const QAtomicInt *, const AudioParams& )
 {
   return false;
diff --git a/app/codec/decoder.h b/app/codec/decoder.h
index 1e2bfddfa..60c1b6e90 100644
--- a/app/codec/decoder.h
+++ b/app/codec/decoder.h
@@ -242,19 +242,13 @@ signals:
 protected:
   void SignalProcessingProgress(const int64_t& ts);
 
-  /**
-   * @brief Returns the filename for the index
-   *
-   * Retrieves the absolute filename of the index file for this stream. Decoder must be open for
-   * this to work correctly.
-   */
-  virtual QString GetIndexFilename() const = 0;
-
   /**
    * @brief Get the destination filename of an audio stream conformed to a set of parameters
    */
   QString GetConformedFilename(const AudioParams &params);
 
+  QString GetIndexFilename();
+
   bool open_;
 
   QMutex mutex_;
diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp
index 36a57003f..4c54a42df 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.cpp
+++ b/app/codec/ffmpeg/ffmpegdecoder.cpp
@@ -611,40 +611,6 @@ void FFmpegDecoder::Error(const QString &s)
   ClearResources();
 }
 
-QMutex scaler_lock;
-void SaveCacheFrame(FFmpegDecoder* decoder,
-                    SwsContext* scaler,
-                    AVFrame* frame,
-                    VideoParams params,
-                    QString dst_fn)
-{
-  QByteArray converted_buffer(PixelFormat::GetBufferSize(params.format(),
-                                                         params.width(),
-                                                         params.height()),
-                              Qt::Uninitialized);
-
-  uint8_t* converted_data = reinterpret_cast<uint8_t*>(converted_buffer.data());
-  int converted_linesize = PixelFormat::GetBufferSize(params.format(),
-                                                      params.width(),
-                                                      1);
-
-  scaler_lock.lock();
-  sws_scale(scaler,
-            frame->data,
-            frame->linesize,
-            0,
-            frame->height,
-            &converted_data,
-            &converted_linesize);
-  scaler_lock.unlock();
-
-  if (!FrameHashCache::SaveCacheFrame(dst_fn, converted_buffer.data(), params, converted_linesize)) {
-    qCritical() <<" Failed to save cache frame" << dst_fn;
-  }
-
-  av_frame_free(&frame);
-}
-
 bool FFmpegDecoder::ConformAudio(const QAtomicInt *cancelled, const AudioParams &p)
 {
   // Iterate through each audio frame and extract the PCM data
@@ -774,17 +740,6 @@ bool FFmpegDecoder::ConformAudio(const QAtomicInt *cancelled, const AudioParams
   return success;
 }
 
-QString FFmpegDecoder::GetIndexFilename() const
-{
-  return FileFunctions::GetMediaIndexFilename(FileFunctions::GetUniqueFileIdentifier(stream()->footage()->filename()))
-      .append(QString::number(stream()->index()));
-}
-
-QString FFmpegDecoder::GetProxyFilename(int divider) const
-{
-  return GetIndexFilename().append('d').append(QString::number(divider));
-}
-
 int FFmpegDecoder::GetScaledDimension(int dim, int divider)
 {
   return dim / divider;
@@ -914,7 +869,6 @@ void FFmpegDecoderInstance::SetWorking(bool working)
 
 void FFmpegDecoderInstance::Seek(int64_t timestamp)
 {
-  qDebug() << "Seeking to" << timestamp;
   avcodec_flush_buffers(codec_ctx_);
   av_seek_frame(fmt_ctx_, avstream_->index, timestamp, AVSEEK_FLAG_BACKWARD);
 }
@@ -1171,14 +1125,6 @@ void FFmpegDecoder::FreeScaler()
   }
 }
 
-QString FFmpegDecoder::GetProxyFrameFilename(const int64_t &timestamp, const int& divider) const
-{
-  QString dst_fn = GetProxyFilename(divider);
-  dst_fn.append(QString::number(timestamp));
-  dst_fn.append(FrameHashCache::GetFormatExtension());
-  return dst_fn;
-}
-
 int64_t FFmpegDecoderInstance::RangeStart() const
 {
   if (cached_frames_.isEmpty()) {
diff --git a/app/codec/ffmpeg/ffmpegdecoder.h b/app/codec/ffmpeg/ffmpegdecoder.h
index d4118cc2e..9922cac91 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.h
+++ b/app/codec/ffmpeg/ffmpegdecoder.h
@@ -172,17 +172,11 @@ private:
    */
   void FFmpegError(int error_code);
 
-  virtual QString GetIndexFilename() const override;
-
-  QString GetProxyFilename(int divider) const;
-
   void ClearResources();
 
   void InitScaler(int divider);
   void FreeScaler();
 
-  QString GetProxyFrameFilename(const int64_t& timestamp, const int &divider) const;
-
   static int GetScaledDimension(int dim, int divider);
 
   static PixelFormat::Format GetNativePixelFormat(AVPixelFormat pix_fmt);
diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp
index ab8fc311a..238c7c6b8 100644
--- a/app/codec/oiio/oiiodecoder.cpp
+++ b/app/codec/oiio/oiiodecoder.cpp
@@ -220,11 +220,6 @@ bool OIIODecoder::SupportsVideo()
   return true;
 }
 
-QString OIIODecoder::GetIndexFilename() const
-{
-  return QString();
-}
-
 void OIIODecoder::FrameToBuffer(FramePtr frame, OIIO::ImageBuf *buf)
 {
 #if OIIO_VERSION < 20112
diff --git a/app/codec/oiio/oiiodecoder.h b/app/codec/oiio/oiiodecoder.h
index 990fc3aff..be0b6fca2 100644
--- a/app/codec/oiio/oiiodecoder.h
+++ b/app/codec/oiio/oiiodecoder.h
@@ -51,8 +51,6 @@ public:
 
   virtual bool SupportsVideo() override;
 
-  virtual QString GetIndexFilename() const override;
-
   static void FrameToBuffer(FramePtr frame, OIIO::ImageBuf* buf);
 
   static void BufferToFrame(OIIO::ImageBuf* buf, FramePtr frame);
diff --git a/app/common/define.h b/app/common/define.h
index dd62ba73d..aa968fcf7 100644
--- a/app/common/define.h
+++ b/app/common/define.h
@@ -42,6 +42,8 @@ const int kProjectIconSizeMaximum = 256;
 /// The default size an icon in ProjectExplorer can be
 const int kProjectIconSizeDefault = 64;
 
+const int kBytesInGigabyte = 1073741824;
+
 OLIVE_NAMESPACE_EXIT
 
 #define MACRO_NAME_AS_STR(s) #s
diff --git a/app/common/filefunctions.cpp b/app/common/filefunctions.cpp
index 7ed065829..f087dd90b 100644
--- a/app/common/filefunctions.cpp
+++ b/app/common/filefunctions.cpp
@@ -50,35 +50,6 @@ QString FileFunctions::GetUniqueFileIdentifier(const QString &filename)
   return QString(result.toHex());
 }
 
-QString FileFunctions::GetMediaIndexLocation()
-{
-  QDir local_appdata_dir(Config::Current()["DiskCachePath"].toString());
-
-  QDir media_index_dir = local_appdata_dir.filePath("mediaindex");
-
-  // Attempt to ensure this folder exists
-  media_index_dir.mkpath(".");
-
-  return media_index_dir.absolutePath();
-}
-
-QString FileFunctions::GetMediaIndexFilename(const QString &filename)
-{
-  return QDir(GetMediaIndexLocation()).filePath(filename);
-}
-
-QString FileFunctions::GetMediaCacheLocation()
-{
-  QDir local_appdata_dir(Config::Current()["DiskCachePath"].toString());
-
-  QDir media_cache_dir = local_appdata_dir.filePath("mediacache");
-
-  // Attempt to ensure this folder exists
-  media_cache_dir.mkpath(".");
-
-  return media_cache_dir.absolutePath();
-}
-
 QString FileFunctions::GetConfigurationLocation()
 {
   if (IsPortable()) {
@@ -112,6 +83,30 @@ QString FileFunctions::GetTempFilePath()
   return temp_path;
 }
 
+bool FileFunctions::CanCopyDirectoryWithoutOverwriting(const QString& source, const QString& dest)
+{
+  QFileInfoList info_list = QDir(source).entryInfoList();
+
+  foreach (const QFileInfo& info, info_list) {
+    // QDir::NoDotAndDotDot continues to not work, so we have to check manually
+    if (info.fileName() == QStringLiteral(".") || info.fileName() == QStringLiteral("..")) {
+      continue;
+    }
+
+    QString dest_equivalent = QDir(dest).filePath(info.fileName());
+
+    if (info.isDir()) {
+      if (!CanCopyDirectoryWithoutOverwriting(info.absoluteFilePath(), dest_equivalent)) {
+        return false;
+      }
+    } else if (QFileInfo::exists(dest_equivalent)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
 void FileFunctions::CopyDirectory(const QString &source, const QString &dest, bool overwrite)
 {
   QDir d(source);
@@ -152,4 +147,27 @@ void FileFunctions::CopyDirectory(const QString &source, const QString &dest, bo
   }
 }
 
+bool FileFunctions::DirectoryIsValid(const QString &dir, bool try_to_create)
+{
+  // Empty string is invalid
+  if (dir.isEmpty()) {
+    return false;
+  }
+
+  QDir d(dir);
+
+  // If directory already exists, this is valid
+  if (d.exists()) {
+    return true;
+  }
+
+  // If we can create and creation is successful, this is valid
+  if (try_to_create && d.mkpath(".")) {
+    return true;
+  }
+
+  // Otherwise, invalid
+  return false;
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/common/filefunctions.h b/app/common/filefunctions.h
index d1f147c9b..fcfb875be 100644
--- a/app/common/filefunctions.h
+++ b/app/common/filefunctions.h
@@ -42,20 +42,18 @@ public:
 
   static QString GetUniqueFileIdentifier(const QString& filename);
 
-  static QString GetMediaIndexLocation();
-
-  static QString GetMediaIndexFilename(const QString& filename);
-
-  static QString GetMediaCacheLocation();
-
   static QString GetConfigurationLocation();
 
   static QString GetApplicationPath();
 
   static QString GetTempFilePath();
 
+  static bool CanCopyDirectoryWithoutOverwriting(const QString& source, const QString& dest);
+
   static void CopyDirectory(const QString& source, const QString& dest, bool overwrite = false);
 
+  static bool DirectoryIsValid(const QString& dir, bool try_to_create);
+
 };
 
 
diff --git a/app/config/config.cpp b/app/config/config.cpp
index d2c2b0866..ba2d62348 100644
--- a/app/config/config.cpp
+++ b/app/config/config.cpp
@@ -97,11 +97,8 @@ void Config::SetDefaults()
   config_map_["AudioOutput"] = QString();
   config_map_["AudioInput"] = QString();
 
-  config_map_["DiskCachePath"] = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation);
-  config_map_["DiskCacheSize"] = 20.0;
   config_map_["DiskCacheBehind"] = QVariant::fromValue(rational(1));
   config_map_["DiskCacheAhead"] = QVariant::fromValue(rational(5));
-  config_map_["ClearDiskCacheOnClose"] = false;
 
   config_map_["DefaultSequenceWidth"] = 1920;
   config_map_["DefaultSequenceHeight"] = 1080;
diff --git a/app/core.cpp b/app/core.cpp
index fbecb02bf..419e612c0 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -177,10 +177,6 @@ void Core::DeclareTypesForQt()
 
 void Core::Start()
 {
-  // Reset config (Config sets to default on construction already, but we do it again here as a workaround that fixes
-  //               the fact that some of the config paths set by default rely on the app name having been set (in main())
-  Config::Current().SetDefaults();
-
   // Load application config
   Config::Load();
 
diff --git a/app/dialog/preferences/tabs/preferencesdisktab.cpp b/app/dialog/preferences/tabs/preferencesdisktab.cpp
index a961c5adf..b62e6f965 100644
--- a/app/dialog/preferences/tabs/preferencesdisktab.cpp
+++ b/app/dialog/preferences/tabs/preferencesdisktab.cpp
@@ -27,12 +27,15 @@
 #include <QLabel>
 #include <QMessageBox>
 
-#include "render/diskmanager.h"
+#include "common/filefunctions.h"
 
 OLIVE_NAMESPACE_ENTER
 
 PreferencesDiskTab::PreferencesDiskTab()
 {
+  // Get default disk cache folder
+  default_disk_cache_folder_ = DiskManager::instance()->GetDefaultCacheFolder();
+
   QVBoxLayout* outer_layout = new QVBoxLayout(this);
 
   QGroupBox* disk_management_group = new QGroupBox(tr("Disk Management"));
@@ -44,15 +47,9 @@ PreferencesDiskTab::PreferencesDiskTab()
 
   disk_management_layout->addWidget(new QLabel(tr("Disk Cache Location:")), row, 0);
 
-  disk_cache_location_ = new QLineEdit();
-  disk_cache_location_->setText(Config::Current()["DiskCachePath"].toString());
-  connect(disk_cache_location_, &QLineEdit::textChanged, this, &PreferencesDiskTab::DiskCacheLineEditChanged);
+  disk_cache_location_ = new PathWidget(default_disk_cache_folder_->GetPath());
   disk_management_layout->addWidget(disk_cache_location_, row, 1);
 
-  QPushButton* browse_btn = new QPushButton(tr("Browse"));
-  connect(browse_btn, &QPushButton::clicked, this, &PreferencesDiskTab::BrowseDiskCachePath);
-  disk_management_layout->addWidget(browse_btn, row, 2);
-
   row++;
 
   disk_management_layout->addWidget(new QLabel(tr("Maximum Disk Cache:")), row, 0);
@@ -60,20 +57,20 @@ PreferencesDiskTab::PreferencesDiskTab()
   maximum_cache_slider_ = new FloatSlider();
   maximum_cache_slider_->SetFormat(tr("%1 GB"));
   maximum_cache_slider_->SetMinimum(1.0);
-  maximum_cache_slider_->SetValue(Config::Current()["DiskCacheSize"].toDouble());
-  disk_management_layout->addWidget(maximum_cache_slider_, row, 1, 1, 2);
+  maximum_cache_slider_->SetValue(static_cast<double>(default_disk_cache_folder_->GetLimit()) / static_cast<double>(kBytesInGigabyte));
+  disk_management_layout->addWidget(maximum_cache_slider_, row, 1);
 
   row++;
 
   clear_cache_btn_ = new QPushButton(tr("Clear Disk Cache"));
   connect(clear_cache_btn_, &QPushButton::clicked, this, &PreferencesDiskTab::ClearDiskCache);
-  disk_management_layout->addWidget(clear_cache_btn_, row, 1, 1, 2);
+  disk_management_layout->addWidget(clear_cache_btn_, row, 1);
 
   row++;
 
   clear_disk_cache_ = new QCheckBox(tr("Automatically clear disk cache on close"));
-  clear_disk_cache_->setChecked(Config::Current()["ClearDiskCacheOnClose"].toBool());
-  disk_management_layout->addWidget(clear_disk_cache_, row, 1, 1, 2);
+  clear_disk_cache_->setChecked(default_disk_cache_folder_->GetClearOnClose());
+  disk_management_layout->addWidget(clear_disk_cache_, row, 1);
 
   QGroupBox* cache_behavior = new QGroupBox(tr("Cache Behavior"));
   outer_layout->addWidget(cache_behavior);
@@ -100,35 +97,51 @@ PreferencesDiskTab::PreferencesDiskTab()
   outer_layout->addStretch();
 }
 
+bool PreferencesDiskTab::Validate()
+{
+  if (disk_cache_location_->text() != default_disk_cache_folder_->GetPath()) {
+    // Disk cache location is changing
+
+    // Check if the user wants to move the cache here
+    if (QMessageBox::question(this,
+                              tr("Disk Cache"),
+                              tr("You've chosen to change the default disk cache location. This "
+                                 "will invalidate your current cache. Would you like to continue?"),
+                              QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel) {
+      return false;
+    }
+
+    // Check validity of the new path
+    if (!FileFunctions::DirectoryIsValid(disk_cache_location_->text(), true)) {
+      QMessageBox::critical(this,
+                            tr("Disk Cache"),
+                            tr("Failed to set disk cache location. Access was denied."));
+      return false;
+    }
+  }
+
+  return true;
+}
+
 void PreferencesDiskTab::Accept()
 {
-  Config::Current()["DiskCachePath"] = disk_cache_location_->text();
-  Config::Current()["DiskCacheSize"] = maximum_cache_slider_->GetValue();
-  Config::Current()["ClearDiskCacheOnClose"] = clear_disk_cache_->isChecked();
+  if (disk_cache_location_->text() != default_disk_cache_folder_->GetPath()) {
+    default_disk_cache_folder_->SetPath(disk_cache_location_->text());
+  }
+
+  qint64 new_disk_cache_limit = qRound64(maximum_cache_slider_->GetValue() * kBytesInGigabyte);
+  if (new_disk_cache_limit != default_disk_cache_folder_->GetLimit()) {
+    default_disk_cache_folder_->SetLimit(new_disk_cache_limit);
+  }
+
+  if (default_disk_cache_folder_->GetClearOnClose() != clear_disk_cache_->isChecked()) {
+    default_disk_cache_folder_->SetClearOnClose(clear_disk_cache_->isChecked());
+  }
+
   Config::Current()["DiskCacheBehind"] = QVariant::fromValue(rational::fromDouble(cache_behind_slider_->GetValue()));
   Config::Current()["DiskCacheAhead"] = QVariant::fromValue(rational::fromDouble(cache_ahead_slider_->GetValue()));
 }
 
-void PreferencesDiskTab::DiskCacheLineEditChanged()
-{
-  QString entered_dir = disk_cache_location_->text();
-
-  if (!entered_dir.isEmpty() && !QDir(entered_dir).exists()) {
-    disk_cache_location_->setStyleSheet(QStringLiteral("color: red;"));
-  } else {
-    disk_cache_location_->setStyleSheet(QString());
-  }
-}
-
-void PreferencesDiskTab::BrowseDiskCachePath()
-{
-  QString dir = QFileDialog::getExistingDirectory(this, tr("Browse for disk cache path"), disk_cache_location_->text());
-
-  if (!dir.isEmpty()) {
-    disk_cache_location_->setText(dir);
-  }
-}
-
 void PreferencesDiskTab::ClearDiskCache()
 {
   if (QMessageBox::question(this,
@@ -137,7 +150,7 @@ void PreferencesDiskTab::ClearDiskCache()
                             QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
     clear_cache_btn_->setEnabled(false);
 
-    if (DiskManager::instance()->ClearDiskCache(false)) {
+    if (DiskManager::instance()->ClearDiskCache(default_disk_cache_folder_->GetPath())) {
       clear_cache_btn_->setText(tr("Disk Cache Cleared"));
     } else {
       QMessageBox::information(this,
diff --git a/app/dialog/preferences/tabs/preferencesdisktab.h b/app/dialog/preferences/tabs/preferencesdisktab.h
index 052c834ad..c087abca6 100644
--- a/app/dialog/preferences/tabs/preferencesdisktab.h
+++ b/app/dialog/preferences/tabs/preferencesdisktab.h
@@ -26,7 +26,9 @@
 #include <QPushButton>
 
 #include "preferencestab.h"
+#include "render/diskmanager.h"
 #include "widget/slider/floatslider.h"
+#include "widget/path/pathwidget.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -36,10 +38,12 @@ class PreferencesDiskTab : public PreferencesTab
 public:
   PreferencesDiskTab();
 
+  virtual bool Validate() override;
+
   virtual void Accept() override;
 
 private:
-  QLineEdit* disk_cache_location_;
+  PathWidget* disk_cache_location_;
 
   FloatSlider* maximum_cache_slider_;
 
@@ -51,11 +55,9 @@ private:
 
   QPushButton* clear_cache_btn_;
 
+  DiskCacheFolder* default_disk_cache_folder_;
+
 private slots:
-  void DiskCacheLineEditChanged();
-
-  void BrowseDiskCachePath();
-
   void ClearDiskCache();
 
 };
diff --git a/app/dialog/projectproperties/projectproperties.cpp b/app/dialog/projectproperties/projectproperties.cpp
index 423ae414f..8a1b61655 100644
--- a/app/dialog/projectproperties/projectproperties.cpp
+++ b/app/dialog/projectproperties/projectproperties.cpp
@@ -20,6 +20,7 @@
 
 #include "projectproperties.h"
 
+#include <QButtonGroup>
 #include <QDialogButtonBox>
 #include <QFileDialog>
 #include <QGroupBox>
@@ -29,6 +30,7 @@
 #include <OpenColorIO/OpenColorIO.h>
 namespace OCIO = OCIO_NAMESPACE::v1;
 
+#include "common/filefunctions.h"
 #include "config/config.h"
 #include "core.h"
 #include "render/colormanager.h"
@@ -51,7 +53,10 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) :
     // Color management group
     QWidget* color_group = new QWidget();
 
-    QGridLayout* color_layout = new QGridLayout(color_group);
+    QVBoxLayout* color_outer_layout = new QVBoxLayout(color_group);
+
+    QGridLayout* color_layout = new QGridLayout();
+    color_outer_layout->addLayout(color_layout);
 
     int row = 0;
 
@@ -80,26 +85,47 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) :
     OCIOFilenameUpdated();
 
     tabs->addTab(color_group, tr("Color Management"));
+
+    color_outer_layout->addStretch();
   }
 
   
 
   {
-    // Paths group
-    QWidget* paths_group = new QWidget();
+    // Cache group
+    QWidget* cache_group = new QWidget();
 
-    QGridLayout* paths_layout = new QGridLayout(paths_group);
+    QVBoxLayout* cache_layout = new QVBoxLayout(cache_group);
 
-    cache_path_ = new PathWidget(working_project_->cache_path(), this);
+    QButtonGroup* disk_cache_btn_group = new QButtonGroup();
 
-    int row = 0;
+    disk_cache_use_default_btn_ = new QRadioButton(tr("Use Default Location"));
+    disk_cache_store_alongside_project_btn_ = new QRadioButton(tr("Store Alongside Project"));
+    disk_cache_use_custom_btn_ = new QRadioButton(tr("Use Custom Location:"));
 
-    paths_layout->addWidget(new QLabel(tr("Cache Path:")), row, 0);
-    paths_layout->addWidget(cache_path_->path_edit(), row, 1);
-    paths_layout->addWidget(cache_path_->browse_btn(), row, 2);
-    paths_layout->addWidget(cache_path_->default_box(), row, 3);
+    disk_cache_btn_group->addButton(disk_cache_use_default_btn_);
+    disk_cache_btn_group->addButton(disk_cache_store_alongside_project_btn_);
+    disk_cache_btn_group->addButton(disk_cache_use_custom_btn_);
 
-    tabs->addTab(paths_group, tr("Paths"));
+    cache_layout->addWidget(disk_cache_use_default_btn_);
+    cache_layout->addWidget(disk_cache_store_alongside_project_btn_);
+    cache_layout->addWidget(disk_cache_use_custom_btn_);
+
+    cache_path_ = new PathWidget(working_project_->cache_path(false), this);
+    cache_path_->setEnabled(false);
+    cache_layout->addWidget(cache_path_);
+
+    connect(disk_cache_use_custom_btn_, &QRadioButton::toggled, cache_path_, &PathWidget::setEnabled);
+
+    if (working_project_->cache_path(false).isEmpty()) {
+      disk_cache_use_default_btn_->setChecked(true);
+    } else {
+      disk_cache_use_custom_btn_->setChecked(true);
+    }
+
+    cache_layout->addWidget(cache_path_);
+
+    tabs->addTab(cache_group, tr("Disk Cache"));
   }
 
   QDialogButtonBox* dialog_btns = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
@@ -122,18 +148,26 @@ void ProjectPropertiesDialog::accept()
     return;
   }
 
-  if (!cache_path_->PathIsValid(true)) {
-    QMessageBox mb(this);
-    mb.setWindowModality(Qt::WindowModal);
-    mb.setIcon(QMessageBox::Critical);
-    mb.setWindowTitle(tr("Invalid path"));
-    mb.setText(tr("The cache path is invalid. Please check it and try again."));
-    mb.addButton(QMessageBox::Ok);
-    mb.exec();
+  if (disk_cache_use_default_btn_->isChecked()) {
+    // Empty cache path means default
+    working_project_->set_cache_path(QString());
+  } else if (disk_cache_store_alongside_project_btn_->isChecked()) {
+    QMessageBox::information(this, QString(), tr("\"Store alignside project\" functionality not implemented yet"));
     return;
-  }
+  } else {
+    if (!FileFunctions::DirectoryIsValid(cache_path_->text(), true)) {
+      QMessageBox mb(this);
+      mb.setWindowModality(Qt::WindowModal);
+      mb.setIcon(QMessageBox::Critical);
+      mb.setWindowTitle(tr("Invalid path"));
+      mb.setText(tr("The cache path is invalid. Please check it and try again."));
+      mb.addButton(QMessageBox::Ok);
+      mb.exec();
+      return;
+    }
 
-  working_project_->set_cache_path(cache_path_->path_edit()->text());
+    working_project_->set_cache_path(cache_path_->text());
+  }
 
   // This should ripple changes throughout the program that the color config has changed, therefore must be done last
   working_project_->color_manager()->SetConfigAndDefaultInput(ocio_filename_->text(),
@@ -184,54 +218,4 @@ void ProjectPropertiesDialog::OCIOFilenameUpdated()
   }
 }
 
-PathWidget::PathWidget(const QString &path, QWidget *parent) :
-  QObject(parent)
-{
-  path_edit_ = new QLineEdit();
-  path_edit_->setText(path);
-  connect(path_edit_, &QLineEdit::textChanged, this, &PathWidget::LineEditChanged);
-
-  default_box_ = new QCheckBox(tr("Default"));
-
-  browse_btn_ = new QPushButton(tr("Browse"));
-
-  connect(default_box_, &QCheckBox::toggled, this, &PathWidget::DefaultToggled);
-
-  default_box_->setChecked(path.isEmpty());
-
-  connect(browse_btn_, &QPushButton::clicked, this, &PathWidget::BrowseClicked);
-}
-
-bool PathWidget::PathIsValid(bool try_to_create) const
-{
-  return default_box_->isChecked()
-      || QDir(path_edit_->text()).exists()
-      || (try_to_create && QDir(path_edit_->text()).mkpath(QStringLiteral(".")));
-}
-
-void PathWidget::DefaultToggled(bool e)
-{
-  path_edit_->setEnabled(!e);
-}
-
-void PathWidget::BrowseClicked()
-{
-  QString dir = QFileDialog::getExistingDirectory(static_cast<QWidget*>(parent()),
-                                                  tr("Browse for path"),
-                                                  path_edit_->text());
-
-  if (!dir.isEmpty()) {
-    path_edit_->setText(dir);
-  }
-}
-
-void PathWidget::LineEditChanged()
-{
-  if (PathIsValid(false)) {
-    path_edit_->setStyleSheet(QString());
-  } else {
-    path_edit_->setStyleSheet(QStringLiteral("QLineEdit {color: red;}"));
-  }
-}
-
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/projectproperties/projectproperties.h b/app/dialog/projectproperties/projectproperties.h
index 0f7abdfab..5c0f31347 100644
--- a/app/dialog/projectproperties/projectproperties.h
+++ b/app/dialog/projectproperties/projectproperties.h
@@ -26,48 +26,13 @@
 #include <QDialog>
 #include <QGridLayout>
 #include <QLineEdit>
+#include <QRadioButton>
 
 #include "project/project.h"
+#include "widget/path/pathwidget.h"
 
 OLIVE_NAMESPACE_ENTER
 
-class PathWidget : public QObject
-{
-  Q_OBJECT
-public:
-  PathWidget(const QString& path,
-             QWidget* parent = nullptr);
-
-  bool PathIsValid(bool try_to_create) const;
-
-  QLineEdit* path_edit() const {
-    return path_edit_;
-  }
-
-  QCheckBox* default_box() const {
-    return default_box_;
-  }
-
-  QPushButton* browse_btn() const {
-    return browse_btn_;
-  }
-
-private slots:
-  void DefaultToggled(bool e);
-
-  void BrowseClicked();
-
-  void LineEditChanged();
-
-private:
-  QLineEdit* path_edit_;
-
-  QCheckBox* default_box_;
-
-  QPushButton* browse_btn_;
-
-};
-
 class ProjectPropertiesDialog : public QDialog
 {
   Q_OBJECT
@@ -89,6 +54,12 @@ private:
   QString ocio_config_error_;
 
   PathWidget* cache_path_;
+
+  QRadioButton* disk_cache_use_default_btn_;
+
+  QRadioButton* disk_cache_store_alongside_project_btn_;
+
+  QRadioButton* disk_cache_use_custom_btn_;
   
 private slots:
   void BrowseForOCIOConfig();
diff --git a/app/project/project.h b/app/project/project.h
index ff3f8ce35..2a806c29c 100644
--- a/app/project/project.h
+++ b/app/project/project.h
@@ -25,6 +25,7 @@
 #include <memory>
 
 #include "render/colormanager.h"
+#include "render/diskmanager.h"
 #include "project/item/folder/folder.h"
 #include "window/mainwindow/mainwindowlayoutinfo.h"
 
@@ -71,7 +72,10 @@ public:
 
   bool is_new() const;
 
-  const QString& cache_path() const {
+  const QString& cache_path(bool default_if_empty = true) const {
+    if (cache_path_.isEmpty() && default_if_empty) {
+      return DiskManager::instance()->GetDefaultCachePath();
+    }
     return cache_path_;
   }
 
diff --git a/app/render/audioplaybackcache.cpp b/app/render/audioplaybackcache.cpp
index 73e76a067..3a1a78a34 100644
--- a/app/render/audioplaybackcache.cpp
+++ b/app/render/audioplaybackcache.cpp
@@ -249,7 +249,7 @@ QList<TimeRange> AudioPlaybackCache::NoLockGetValidRanges(const TimeRange& range
 
 void AudioPlaybackCache::UpdateFilename(const QString &s)
 {
-  filename_ = QDir(FileFunctions::GetMediaCacheLocation()).filePath(s);
+  filename_ = QDir(GetCacheFilename()).filePath(s);
   filename_.append(QStringLiteral(".pcm"));
 }
 
diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index 762dfeabd..1de50ab2c 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -396,6 +396,7 @@ void RenderBackend::RunNextJob()
       worker->SetRenderMode(render_mode_);
       worker->SetPreviewGenerationEnabled(generate_audio_previews_);
       worker->SetCopyMap(&copy_map_);
+      worker->SetViewerNode(viewer_node_);
 
       // Move ticket from queue to running list
       RenderTicketPtr ticket = render_queue_.front();
@@ -592,7 +593,8 @@ void RenderBackend::AutoCacheVideoRendered()
       QFutureWatcher<bool>* w = new QFutureWatcher<bool>();
       autocache_video_download_tasks_.insert(w, hash);
       connect(w, &QFutureWatcher<bool>::finished, this, &RenderBackend::AutoCacheVideoDownloaded);
-      w->setFuture(QtConcurrent::run(FrameHashCache::SaveCacheFrame,
+      w->setFuture(QtConcurrent::run(viewer_node_->video_frame_cache(),
+                                     &FrameHashCache::SaveCacheFrame,
                                      hash,
                                      watcher->Get().value<FramePtr>()));
     }
diff --git a/app/render/backend/renderworker.cpp b/app/render/backend/renderworker.cpp
index 8eb34ef8f..5b670fc0d 100644
--- a/app/render/backend/renderworker.cpp
+++ b/app/render/backend/renderworker.cpp
@@ -274,21 +274,17 @@ QVariant RenderWorker::GetCachedFrame(const Node* node, const rational& time)
   if (node->id() == QStringLiteral("org.olivevideoeditor.Olive.videoinput")) {
     QByteArray hash = HashNode(node, video_params(), time);
 
-    QString fn = FrameHashCache::CachePathName(hash);
+    FramePtr f = viewer_->video_frame_cache()->LoadCacheFrame(hash);
 
-    if (QFileInfo::exists(fn)) {
-      FramePtr f = FrameHashCache::LoadCacheFrame(hash);
+    if (f) {
+      // The cached frame won't load with the correct divider by default, so we enforce it here
+      f->set_video_params(VideoParams(f->width() * video_params_.divider(),
+                                      f->height() * video_params_.divider(),
+                                      f->video_params().time_base(),
+                                      f->video_params().format(),
+                                      video_params_.divider()));
 
-      if (f) {
-        // The cached frame won't load with the correct divider by default, so we enforce it here
-        f->set_video_params(VideoParams(f->width() * video_params_.divider(),
-                                        f->height() * video_params_.divider(),
-                                        f->video_params().time_base(),
-                                        f->video_params().format(),
-                                        video_params_.divider()));
-
-        return CachedFrameToTexture(f);
-      }
+      return CachedFrameToTexture(f);
     }
   }
 
diff --git a/app/render/backend/renderworker.h b/app/render/backend/renderworker.h
index 44b945b5a..a709663d8 100644
--- a/app/render/backend/renderworker.h
+++ b/app/render/backend/renderworker.h
@@ -48,6 +48,11 @@ public:
     available_ = a;
   }
 
+  void SetViewerNode(ViewerOutput* viewer)
+  {
+    viewer_ = viewer;
+  }
+
   void SetVideoParams(const VideoParams& params)
   {
     video_params_ = params;
@@ -171,6 +176,8 @@ private:
 
   bool generate_audio_previews_;
 
+  ViewerOutput* viewer_;
+
   QHash<Node*, Node*>* copy_map_;
 
   RenderMode::Mode render_mode_;
diff --git a/app/render/diskmanager.cpp b/app/render/diskmanager.cpp
index 2c609f357..076bf0475 100644
--- a/app/render/diskmanager.cpp
+++ b/app/render/diskmanager.cpp
@@ -25,62 +25,56 @@
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
+#include <QMessageBox>
 #include <QStandardPaths>
 
 #include "common/filefunctions.h"
 #include "config/config.h"
+#include "core.h"
 
 OLIVE_NAMESPACE_ENTER
 
 DiskManager* DiskManager::instance_ = nullptr;
 
-DiskManager::DiskManager() :
-  consumption_(0)
+DiskManager::DiskManager()
 {
-  // Try to load any current cache index from file
-  QFile cache_index_file(GetCacheIndexFilename());
+  // Add default cache location
+  QFile default_disk_cache_file(QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("defaultdiskcache")));
+  if (default_disk_cache_file.open(QFile::ReadOnly)) {
+    QString default_dir = default_disk_cache_file.readAll();
 
-  if (cache_index_file.open(QFile::ReadOnly)) {
-    QDataStream ds(&cache_index_file);
-
-    while (!cache_index_file.atEnd()) {
-      HashTime h;
-
-      ds >> h.file_name;
-      ds >> h.hash;
-      ds >> h.access_time;
-      ds >> h.file_size;
-
-      if (QFileInfo::exists(h.file_name)) {
-        consumption_ += h.file_size;
-        disk_data_.append(h);
-      }
+    if (FileFunctions::DirectoryIsValid(default_dir, true)) {
+      GetOpenFolder(default_dir);
+    } else {
+      QMessageBox::warning(nullptr,
+                           tr("Disk Cache Error"),
+                           tr("Unable to set custom application disk cache. Using default instead."));
     }
+
+    default_disk_cache_file.close();
+  }
+
+  // If no custom default was loaded, load default
+  if (open_folders_.isEmpty()) {
+    GetOpenFolder(QDir(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation)).filePath("mediacache"));
+  }
+
+  QFile disk_cache_index(QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("diskcache")));
+
+  if (disk_cache_index.open(QFile::ReadOnly)) {
+    QTextStream stream(&disk_cache_index);
+
+    QString line;
+    while (stream.readLineInto(&line)) {
+      GetOpenFolder(line);
+    }
+
+    disk_cache_index.close();
   }
 }
 
 DiskManager::~DiskManager()
 {
-  if (Config::Current()["ClearDiskCacheOnClose"].toBool()) {
-    // Clear all cache data
-    ClearDiskCache(true);
-  } else {
-    // Save current cache index
-    QFile cache_index_file(GetCacheIndexFilename());
-
-    if (cache_index_file.open(QFile::WriteOnly)) {
-      QDataStream ds(&cache_index_file);
-
-      foreach (const HashTime& h, disk_data_) {
-        ds << h.file_name;
-        ds << h.hash;
-        ds << h.access_time;
-        ds << h.file_size;
-      }
-    } else {
-      qWarning() << "Failed to write cache index:" << GetCacheIndexFilename();
-    }
-  }
 }
 
 void DiskManager::CreateInstance()
@@ -99,107 +93,178 @@ DiskManager *DiskManager::instance()
   return instance_;
 }
 
-void DiskManager::Accessed(const QByteArray &hash)
+void DiskManager::Accessed(const QString &cache_folder, const QByteArray &hash)
 {
-  lock_.lock();
+  DiskCacheFolder* f = GetOpenFolder(cache_folder);
 
-  for (int i=disk_data_.size()-1;i>=0;i--) {
-    const HashTime& h = disk_data_.at(i);
+  f->Accessed(hash);
+}
 
-    if (h.hash == hash) {
-      HashTime moved_hash = h;
+void DiskManager::CreatedFile(const QString &cache_folder, const QString &file_name, const QByteArray &hash)
+{
+  DiskCacheFolder* f = GetOpenFolder(cache_folder);
 
-      moved_hash.access_time = QDateTime::currentMSecsSinceEpoch();
+  f->CreatedFile(file_name, hash);
+}
 
-      disk_data_.removeAt(i);
-      disk_data_.append(moved_hash);
-      break;
+bool DiskManager::ClearDiskCache(const QString &cache_folder)
+{
+  DiskCacheFolder* f = GetOpenFolder(cache_folder);
+
+  return f->ClearCache();
+}
+
+DiskCacheFolder *DiskManager::GetOpenFolder(const QString &path)
+{
+  // If path is empty, this must mean default
+  if (path.isEmpty()) {
+    return GetDefaultCacheFolder();
+  }
+
+  // See if we have an existing path with this name
+  foreach (DiskCacheFolder* f, open_folders_) {
+    if (f->GetPath() == path) {
+      return f;
     }
   }
 
-  lock_.unlock();
+  // We must have to open this folder
+  DiskCacheFolder* f = new DiskCacheFolder(path, this);
+  connect(f, &DiskCacheFolder::DeletedFrame, this, &DiskManager::DeletedFrame);
+  open_folders_.append(f);
+
+  return f;
 }
 
-void DiskManager::Accessed(const QString &filename)
+DiskCacheFolder::DiskCacheFolder(const QString &path, QObject *parent) :
+  QObject(parent)
 {
-  lock_.lock();
+  SetPath(path);
+}
 
-  for (int i=disk_data_.size()-1;i>=0;i--) {
-    const HashTime& h = disk_data_.at(i);
+DiskCacheFolder::~DiskCacheFolder()
+{
+  CloseCacheFolder();
+}
 
-    if (h.file_name == filename) {
-      HashTime moved_hash = h;
+bool DiskCacheFolder::ClearCache()
+{
+  bool deleted_files = true;
 
-      moved_hash.access_time = QDateTime::currentMSecsSinceEpoch();
+  std::list<HashTime>::iterator i = disk_data_.begin();
 
-      disk_data_.removeAt(i);
-      disk_data_.append(moved_hash);
-      break;
+  while (i != disk_data_.end()) {
+    // We return a false result if any of the files fail to delete, but still try to delete as many as we can
+    if (QFile::remove(i->file_name) || !QFileInfo::exists(i->file_name)) {
+      emit DeletedFrame(path_, i->hash);
+      i = disk_data_.erase(i);
+    } else {
+      qWarning() << "Failed to delete" << i->file_name;
+      deleted_files = false;
+      i++;
     }
   }
 
-  lock_.unlock();
+  return deleted_files;
 }
 
-void DiskManager::CreatedFile(const QString &file_name, const QByteArray &hash)
+void DiskCacheFolder::Accessed(const QByteArray &hash)
 {
-  lock_.lock();
+  std::list<HashTime>::iterator i = disk_data_.begin();
 
+  while (i != disk_data_.end()) {
+    if (i->hash == hash) {
+      // Copy access data and erase from list
+      HashTime accessed_hash = *i;
+      disk_data_.erase(i);
+
+      // Add it to the end
+      disk_data_.push_back(accessed_hash);
+
+      // End loop
+      break;
+    } else {
+      i++;
+    }
+  }
+}
+
+void DiskCacheFolder::CreatedFile(const QString &file_name, const QByteArray &hash)
+{
   qint64 file_size = QFile(file_name).size();
 
-  disk_data_.append({file_name, hash, QDateTime::currentMSecsSinceEpoch(), file_size});
+  disk_data_.push_back({file_name, hash, file_size});
 
   consumption_ += file_size;
 
   QList<QByteArray> deleted_hashes;
 
-  while (consumption_ > DiskLimit()) {
+  while (consumption_ > limit_) {
     deleted_hashes.append(DeleteLeastRecent());
   }
 
-  lock_.unlock();
-
   foreach (const QByteArray& h, deleted_hashes) {
-    emit DeletedFrame(h);
+    emit DeletedFrame(path_, h);
   }
 }
 
-bool DiskManager::ClearDiskCache(bool quick_delete)
+void DiskCacheFolder::SetPath(const QString &path)
 {
-  bool deleted_files;
-
-  lock_.lock();
-
-  if (quick_delete) {
-    deleted_files = QDir(FileFunctions::GetMediaCacheLocation()).removeRecursively();
+  // If this is currently set to a folder, close it out now
+  CloseCacheFolder();
 
+  // Signal that disk cache is gone
+  if (!disk_data_.empty()) {
+    foreach (const HashTime& h, disk_data_) {
+      emit DeletedFrame(path_, h.hash);
+    }
     disk_data_.clear();
-  } else {
-    deleted_files = true;
+  }
 
-    for (int i=0;i<disk_data_.size();i++) {
-      const HashTime& ht = disk_data_.at(i);
+  // Set defaults
+  clear_on_close_ = false;
+  consumption_ = 0;
+  limit_ = 21474836480; // Default to 20 GB
 
-      // We return a false result if any of the files fail to delete, but still try to delete as many as we can
-      if (QFile::remove(ht.file_name) || !QFileInfo::exists(ht.file_name)) {
-        emit DeletedFrame(ht.hash);
-        disk_data_.removeAt(i);
-        i--;
-      } else {
-        qWarning() << "Failed to delete" << ht.file_name;
-        deleted_files = false;
+  // Set path
+  path_ = path;
+
+  // Attempt to load existing index file from path
+  QDir path_dir(path_);
+  path_dir.mkpath(".");
+
+  index_path_ = path_dir.filePath(QStringLiteral("index"));
+
+  // Try to load any current cache index from file
+  QFile cache_index_file(index_path_);
+
+  if (cache_index_file.open(QFile::ReadOnly)) {
+    QDataStream ds(&cache_index_file);
+
+    ds >> limit_;
+    ds >> clear_on_close_;
+
+    while (!cache_index_file.atEnd()) {
+      HashTime h;
+
+      ds >> h.file_name;
+      ds >> h.hash;
+      ds >> h.file_size;
+
+      if (QFileInfo::exists(h.file_name)) {
+        consumption_ += h.file_size;
+        disk_data_.push_back(h);
       }
     }
+
+    cache_index_file.close();
   }
-
-  lock_.unlock();
-
-  return deleted_files;
 }
 
-QByteArray DiskManager::DeleteLeastRecent()
+QByteArray DiskCacheFolder::DeleteLeastRecent()
 {
-  HashTime h = disk_data_.takeFirst();
+  HashTime h = disk_data_.front();
+  disk_data_.pop_front();
 
   QFile::remove(h.file_name);
 
@@ -208,19 +273,37 @@ QByteArray DiskManager::DeleteLeastRecent()
   return h.hash;
 }
 
-qint64 DiskManager::DiskLimit()
+void DiskCacheFolder::CloseCacheFolder()
 {
-  double gigabytes = Config::Current()["DiskCacheSize"].toDouble();
+  if (path_.isEmpty()) {
+    return;
+  }
 
-  // Convert gigabytes to bytes
-  return qRound64(gigabytes * 1073741824);
-}
+  if (clear_on_close_) {
+    // If we're not moving to new and we're set to clear on close, clear now or else it'll never
+    // get cleared later
+    ClearCache();
+  }
 
-QString DiskManager::GetCacheIndexFilename()
-{
-  QDir d(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation));
-  d.mkpath(".");
-  return d.filePath("diskindex");
+  // Save current cache index
+  QFile cache_index_file(index_path_);
+
+  if (cache_index_file.open(QFile::WriteOnly)) {
+    QDataStream ds(&cache_index_file);
+
+    ds << limit_;
+    ds << clear_on_close_;
+
+    foreach (const HashTime& h, disk_data_) {
+      ds << h.file_name;
+      ds << h.hash;
+      ds << h.file_size;
+    }
+
+    cache_index_file.close();
+  } else {
+    qWarning() << "Failed to write cache index:" << index_path_;
+  }
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/diskmanager.h b/app/render/diskmanager.h
index 4df5f6d36..551534c4f 100644
--- a/app/render/diskmanager.h
+++ b/app/render/diskmanager.h
@@ -21,6 +21,7 @@
 #ifndef DISKMANAGER_H
 #define DISKMANAGER_H
 
+#include <QMap>
 #include <QMutex>
 #include <QObject>
 
@@ -28,6 +29,75 @@
 
 OLIVE_NAMESPACE_ENTER
 
+class DiskCacheFolder : public QObject
+{
+  Q_OBJECT
+public:
+  DiskCacheFolder(const QString& path, QObject* parent = nullptr);
+
+  virtual ~DiskCacheFolder() override;
+
+  bool ClearCache();
+
+  void Accessed(const QByteArray& hash);
+
+  void CreatedFile(const QString& file_name, const QByteArray& hash);
+
+  const QString& GetPath() const
+  {
+    return path_;
+  }
+
+  void SetPath(const QString& path);
+
+  qint64 GetLimit() const
+  {
+    return limit_;
+  }
+
+  bool GetClearOnClose() const
+  {
+    return clear_on_close_;
+  }
+
+  void SetLimit(qint64 l)
+  {
+    limit_ = l;
+  }
+
+  void SetClearOnClose(bool e)
+  {
+    clear_on_close_ = e;
+  }
+
+signals:
+  void DeletedFrame(const QString& path, const QByteArray& hash);
+
+private:
+  QByteArray DeleteLeastRecent();
+
+  void CloseCacheFolder();
+
+  QString path_;
+
+  QString index_path_;
+
+  struct HashTime {
+    QString file_name;
+    QByteArray hash;
+    qint64 file_size;
+  };
+
+  std::list<HashTime> disk_data_;
+
+  qint64 consumption_;
+
+  qint64 limit_;
+
+  bool clear_on_close_;
+
+};
+
 class DiskManager : public QObject
 {
   Q_OBJECT
@@ -38,16 +108,33 @@ public:
 
   static DiskManager* instance();
 
-  void Accessed(const QByteArray& hash);
+  bool ClearDiskCache(const QString& cache_folder);
 
-  void Accessed(const QString& filename);
+  DiskCacheFolder* GetDefaultCacheFolder() const
+  {
+    // The first folder will always be the default
+    return open_folders_.first();
+  }
 
-  void CreatedFile(const QString& file_name, const QByteArray& hash);
+  const QString& GetDefaultCachePath() const
+  {
+    return GetDefaultCacheFolder()->GetPath();
+  }
 
-  bool ClearDiskCache(bool quick_delete);
+  DiskCacheFolder* GetOpenFolder(const QString& path);
+
+  const QVector<DiskCacheFolder*>& GetOpenFolders() const
+  {
+    return open_folders_;
+  }
+
+public slots:
+  void Accessed(const QString& cache_folder, const QByteArray& hash);
+
+  void CreatedFile(const QString& cache_folder, const QString& file_name, const QByteArray& hash);
 
 signals:
-  void DeletedFrame(const QByteArray& hash);
+  void DeletedFrame(const QString& path, const QByteArray& hash);
 
 private:
   DiskManager();
@@ -56,24 +143,7 @@ private:
 
   static DiskManager* instance_;
 
-  QByteArray DeleteLeastRecent();
-
-  qint64 DiskLimit();
-
-  static QString GetCacheIndexFilename();
-
-  struct HashTime {
-    QString file_name;
-    QByteArray hash;
-    qint64 access_time;
-    qint64 file_size;
-  };
-
-  QList<HashTime> disk_data_;
-
-  qint64 consumption_;
-
-  QMutex lock_;
+  QVector<DiskCacheFolder*> open_folders_;
 
 };
 
diff --git a/app/render/framehashcache.cpp b/app/render/framehashcache.cpp
index 6d5b19463..f4e980446 100644
--- a/app/render/framehashcache.cpp
+++ b/app/render/framehashcache.cpp
@@ -227,13 +227,18 @@ QVector<rational> FrameHashCache::GetInvalidatedFrames(const TimeRange &intersec
 bool FrameHashCache::SaveCacheFrame(const QByteArray& hash,
                                     char* data,
                                     const VideoParams& vparam,
-                                    int linesize_bytes)
+                                    int linesize_bytes) const
 {
   QString fn = CachePathName(hash);
 
   if (SaveCacheFrame(fn, data, vparam, linesize_bytes)) {
     // Register frame with the disk manager
-    DiskManager::instance()->CreatedFile(fn, hash);
+    QMetaObject::invokeMethod(DiskManager::instance(),
+                              "CreatedFile",
+                              Qt::QueuedConnection,
+                              Q_ARG(QString, GetCacheDirectory()),
+                              Q_ARG(QString, fn),
+                              Q_ARG(QByteArray, hash));
 
     return true;
   } else {
@@ -241,7 +246,7 @@ bool FrameHashCache::SaveCacheFrame(const QByteArray& hash,
   }
 }
 
-bool FrameHashCache::SaveCacheFrame(const QByteArray &hash, FramePtr frame)
+bool FrameHashCache::SaveCacheFrame(const QByteArray &hash, FramePtr frame) const
 {
   if (frame) {
     return SaveCacheFrame(hash, frame->data(), frame->video_params(), frame->linesize_bytes());
@@ -251,12 +256,12 @@ bool FrameHashCache::SaveCacheFrame(const QByteArray &hash, FramePtr frame)
   }
 }
 
-FramePtr FrameHashCache::LoadCacheFrame(const QByteArray &hash)
+FramePtr FrameHashCache::LoadCacheFrame(const QByteArray &hash) const
 {
   return LoadCacheFrame(CachePathName(hash));
 }
 
-FramePtr FrameHashCache::LoadCacheFrame(const QString &fn)
+FramePtr FrameHashCache::LoadCacheFrame(const QString &fn) const
 {
   FramePtr frame = nullptr;
 
@@ -367,8 +372,13 @@ void FrameHashCache::ShiftEvent(const rational &from, const rational &to)
   }
 }
 
-void FrameHashCache::HashDeleted(const QByteArray &hash)
+void FrameHashCache::HashDeleted(const QString& s, const QByteArray &hash)
 {
+  QString cache_dir = GetCacheDirectory();
+  if (cache_dir.isEmpty() || s != cache_dir) {
+    return;
+  }
+
   QMutexLocker locker(lock());
 
   TimeRangeList invalidated;
@@ -390,22 +400,26 @@ void FrameHashCache::HashDeleted(const QByteArray &hash)
   }
 }
 
-QString FrameHashCache::CachePathName(const QByteArray& hash)
+QString FrameHashCache::CachePathName(const QByteArray& hash) const
 {
   QString ext = GetFormatExtension();
 
-  QDir cache_dir(QDir(FileFunctions::GetMediaCacheLocation()).filePath(QString(hash.left(1).toHex())));
+  QDir cache_dir(QDir(GetCacheDirectory()).filePath(QString(hash.left(1).toHex())));
   cache_dir.mkpath(".");
 
   QString filename = QStringLiteral("%1%2").arg(QString(hash.mid(1).toHex()), ext);
 
   // Register that in some way this hash has been accessed
-  DiskManager::instance()->Accessed(hash);
+  QMetaObject::invokeMethod(DiskManager::instance(),
+                            "Accessed",
+                            Qt::QueuedConnection,
+                            Q_ARG(QString, GetCacheDirectory()),
+                            Q_ARG(QByteArray, hash));
 
   return cache_dir.filePath(filename);
 }
 
-bool FrameHashCache::SaveCacheFrame(const QString &filename, char *data, const VideoParams &vparam, int linesize_bytes)
+bool FrameHashCache::SaveCacheFrame(const QString &filename, char *data, const VideoParams &vparam, int linesize_bytes) const
 {
   Q_ASSERT(PixelFormat::FormatIsFloat(vparam.format()));
 
diff --git a/app/render/framehashcache.h b/app/render/framehashcache.h
index 60bac1042..5c6fe8c58 100644
--- a/app/render/framehashcache.h
+++ b/app/render/framehashcache.h
@@ -58,13 +58,13 @@ public:
   /**
    * @brief Return the path of the cached image at this time
    */
-  static QString CachePathName(const QByteArray &hash);
+  QString CachePathName(const QByteArray &hash) const;
 
-  static bool SaveCacheFrame(const QString& filename, char *data, const VideoParams &vparam, int linesize_bytes);
-  static bool SaveCacheFrame(const QByteArray& hash, char *data, const VideoParams &vparam, int linesize_bytes);
-  static bool SaveCacheFrame(const QByteArray& hash, FramePtr frame);
-  static FramePtr LoadCacheFrame(const QByteArray& hash);
-  static FramePtr LoadCacheFrame(const QString& fn);
+  bool SaveCacheFrame(const QString& filename, char *data, const VideoParams &vparam, int linesize_bytes) const;
+  bool SaveCacheFrame(const QByteArray& hash, char *data, const VideoParams &vparam, int linesize_bytes) const;
+  bool SaveCacheFrame(const QByteArray& hash, FramePtr frame) const;
+  FramePtr LoadCacheFrame(const QByteArray& hash) const;
+  FramePtr LoadCacheFrame(const QString& fn) const;
 
   static QString GetFormatExtension();
 
@@ -87,7 +87,7 @@ private:
   rational timebase_;
 
 private slots:
-  void HashDeleted(const QByteArray& hash);
+  void HashDeleted(const QString &s, const QByteArray& hash);
 
 };
 
diff --git a/app/render/playbackcache.cpp b/app/render/playbackcache.cpp
index 9bce6a504..3bde6ebe5 100644
--- a/app/render/playbackcache.cpp
+++ b/app/render/playbackcache.cpp
@@ -22,6 +22,10 @@
 
 #include <QDateTime>
 
+#include "node/output/viewer/viewer.h"
+#include "project/item/sequence/sequence.h"
+#include "project/project.h"
+
 OLIVE_NAMESPACE_ENTER
 
 void PlaybackCache::Invalidate(const TimeRange &r)
@@ -190,4 +194,25 @@ void PlaybackCache::RemoveRangeFromJobs(const TimeRange &remove)
   }
 }
 
+QString PlaybackCache::GetCacheDirectory() const
+{
+  // NOTE: A lot of assumptions in this behavior
+  ViewerOutput* viewer = static_cast<ViewerOutput*>(parent());
+  if (!viewer) {
+    return QString();
+  }
+
+  Sequence* sequence = static_cast<Sequence*>(viewer->parent());
+  if (!sequence) {
+    return QString();
+  }
+
+  Project* project = sequence->project();
+  if (!project) {
+    return QString();
+  }
+
+  return project->cache_path();
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/playbackcache.h b/app/render/playbackcache.h
index ce54bdd7e..881476830 100644
--- a/app/render/playbackcache.h
+++ b/app/render/playbackcache.h
@@ -103,6 +103,8 @@ protected:
 
   virtual void ShiftEvent(const rational& from, const rational& to);
 
+  QString GetCacheDirectory() const;
+
   QMutex* lock()
   {
     return &lock_;
diff --git a/app/task/precache/precachetask.cpp b/app/task/precache/precachetask.cpp
index 220fb36f2..c8baf5bd3 100644
--- a/app/task/precache/precachetask.cpp
+++ b/app/task/precache/precachetask.cpp
@@ -75,7 +75,7 @@ bool PreCacheTask::Run()
 
 QFuture<void> PreCacheTask::DownloadFrame(FramePtr frame, const QByteArray &hash)
 {
-  return QtConcurrent::run(&download_threads_, FrameHashCache::SaveCacheFrame, hash, frame);
+  return QtConcurrent::run(&download_threads_, viewer()->video_frame_cache(), &FrameHashCache::SaveCacheFrame, hash, frame);
 }
 
 void PreCacheTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times, qint64 job_time)
diff --git a/app/widget/CMakeLists.txt b/app/widget/CMakeLists.txt
index 67c20349e..01ba47053 100644
--- a/app/widget/CMakeLists.txt
+++ b/app/widget/CMakeLists.txt
@@ -33,6 +33,7 @@ add_subdirectory(nodeview)
 add_subdirectory(nodeparamview)
 add_subdirectory(nodetableview)
 add_subdirectory(panel)
+add_subdirectory(path)
 add_subdirectory(pixelsampler)
 add_subdirectory(playbackcontrols)
 add_subdirectory(projectexplorer)
diff --git a/app/widget/path/CMakeLists.txt b/app/widget/path/CMakeLists.txt
new file mode 100644
index 000000000..a7bd17910
--- /dev/null
+++ b/app/widget/path/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  widget/path/pathwidget.h
+  widget/path/pathwidget.cpp
+  PARENT_SCOPE
+)
diff --git a/app/widget/path/pathwidget.cpp b/app/widget/path/pathwidget.cpp
new file mode 100644
index 000000000..b646e2d40
--- /dev/null
+++ b/app/widget/path/pathwidget.cpp
@@ -0,0 +1,68 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "pathwidget.h"
+
+#include <QDir>
+#include <QFileDialog>
+#include <QHBoxLayout>
+
+#include "common/filefunctions.h"
+
+OLIVE_NAMESPACE_ENTER
+
+PathWidget::PathWidget(const QString &path, QWidget *parent) :
+  QWidget(parent)
+{
+  QHBoxLayout* layout = new QHBoxLayout(this);
+  layout->setMargin(0);
+
+  path_edit_ = new QLineEdit();
+  path_edit_->setText(path);
+  layout->addWidget(path_edit_);
+  connect(path_edit_, &QLineEdit::textChanged, this, &PathWidget::LineEditChanged);
+
+  browse_btn_ = new QPushButton(tr("Browse"));
+  layout->addWidget(browse_btn_);
+
+  connect(browse_btn_, &QPushButton::clicked, this, &PathWidget::BrowseClicked);
+}
+
+void PathWidget::BrowseClicked()
+{
+  QString dir = QFileDialog::getExistingDirectory(static_cast<QWidget*>(parent()),
+                                                  tr("Browse for path"),
+                                                  path_edit_->text());
+
+  if (!dir.isEmpty()) {
+    path_edit_->setText(dir);
+  }
+}
+
+void PathWidget::LineEditChanged()
+{
+  if (FileFunctions::DirectoryIsValid(text(), false)) {
+    path_edit_->setStyleSheet(QString());
+  } else {
+    path_edit_->setStyleSheet(QStringLiteral("QLineEdit {color: red;}"));
+  }
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/widget/path/pathwidget.h b/app/widget/path/pathwidget.h
new file mode 100644
index 000000000..c35eae30e
--- /dev/null
+++ b/app/widget/path/pathwidget.h
@@ -0,0 +1,57 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef PATHWIDGET_H
+#define PATHWIDGET_H
+
+#include <QLineEdit>
+#include <QPushButton>
+
+#include "common/define.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class PathWidget : public QWidget
+{
+  Q_OBJECT
+public:
+  PathWidget(const QString& path,
+             QWidget* parent = nullptr);
+
+  QString text() const
+  {
+    return path_edit_->text();
+  }
+
+private slots:
+  void BrowseClicked();
+
+  void LineEditChanged();
+
+private:
+  QLineEdit* path_edit_;
+
+  QPushButton* browse_btn_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // PATHWIDGET_H
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 9ae33e60c..d8f561bd0 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -361,9 +361,9 @@ void ViewerWidget::SetGizmos(Node *node)
   display_widget_->SetGizmos(node);
 }
 
-FramePtr DecodeCachedImage(const QString &fn, const rational& time)
+FramePtr ViewerWidget::DecodeCachedImage(const QString &fn, const rational& time) const
 {
-  FramePtr frame = FrameHashCache::LoadCacheFrame(fn);
+  FramePtr frame = GetConnectedNode()->video_frame_cache()->LoadCacheFrame(fn);
 
   if (frame) {
     frame->set_timestamp(time);
@@ -374,7 +374,7 @@ FramePtr DecodeCachedImage(const QString &fn, const rational& time)
   return frame;
 }
 
-void DecodeCachedImage(RenderTicketPtr ticket, const QString &fn, const rational& time)
+void ViewerWidget::DecodeCachedImage(RenderTicketPtr ticket, const QString &fn, const rational& time) const
 {
   ticket->Finish(QVariant::fromValue(DecodeCachedImage(fn, time)));
 }
@@ -606,7 +606,7 @@ RenderTicketPtr ViewerWidget::GetFrame(const rational &t, bool clear_render_queu
     // Frame has been cached, grab the frame
     RenderTicketPtr ticket = std::make_shared<RenderTicket>(RenderTicket::kTypeVideo,
                                                             QVariant::fromValue(t));
-    QtConcurrent::run(DecodeCachedImage, ticket, cache_fn, t);
+    QtConcurrent::run(this, &ViewerWidget::DecodeCachedImage, ticket, cache_fn, t);
 
     return ticket;
   }
diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h
index 6e75c8327..6e171e6e3 100644
--- a/app/widget/viewer/viewer.h
+++ b/app/widget/viewer/viewer.h
@@ -204,6 +204,10 @@ private:
 
   void PopOldestFrameFromPlaybackQueue();
 
+  FramePtr DecodeCachedImage(const QString &fn, const rational& time) const;
+
+  void DecodeCachedImage(RenderTicketPtr ticket, const QString &fn, const rational& time) const;
+
   QStackedWidget* stack_;
 
   ViewerSizer* sizer_;

From d85089f71acb38c6cc3ef3be2d06e50e380644d6 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 7 Aug 2020 13:41:09 +1000
Subject: [PATCH 099/138] cache: improved setting manual cache path on a per
 project basis

---
 .../preferences/tabs/preferencesdisktab.cpp   |  8 +-
 .../projectproperties/projectproperties.cpp   | 23 +++--
 app/project/project.cpp                       | 15 +++
 app/project/project.h                         | 11 +--
 app/render/audioplaybackcache.cpp             | 25 ++---
 app/render/audioplaybackcache.h               | 13 +--
 app/render/diskmanager.cpp                    |  9 ++
 app/render/diskmanager.h                      |  5 +
 app/render/framehashcache.cpp                 | 71 +++-----------
 app/render/framehashcache.h                   |  2 +
 app/render/playbackcache.cpp                  | 94 +++++++------------
 app/render/playbackcache.h                    | 37 ++------
 12 files changed, 119 insertions(+), 194 deletions(-)

diff --git a/app/dialog/preferences/tabs/preferencesdisktab.cpp b/app/dialog/preferences/tabs/preferencesdisktab.cpp
index b62e6f965..ea167d0c9 100644
--- a/app/dialog/preferences/tabs/preferencesdisktab.cpp
+++ b/app/dialog/preferences/tabs/preferencesdisktab.cpp
@@ -102,12 +102,8 @@ bool PreferencesDiskTab::Validate()
   if (disk_cache_location_->text() != default_disk_cache_folder_->GetPath()) {
     // Disk cache location is changing
 
-    // Check if the user wants to move the cache here
-    if (QMessageBox::question(this,
-                              tr("Disk Cache"),
-                              tr("You've chosen to change the default disk cache location. This "
-                                 "will invalidate your current cache. Would you like to continue?"),
-                              QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel) {
+    // Check if the user is okay with invalidating the current cache
+    if (!DiskManager::ShowDiskCacheChangeConfirmationDialog(this)) {
       return false;
     }
 
diff --git a/app/dialog/projectproperties/projectproperties.cpp b/app/dialog/projectproperties/projectproperties.cpp
index 8a1b61655..abddcc295 100644
--- a/app/dialog/projectproperties/projectproperties.cpp
+++ b/app/dialog/projectproperties/projectproperties.cpp
@@ -34,6 +34,7 @@ namespace OCIO = OCIO_NAMESPACE::v1;
 #include "config/config.h"
 #include "core.h"
 #include "render/colormanager.h"
+#include "render/diskmanager.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -89,8 +90,6 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) :
     color_outer_layout->addStretch();
   }
 
-  
-
   {
     // Cache group
     QWidget* cache_group = new QWidget();
@@ -148,9 +147,10 @@ void ProjectPropertiesDialog::accept()
     return;
   }
 
+  QString new_cache_path;
+
   if (disk_cache_use_default_btn_->isChecked()) {
-    // Empty cache path means default
-    working_project_->set_cache_path(QString());
+    // Keep new cache path empty, which means default
   } else if (disk_cache_store_alongside_project_btn_->isChecked()) {
     QMessageBox::information(this, QString(), tr("\"Store alignside project\" functionality not implemented yet"));
     return;
@@ -166,7 +166,19 @@ void ProjectPropertiesDialog::accept()
       return;
     }
 
-    working_project_->set_cache_path(cache_path_->text());
+    // Set new path to the text as entered
+    new_cache_path = cache_path_->text();
+  }
+
+  if (new_cache_path != working_project_->cache_path(false)) {
+    // Check if the user is okay with invalidating the current cache
+    if (!DiskManager::ShowDiskCacheChangeConfirmationDialog(this)) {
+      return;
+    }
+
+    working_project_->set_cache_path(new_cache_path);
+
+    emit DiskManager::instance()->InvalidateProject(working_project_);
   }
 
   // This should ripple changes throughout the program that the color config has changed, therefore must be done last
@@ -210,7 +222,6 @@ void ProjectPropertiesDialog::OCIOFilenameUpdated()
         default_input_colorspace_->setCurrentIndex(default_input_colorspace_->count()-1);
       }
     }
-
   } catch (OCIO::Exception& e) {
     ocio_config_is_valid_ = false;
     ocio_filename_->setStyleSheet(QStringLiteral("QLineEdit {color: red;}"));
diff --git a/app/project/project.cpp b/app/project/project.cpp
index 5b14774d9..fe1e307aa 100644
--- a/app/project/project.cpp
+++ b/app/project/project.cpp
@@ -26,6 +26,7 @@
 #include "common/xmlutils.h"
 #include "core.h"
 #include "dialog/progress/progress.h"
+#include "render/diskmanager.h"
 #include "window/mainwindow/mainwindow.h"
 
 OLIVE_NAMESPACE_ENTER
@@ -63,6 +64,10 @@ void Project::Load(QXmlStreamReader *reader, MainWindowLayoutInfo* layout, const
         }
       }
 
+    } else if (reader->name() == QStringLiteral("cachepath")) {
+
+      set_cache_path(reader->readElementText());
+
     } else if (reader->name() == QStringLiteral("layout")) {
 
       // Since the main window's functions have to occur in the GUI thread (and we're likely
@@ -98,6 +103,8 @@ void Project::Save(QXmlStreamWriter *writer) const
 
   writer->writeTextElement("url", filename_);
 
+  writer->writeTextElement("cachepath", cache_path(false));
+
   root_.Save(writer);
 
   writer->writeStartElement("colormanagement");
@@ -195,4 +202,12 @@ bool Project::is_new() const
   return !is_modified_ && filename_.isEmpty();
 }
 
+const QString &Project::cache_path(bool default_if_empty) const
+{
+  if (cache_path_.isEmpty() && default_if_empty) {
+    return DiskManager::instance()->GetDefaultCachePath();
+  }
+  return cache_path_;
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/project/project.h b/app/project/project.h
index 2a806c29c..9fa99ce48 100644
--- a/app/project/project.h
+++ b/app/project/project.h
@@ -25,7 +25,6 @@
 #include <memory>
 
 #include "render/colormanager.h"
-#include "render/diskmanager.h"
 #include "project/item/folder/folder.h"
 #include "window/mainwindow/mainwindowlayoutinfo.h"
 
@@ -72,14 +71,10 @@ public:
 
   bool is_new() const;
 
-  const QString& cache_path(bool default_if_empty = true) const {
-    if (cache_path_.isEmpty() && default_if_empty) {
-      return DiskManager::instance()->GetDefaultCachePath();
-    }
-    return cache_path_;
-  }
+  const QString& cache_path(bool default_if_empty = true) const;
 
-  void set_cache_path(const QString& cache_path) {
+  void set_cache_path(const QString& cache_path)
+  {
     cache_path_ = cache_path;
   }
 
diff --git a/app/render/audioplaybackcache.cpp b/app/render/audioplaybackcache.cpp
index 3a1a78a34..e8ba9dabc 100644
--- a/app/render/audioplaybackcache.cpp
+++ b/app/render/audioplaybackcache.cpp
@@ -37,8 +37,6 @@ AudioPlaybackCache::AudioPlaybackCache(QObject* parent) :
 
 void AudioPlaybackCache::SetParameters(const AudioParams &params)
 {
-  QMutexLocker locker(lock());
-
   if (params_ == params) {
     return;
   }
@@ -52,22 +50,17 @@ void AudioPlaybackCache::SetParameters(const AudioParams &params)
   }
 
   // Our current audio cache is unusable, so we truncate it automatically
-  TimeRange invalidate_range(0, NoLockGetLength());
+  TimeRange invalidate_range(0, GetLength());
   if (invalidate_range.in() != invalidate_range.out()) {
-    NoLockInvalidate(invalidate_range);
+    Invalidate(invalidate_range);
   }
 
-  locker.unlock();
-
   emit ParametersChanged();
-  emit Invalidated(invalidate_range);
 }
 
 void AudioPlaybackCache::WritePCM(const TimeRange &range, SampleBufferPtr samples, const qint64 &job_time)
 {
-  QMutexLocker locker(lock());
-
-  QList<TimeRange> valid_ranges = NoLockGetValidRanges(range, job_time);
+  QList<TimeRange> valid_ranges = GetValidRanges(range, job_time);
   if (valid_ranges.isEmpty()) {
     return;
   }
@@ -102,11 +95,7 @@ void AudioPlaybackCache::WritePCM(const TimeRange &range, SampleBufferPtr sample
 
     f.close();
 
-    NoLockValidate(range);
-
-    locker.unlock();
-
-    emit Validated(range);
+    Validate(range);
   } else {
     qWarning() << "Failed to write PCM data to" << filename_;
   }
@@ -114,8 +103,6 @@ void AudioPlaybackCache::WritePCM(const TimeRange &range, SampleBufferPtr sample
 
 void AudioPlaybackCache::WriteSilence(const TimeRange &range)
 {
-  QMutexLocker locker(lock());
-
   QFile f(filename_);
   if (f.open(QFile::ReadWrite)) {
     qint64 start_offset = params_.time_to_bytes(range.in());
@@ -132,6 +119,8 @@ void AudioPlaybackCache::WriteSilence(const TimeRange &range)
     f.write(a);
 
     f.close();
+
+    Validate(range);
   } else {
     qWarning() << "Failed to write PCM data to" << filename_;
   }
@@ -232,7 +221,7 @@ void AudioPlaybackCache::LengthChangedEvent(const rational& old, const rational&
   }
 }
 
-QList<TimeRange> AudioPlaybackCache::NoLockGetValidRanges(const TimeRange& range, const qint64& job_time)
+QList<TimeRange> AudioPlaybackCache::GetValidRanges(const TimeRange& range, const qint64& job_time)
 {
   QList<TimeRange> valid_ranges;
 
diff --git a/app/render/audioplaybackcache.h b/app/render/audioplaybackcache.h
index 5fdb224df..fe9c7cd6f 100644
--- a/app/render/audioplaybackcache.h
+++ b/app/render/audioplaybackcache.h
@@ -33,8 +33,8 @@ class AudioPlaybackCache : public PlaybackCache
 public:
   AudioPlaybackCache(QObject* parent = nullptr);
 
-  AudioParams GetParameters() {
-    QMutexLocker locker(lock());
+  AudioParams GetParameters()
+  {
     return params_;
   }
 
@@ -48,12 +48,7 @@ public:
 
   const QString& GetCacheFilename() const;
 
-  QList<TimeRange> GetValidRanges(const TimeRange &range, const qint64 &job_time)
-  {
-    QMutexLocker locker(lock());
-
-    return NoLockGetValidRanges(range, job_time);
-  }
+  QList<TimeRange> GetValidRanges(const TimeRange &range, const qint64 &job_time);
 
 signals:
   void ParametersChanged();
@@ -64,8 +59,6 @@ protected:
   virtual void LengthChangedEvent(const rational& old, const rational& newlen) override;
 
 private:
-  QList<TimeRange> NoLockGetValidRanges(const TimeRange &range, const qint64 &job_time);
-
   void UpdateFilename(const QString& s);
 
   QString filename_;
diff --git a/app/render/diskmanager.cpp b/app/render/diskmanager.cpp
index 076bf0475..7194e63b6 100644
--- a/app/render/diskmanager.cpp
+++ b/app/render/diskmanager.cpp
@@ -136,6 +136,15 @@ DiskCacheFolder *DiskManager::GetOpenFolder(const QString &path)
   return f;
 }
 
+bool DiskManager::ShowDiskCacheChangeConfirmationDialog(QWidget *parent)
+{
+  return (QMessageBox::question(parent,
+                                tr("Disk Cache"),
+                                tr("You've chosen to change the default disk cache location. This "
+                                   "will invalidate your current cache. Would you like to continue?"),
+                                QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok);
+}
+
 DiskCacheFolder::DiskCacheFolder(const QString &path, QObject *parent) :
   QObject(parent)
 {
diff --git a/app/render/diskmanager.h b/app/render/diskmanager.h
index 551534c4f..9fc04cf7a 100644
--- a/app/render/diskmanager.h
+++ b/app/render/diskmanager.h
@@ -26,6 +26,7 @@
 #include <QObject>
 
 #include "common/define.h"
+#include "project/project.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -128,6 +129,8 @@ public:
     return open_folders_;
   }
 
+  static bool ShowDiskCacheChangeConfirmationDialog(QWidget* parent);
+
 public slots:
   void Accessed(const QString& cache_folder, const QByteArray& hash);
 
@@ -136,6 +139,8 @@ public slots:
 signals:
   void DeletedFrame(const QString& path, const QByteArray& hash);
 
+  void InvalidateProject(Project* p);
+
 private:
   DiskManager();
 
diff --git a/app/render/framehashcache.cpp b/app/render/framehashcache.cpp
index f4e980446..7ed84d274 100644
--- a/app/render/framehashcache.cpp
+++ b/app/render/framehashcache.cpp
@@ -39,20 +39,17 @@ FrameHashCache::FrameHashCache(QObject *parent) :
 {
   if (DiskManager::instance()) {
     connect(DiskManager::instance(), &DiskManager::DeletedFrame, this, &FrameHashCache::HashDeleted);
+    connect(DiskManager::instance(), &DiskManager::InvalidateProject, this, &FrameHashCache::ProjectInvalidated);
   }
 }
 
 QByteArray FrameHashCache::GetHash(const rational &time)
 {
-  QMutexLocker locker(lock());
-
   return time_hash_map_.value(time);
 }
 
 void FrameHashCache::SetHash(const rational &time, const QByteArray &hash, const qint64& job_time, bool frame_exists)
 {
-  QMutexLocker locker(lock());
-
   bool is_current = false;
 
   for (int i=jobs_.size()-1; i>=0; i--) {
@@ -74,54 +71,34 @@ void FrameHashCache::SetHash(const rational &time, const QByteArray &hash, const
   TimeRange validated_range;
   if (frame_exists) {
     validated_range = TimeRange(time, time + timebase_);
-    NoLockValidate(validated_range);
-  }
-
-  locker.unlock();
-
-  if (frame_exists) {
-    emit Validated(validated_range);
+    Validate(validated_range);
   }
 }
 
 void FrameHashCache::SetTimebase(const rational &tb)
 {
-  QMutexLocker locker(lock());
-
   timebase_ = tb;
 }
 
 void FrameHashCache::ValidateFramesWithHash(const QByteArray &hash)
 {
-  QMutexLocker locker(lock());
-
   QMap<rational, QByteArray>::const_iterator iterator;
 
-  const TimeRangeList& invalidated_ranges = NoLockGetInvalidatedRanges();
-  TimeRangeList ranges_validated;
+  const TimeRangeList& invalidated_ranges = GetInvalidatedRanges();
 
   for (iterator=time_hash_map_.begin();iterator!=time_hash_map_.end();iterator++) {
     if (iterator.value() == hash) {
       TimeRange frame_range(iterator.key(), iterator.key() + timebase_);
 
       if (invalidated_ranges.ContainsTimeRange(frame_range)) {
-        NoLockValidate(frame_range);
-        ranges_validated.InsertTimeRange(frame_range);
+        Validate(frame_range);
       }
     }
   }
-
-  locker.unlock();
-
-  foreach (const TimeRange& range, ranges_validated) {
-    emit Validated(range);
-  }
 }
 
 QList<rational> FrameHashCache::GetFramesWithHash(const QByteArray &hash)
 {
-  QMutexLocker locker(lock());
-
   QList<rational> times;
 
   QMap<rational, QByteArray>::const_iterator iterator;
@@ -137,8 +114,6 @@ QList<rational> FrameHashCache::GetFramesWithHash(const QByteArray &hash)
 
 QList<rational> FrameHashCache::TakeFramesWithHash(const QByteArray &hash)
 {
-  QMutexLocker locker(lock());
-
   QList<rational> times;
 
   QMap<rational, QByteArray>::iterator iterator = time_hash_map_.begin();
@@ -154,13 +129,7 @@ QList<rational> FrameHashCache::TakeFramesWithHash(const QByteArray &hash)
   }
 
   foreach (const rational& r, times) {
-    NoLockInvalidate(TimeRange(r, r + timebase_));
-  }
-
-  locker.unlock();
-
-  foreach (const rational& r, times) {
-    emit Invalidated(TimeRange(r, r + timebase_));
+    Invalidate(TimeRange(r, r + timebase_));
   }
 
   return times;
@@ -168,8 +137,6 @@ QList<rational> FrameHashCache::TakeFramesWithHash(const QByteArray &hash)
 
 QMap<rational, QByteArray> FrameHashCache::time_hash_map()
 {
-  QMutexLocker locker(lock());
-
   return time_hash_map_;
 }
 
@@ -205,23 +172,17 @@ QVector<rational> FrameHashCache::GetFrameListFromTimeRange(TimeRangeList range_
 
 QVector<rational> FrameHashCache::GetFrameListFromTimeRange(const TimeRangeList &range)
 {
-  QMutexLocker locker(lock());
-
   return GetFrameListFromTimeRange(range, timebase_);
 }
 
 QVector<rational> FrameHashCache::GetInvalidatedFrames()
 {
-  QMutexLocker locker(lock());
-
-  return GetFrameListFromTimeRange(NoLockGetInvalidatedRanges(), timebase_);
+  return GetFrameListFromTimeRange(GetInvalidatedRanges());
 }
 
 QVector<rational> FrameHashCache::GetInvalidatedFrames(const TimeRange &intersecting)
 {
-  QMutexLocker locker(lock());
-
-  return GetFrameListFromTimeRange(NoLockGetInvalidatedRanges().Intersects(intersecting), timebase_);
+  return GetFrameListFromTimeRange(GetInvalidatedRanges().Intersects(intersecting));
 }
 
 bool FrameHashCache::SaveCacheFrame(const QByteArray& hash,
@@ -379,24 +340,20 @@ void FrameHashCache::HashDeleted(const QString& s, const QByteArray &hash)
     return;
   }
 
-  QMutexLocker locker(lock());
-
-  TimeRangeList invalidated;
-
   QMap<rational, QByteArray>::const_iterator i;
   for (i=time_hash_map_.constBegin(); i!=time_hash_map_.constEnd(); i++) {
     if (i.value() == hash) {
-      TimeRange r(i.key(), i.key() + timebase_);
-
-      NoLockInvalidate(r);
-      invalidated.InsertTimeRange(r);
+      Invalidate(TimeRange(i.key(), i.key() + timebase_));
     }
   }
+}
 
-  locker.unlock();
+void FrameHashCache::ProjectInvalidated(Project *p)
+{
+  if (GetProject() == p) {
+    time_hash_map_.clear();
 
-  foreach (const TimeRange& r, invalidated) {
-    emit Invalidated(r);
+    InvalidateAll();
   }
 }
 
diff --git a/app/render/framehashcache.h b/app/render/framehashcache.h
index 5c6fe8c58..d3314e587 100644
--- a/app/render/framehashcache.h
+++ b/app/render/framehashcache.h
@@ -89,6 +89,8 @@ private:
 private slots:
   void HashDeleted(const QString &s, const QByteArray& hash);
 
+  void ProjectInvalidated(Project* p);
+
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/playbackcache.cpp b/app/render/playbackcache.cpp
index 3bde6ebe5..d791e4bd9 100644
--- a/app/render/playbackcache.cpp
+++ b/app/render/playbackcache.cpp
@@ -30,36 +30,30 @@ OLIVE_NAMESPACE_ENTER
 
 void PlaybackCache::Invalidate(const TimeRange &r)
 {
-  QMutexLocker locker(lock());
+  Q_ASSERT(r.in() != r.out());
 
-  NoLockInvalidate(r);
+  invalidated_.InsertTimeRange(r);
 
-  locker.unlock();
+  RemoveRangeFromJobs(r);
+  qint64 job_time = QDateTime::currentMSecsSinceEpoch();
+  jobs_.append({r, job_time});
+
+  InvalidateEvent(r);
 
   emit Invalidated(r);
 }
 
 void PlaybackCache::InvalidateAll()
 {
-  QMutexLocker locker(lock());
-
   if (length_.isNull()) {
     return;
   }
 
-  TimeRange invalidate_range(0, length_);
-
-  NoLockInvalidate(invalidate_range);
-
-  locker.unlock();
-
-  emit Invalidated(invalidate_range);
+  Invalidate(TimeRange(0, length_));
 }
 
 void PlaybackCache::SetLength(const rational &r)
 {
-  QMutexLocker locker(lock());
-
   if (length_ == r) {
     // Same length - do nothing
     return;
@@ -85,8 +79,6 @@ void PlaybackCache::SetLength(const rational &r)
   rational old_length = length_;
   length_ = r;
 
-  locker.unlock();
-
   if (r > old_length) {
     emit Invalidated(range_diff);
   } else {
@@ -100,21 +92,19 @@ void PlaybackCache::Shift(const rational &from, const rational &to)
     return;
   }
 
-  QMutexLocker locker(lock());
-
   // An region between `from` and `to` will be inserted or spliced out
   TimeRangeList ranges_to_shift = invalidated_.Intersects(TimeRange(from, RATIONAL_MAX));
 
   // Remove everything from the minimum point
   TimeRange remove_range = TimeRange(qMin(from, to), RATIONAL_MAX);
-  NoLockValidate(remove_range);
   RemoveRangeFromJobs(remove_range);
+  Validate(remove_range);
 
   // Shift everything in our ranges to shift list
   // (`diff` is POSITIVE when moving forward -> and NEGATIVE when moving backward <-)
   rational diff = to - from;
   foreach (const TimeRange& r, ranges_to_shift) {
-    NoLockInvalidate(r + diff);
+    Invalidate(r + diff);
   }
 
   ShiftEvent(from, to);
@@ -123,38 +113,18 @@ void PlaybackCache::Shift(const rational &from, const rational &to)
 
   if (diff > rational()) {
     // If shifting forward, add this section to the invalidated region
-    NoLockInvalidate(TimeRange(from, to));
+    Invalidate(TimeRange(from, to));
   }
 
-  locker.unlock();
-
   // Emit signals
-  emit Validated(remove_range);
-  foreach (const TimeRange& r, ranges_to_shift) {
-    emit Invalidated(r + diff);
-  }
-  if (diff > rational()) {
-    emit Invalidated(TimeRange(from, to));
-  }
   emit Shifted(from, to);
 }
 
-void PlaybackCache::NoLockInvalidate(const TimeRange &r)
-{
-  Q_ASSERT(r.in() != r.out());
-
-  invalidated_.InsertTimeRange(r);
-
-  RemoveRangeFromJobs(r);
-  qint64 job_time = QDateTime::currentMSecsSinceEpoch();
-  jobs_.append({r, job_time});
-
-  InvalidateEvent(r);
-}
-
-void PlaybackCache::NoLockValidate(const TimeRange &r)
+void PlaybackCache::Validate(const TimeRange &r)
 {
   invalidated_.RemoveTimeRange(r);
+
+  emit Validated(r);
 }
 
 void PlaybackCache::LengthChangedEvent(const rational &, const rational &)
@@ -169,6 +139,22 @@ void PlaybackCache::ShiftEvent(const rational &, const rational &)
 {
 }
 
+Project *PlaybackCache::GetProject() const
+{
+  // NOTE: A lot of assumptions in this behavior
+  ViewerOutput* viewer = static_cast<ViewerOutput*>(parent());
+  if (!viewer) {
+    return nullptr;
+  }
+
+  Sequence* sequence = static_cast<Sequence*>(viewer->parent());
+  if (!sequence) {
+    return nullptr;
+  }
+
+  return sequence->project();
+}
+
 void PlaybackCache::RemoveRangeFromJobs(const TimeRange &remove)
 {
   // Code shamelessly copied from TimeRangeList::RemoveTimeRange
@@ -196,23 +182,13 @@ void PlaybackCache::RemoveRangeFromJobs(const TimeRange &remove)
 
 QString PlaybackCache::GetCacheDirectory() const
 {
-  // NOTE: A lot of assumptions in this behavior
-  ViewerOutput* viewer = static_cast<ViewerOutput*>(parent());
-  if (!viewer) {
+  Project* project = GetProject();
+
+  if (project) {
+    return project->cache_path();
+  } else {
     return QString();
   }
-
-  Sequence* sequence = static_cast<Sequence*>(viewer->parent());
-  if (!sequence) {
-    return QString();
-  }
-
-  Project* project = sequence->project();
-  if (!project) {
-    return QString();
-  }
-
-  return project->cache_path();
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/playbackcache.h b/app/render/playbackcache.h
index 881476830..2f857d4c1 100644
--- a/app/render/playbackcache.h
+++ b/app/render/playbackcache.h
@@ -28,6 +28,8 @@
 
 OLIVE_NAMESPACE_ENTER
 
+class Project;
+
 class PlaybackCache : public QObject
 {
   Q_OBJECT
@@ -43,17 +45,13 @@ public:
 
   const rational& GetLength()
   {
-    QMutexLocker locker(lock());
-
-    return NoLockGetLength();
+    return length_;
   }
 
   void SetLength(const rational& r);
 
   bool IsFullyValidated()
   {
-    QMutexLocker locker(lock());
-
     return invalidated_.isEmpty();
   }
 
@@ -61,15 +59,11 @@ public:
 
   const TimeRangeList& GetInvalidatedRanges()
   {
-    QMutexLocker locker(lock());
-
-    return NoLockGetInvalidatedRanges();
+    return invalidated_;
   }
 
   bool HasInvalidatedRanges()
   {
-    QMutexLocker locker(lock());
-
     return !invalidated_.isEmpty();
   }
 
@@ -83,19 +77,7 @@ signals:
   void LengthChanged(const OLIVE_NAMESPACE::rational& r);
 
 protected:
-  void NoLockInvalidate(const TimeRange& r);
-
-  void NoLockValidate(const TimeRange& r);
-
-  const rational& NoLockGetLength() const
-  {
-    return length_;
-  }
-
-  const TimeRangeList& NoLockGetInvalidatedRanges()
-  {
-    return invalidated_;
-  }
+  void Validate(const TimeRange& r);
 
   virtual void LengthChangedEvent(const rational& old, const rational& newlen);
 
@@ -103,12 +85,9 @@ protected:
 
   virtual void ShiftEvent(const rational& from, const rational& to);
 
-  QString GetCacheDirectory() const;
+  Project* GetProject() const;
 
-  QMutex* lock()
-  {
-    return &lock_;
-  }
+  QString GetCacheDirectory() const;
 
   struct JobIdentifier {
     TimeRange range;
@@ -120,8 +99,6 @@ protected:
 private:
   void RemoveRangeFromJobs(const TimeRange& remove);
 
-  QMutex lock_;
-
   TimeRangeList invalidated_;
 
   rational length_;

From 1b2b5d3b7532267548d9683cf2f6dea93b78e7de Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 7 Aug 2020 19:00:09 +1000
Subject: [PATCH 100/138] diskmanager: save configured disk cache location

---
 app/render/diskmanager.cpp | 36 ++++++++++++++++++++++++++++--------
 app/render/diskmanager.h   |  4 ++++
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/app/render/diskmanager.cpp b/app/render/diskmanager.cpp
index 7194e63b6..d8883ca89 100644
--- a/app/render/diskmanager.cpp
+++ b/app/render/diskmanager.cpp
@@ -39,16 +39,18 @@ DiskManager* DiskManager::instance_ = nullptr;
 DiskManager::DiskManager()
 {
   // Add default cache location
-  QFile default_disk_cache_file(QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("defaultdiskcache")));
+  QFile default_disk_cache_file(GetDefaultDiskCacheConfigFile());
   if (default_disk_cache_file.open(QFile::ReadOnly)) {
     QString default_dir = default_disk_cache_file.readAll();
 
-    if (FileFunctions::DirectoryIsValid(default_dir, true)) {
-      GetOpenFolder(default_dir);
-    } else {
-      QMessageBox::warning(nullptr,
-                           tr("Disk Cache Error"),
-                           tr("Unable to set custom application disk cache. Using default instead."));
+    if (!default_dir.isEmpty()) {
+      if (FileFunctions::DirectoryIsValid(default_dir, true)) {
+        GetOpenFolder(default_dir);
+      } else {
+        QMessageBox::warning(nullptr,
+                             tr("Disk Cache Error"),
+                             tr("Unable to set custom application disk cache. Using default instead."));
+      }
     }
 
     default_disk_cache_file.close();
@@ -56,7 +58,7 @@ DiskManager::DiskManager()
 
   // If no custom default was loaded, load default
   if (open_folders_.isEmpty()) {
-    GetOpenFolder(QDir(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation)).filePath("mediacache"));
+    GetOpenFolder(GetDefaultDiskCachePath());
   }
 
   QFile disk_cache_index(QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("diskcache")));
@@ -75,6 +77,14 @@ DiskManager::DiskManager()
 
 DiskManager::~DiskManager()
 {
+  QFile default_disk_cache_file(GetDefaultDiskCacheConfigFile());
+  if (default_disk_cache_file.open(QFile::WriteOnly)) {
+    if (GetDefaultDiskCachePath() != GetDefaultCachePath()) {
+      default_disk_cache_file.write(GetDefaultCachePath().toUtf8());
+    }
+
+    default_disk_cache_file.close();
+  }
 }
 
 void DiskManager::CreateInstance()
@@ -145,6 +155,16 @@ bool DiskManager::ShowDiskCacheChangeConfirmationDialog(QWidget *parent)
                                 QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok);
 }
 
+QString DiskManager::GetDefaultDiskCacheConfigFile()
+{
+  return QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("defaultdiskcache"));
+}
+
+QString DiskManager::GetDefaultDiskCachePath()
+{
+  return QDir(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation)).filePath("mediacache");
+}
+
 DiskCacheFolder::DiskCacheFolder(const QString &path, QObject *parent) :
   QObject(parent)
 {
diff --git a/app/render/diskmanager.h b/app/render/diskmanager.h
index 9fc04cf7a..6c46082c8 100644
--- a/app/render/diskmanager.h
+++ b/app/render/diskmanager.h
@@ -131,6 +131,10 @@ public:
 
   static bool ShowDiskCacheChangeConfirmationDialog(QWidget* parent);
 
+  static QString GetDefaultDiskCacheConfigFile();
+
+  static QString GetDefaultDiskCachePath();
+
 public slots:
   void Accessed(const QString& cache_folder, const QByteArray& hash);
 

From 849e051fa4552043be53dc8108d9a35f7a658ce7 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 7 Aug 2020 19:58:44 +1000
Subject: [PATCH 101/138] ci: build debug builds rather than release builds

---
 .appveyor/build.bat | 6 +++---
 .travis/script.sh   | 4 ++--
 app/CMakeLists.txt  | 9 +++++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.appveyor/build.bat b/.appveyor/build.bat
index e2c6b553f..8dbb7ffae 100644
--- a/.appveyor/build.bat
+++ b/.appveyor/build.bat
@@ -11,8 +11,8 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary
 REM Install 64-bit packages
 set VCPKG_DEFAULT_TRIPLET=x64-windows
 
-REM Hack to only install release builds for time
-echo set(VCPKG_BUILD_TYPE release) >> C:\Tools\vcpkg\triplets\x64-windows.cmake
+REM Hack to only install debug builds for time
+echo set(VCPKG_BUILD_TYPE debug) >> C:\Tools\vcpkg\triplets\x64-windows.cmake
 
 REM Install Open*IO libraries
 vcpkg install opencolorio
@@ -34,7 +34,7 @@ REM Add Qt and FFmpeg directory to path
 set PATH=%PATH%;C:\Qt\5.13.2\msvc2017_64\bin;%APPVEYOR_BUILD_FOLDER%\%FFMPEG_VER%-dev
 
 REM Run cmake
-cmake -G "Ninja" . -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
+cmake -G "Ninja" . -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Debug
 
 REM Build with Ninja
 ninja.exe || exit /B 1
diff --git a/.travis/script.sh b/.travis/script.sh
index defeda5b2..ddd32883f 100644
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -6,7 +6,7 @@ export VERSION=$(git rev-parse --short=8 HEAD)
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 
     # Generate Makefile
-    cmake .
+    cmake . -DCMAKE_BUILD_TYPE=Debug
 
     # Make
     make -j$(sysctl -n hw.ncpu)
@@ -50,7 +50,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
     # Generate Makefile
-    cmake .
+    cmake . -DCMAKE_BUILD_TYPE=Debug
 
     # Make
     make -j$(nproc)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 7ea42d7f5..6989e6862 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -84,6 +84,11 @@ target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS})
 
 # Set compiler options
 if(MSVC)
+  STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+  STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+  STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+
   target_compile_options(
     ${OLIVE_TARGET}
     PRIVATE
@@ -93,14 +98,14 @@ if(MSVC)
     /experimental:external
     /external:anglebrackets
     /external:W0
-    "$<$<CONFIG:RELEASE>:/O2>"
+    /O2
     "$<$<COMPILE_LANGUAGE:CXX>:/MP>"
   )
 else()
   target_compile_options(
     ${OLIVE_TARGET}
     PRIVATE
-    "$<$<CONFIG:RELEASE>:-O2>"
+    -O2
     -Werror
     -Wuninitialized
     -pedantic-errors

From c6dd0e02042040c630a1b074b4f33078959ee98d Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 7 Aug 2020 20:17:01 +1000
Subject: [PATCH 102/138] nodeview: select on right click

---
 app/widget/nodeview/nodeview.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp
index 4dbbd72f1..b8d7e526f 100644
--- a/app/widget/nodeview/nodeview.cpp
+++ b/app/widget/nodeview/nodeview.cpp
@@ -341,6 +341,19 @@ void NodeView::mousePressEvent(QMouseEvent *event)
 {
   if (HandPress(event)) return;
 
+  if (event->button() == Qt::RightButton) {
+    // Qt doesn't do this by default for some reason
+    if (!(event->modifiers() & Qt::ShiftModifier)) {
+      scene_.clearSelection();
+    }
+
+    // If there's an item here, select it
+    QGraphicsItem* item = itemAt(event->pos());
+    if (item) {
+      item->setSelected(true);
+    }
+  }
+
   super::mousePressEvent(event);
 }
 

From aa31f8ac9787e173aea239e5710ffc04cdd79008 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 7 Aug 2020 22:46:07 +1000
Subject: [PATCH 103/138] fixed shadowed parameter

---
 app/widget/scope/histogram/histogram.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/widget/scope/histogram/histogram.cpp b/app/widget/scope/histogram/histogram.cpp
index faa546d06..e89918c06 100644
--- a/app/widget/scope/histogram/histogram.cpp
+++ b/app/widget/scope/histogram/histogram.cpp
@@ -91,16 +91,16 @@ OpenGLShaderPtr HistogramScope::CreateShader()
 
 OpenGLShaderPtr HistogramScope::CreateSecondaryShader()
 {
-  OpenGLShaderPtr pipeline_secondary_ = OpenGLShader::Create();
+  OpenGLShaderPtr shader = OpenGLShader::Create();
 
-  pipeline_secondary_->create();
-  pipeline_secondary_->addShaderFromSourceCode(QOpenGLShader::Vertex,
+  shader->create();
+  shader->addShaderFromSourceCode(QOpenGLShader::Vertex,
     Node::ReadFileAsString(":/shaders/rgbhistogram.vert"));
-  pipeline_secondary_->addShaderFromSourceCode(QOpenGLShader::Fragment,
+  shader->addShaderFromSourceCode(QOpenGLShader::Fragment,
     Node::ReadFileAsString(":/shaders/rgbhistogram_secondary.frag"));
-  pipeline_secondary_->link();
+  shader->link();
 
-  return pipeline_secondary_;
+  return shader;
 }
 
 void HistogramScope::DrawScope()

From 0cd4edad57b366d9979ff5b46dacbfb5084e3e5e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 7 Aug 2020 23:29:25 +1000
Subject: [PATCH 104/138] cmake: fixed macos/brew compile issue

---
 app/CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 6989e6862..987193fbd 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -131,9 +131,17 @@ target_include_directories(
   ${FFMPEG_INCLUDE_DIRS}
   ${OCIO_INCLUDE_DIRS}
   ${OIIO_INCLUDE_DIRS}
-  ${OPENEXR_INCLUDE_DIR}
+
+  # HACK: Brew on macOS separates the OpenEXR and IlmBase headers while they seem to expect to be
+  # in the same folder. So we link to that folder directly here.
+  ${ILMBASE_INCLUDES}/OpenEXR
+
+  ${OPENEXR_INCLUDES}
 )
 
+message("OpenEXR Includes: " ${OPENEXR_INCLUDES})
+message("ILMBASE Includes: " ${ILMBASE_INCLUDES})
+
 # Set link libraries
 target_link_libraries(
   ${OLIVE_TARGET}

From 99d94a0d82e91662b25d9ed4139b7a87674a23f5 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 8 Aug 2020 02:27:46 +1000
Subject: [PATCH 105/138] ci: build relwithdebinfo instead of debug

Probably more appropriate for end-user use.
---
 .appveyor/build.bat |  6 +++---
 .travis/script.sh   |  4 ++--
 app/CMakeLists.txt  | 19 +++----------------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/.appveyor/build.bat b/.appveyor/build.bat
index 8dbb7ffae..e2c6b553f 100644
--- a/.appveyor/build.bat
+++ b/.appveyor/build.bat
@@ -11,8 +11,8 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary
 REM Install 64-bit packages
 set VCPKG_DEFAULT_TRIPLET=x64-windows
 
-REM Hack to only install debug builds for time
-echo set(VCPKG_BUILD_TYPE debug) >> C:\Tools\vcpkg\triplets\x64-windows.cmake
+REM Hack to only install release builds for time
+echo set(VCPKG_BUILD_TYPE release) >> C:\Tools\vcpkg\triplets\x64-windows.cmake
 
 REM Install Open*IO libraries
 vcpkg install opencolorio
@@ -34,7 +34,7 @@ REM Add Qt and FFmpeg directory to path
 set PATH=%PATH%;C:\Qt\5.13.2\msvc2017_64\bin;%APPVEYOR_BUILD_FOLDER%\%FFMPEG_VER%-dev
 
 REM Run cmake
-cmake -G "Ninja" . -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Debug
+cmake -G "Ninja" . -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 REM Build with Ninja
 ninja.exe || exit /B 1
diff --git a/.travis/script.sh b/.travis/script.sh
index ddd32883f..b4cb03e76 100644
--- a/.travis/script.sh
+++ b/.travis/script.sh
@@ -6,7 +6,7 @@ export VERSION=$(git rev-parse --short=8 HEAD)
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 
     # Generate Makefile
-    cmake . -DCMAKE_BUILD_TYPE=Debug
+    cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
     # Make
     make -j$(sysctl -n hw.ncpu)
@@ -50,7 +50,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
 elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
     # Generate Makefile
-    cmake . -DCMAKE_BUILD_TYPE=Debug
+    cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
     # Make
     make -j$(nproc)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 987193fbd..7ea42d7f5 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -84,11 +84,6 @@ target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS})
 
 # Set compiler options
 if(MSVC)
-  STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-  STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-  STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
-
   target_compile_options(
     ${OLIVE_TARGET}
     PRIVATE
@@ -98,14 +93,14 @@ if(MSVC)
     /experimental:external
     /external:anglebrackets
     /external:W0
-    /O2
+    "$<$<CONFIG:RELEASE>:/O2>"
     "$<$<COMPILE_LANGUAGE:CXX>:/MP>"
   )
 else()
   target_compile_options(
     ${OLIVE_TARGET}
     PRIVATE
-    -O2
+    "$<$<CONFIG:RELEASE>:-O2>"
     -Werror
     -Wuninitialized
     -pedantic-errors
@@ -131,17 +126,9 @@ target_include_directories(
   ${FFMPEG_INCLUDE_DIRS}
   ${OCIO_INCLUDE_DIRS}
   ${OIIO_INCLUDE_DIRS}
-
-  # HACK: Brew on macOS separates the OpenEXR and IlmBase headers while they seem to expect to be
-  # in the same folder. So we link to that folder directly here.
-  ${ILMBASE_INCLUDES}/OpenEXR
-
-  ${OPENEXR_INCLUDES}
+  ${OPENEXR_INCLUDE_DIR}
 )
 
-message("OpenEXR Includes: " ${OPENEXR_INCLUDES})
-message("ILMBASE Includes: " ${ILMBASE_INCLUDES})
-
 # Set link libraries
 target_link_libraries(
   ${OLIVE_TARGET}

From edeeed49ba54ab6272d48f7256ef9600a4282c9b Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 8 Aug 2020 02:44:39 +1000
Subject: [PATCH 106/138] various: enabled config saving

---
 app/config/config.cpp                      | 120 +++++++++++----------
 app/config/config.h                        |  12 ++-
 app/core.cpp                               |   2 +-
 app/node/input.cpp                         |  72 ++++++++++---
 app/node/input.h                           |   4 +-
 app/node/param.cpp                         |   4 +-
 app/node/param.h                           |   2 +-
 app/render/audioplaybackcache.cpp          |   4 +-
 app/render/audioplaybackcache.h            |   2 +-
 app/render/backend/opengl/openglproxy.cpp  |   3 +
 app/task/export/export.cpp                 |   2 +-
 app/widget/nodetableview/nodetableview.cpp |   2 +-
 app/widget/viewer/audiowaveformview.cpp    |   4 +-
 app/widget/viewer/viewer.cpp               |   4 +-
 14 files changed, 149 insertions(+), 88 deletions(-)

diff --git a/app/config/config.cpp b/app/config/config.cpp
index ba2d62348..2f5f96a88 100644
--- a/app/config/config.cpp
+++ b/app/config/config.cpp
@@ -42,6 +42,11 @@ Config::Config()
   SetDefaults();
 }
 
+void Config::SetEntryInternal(const QString &key, NodeParam::DataType type, const QVariant &data)
+{
+  config_map_[key] = {type, data};
+}
+
 QString Config::GetConfigFilePath()
 {
   return QDir(FileFunctions::GetConfigurationLocation()).filePath(QStringLiteral("config.xml"));
@@ -55,63 +60,63 @@ Config &Config::Current()
 void Config::SetDefaults()
 {
   config_map_.clear();
-  config_map_["TimecodeDisplay"] = Timecode::kTimecodeDropFrame;
-  config_map_["DefaultStillLength"] = QVariant::fromValue(rational(2));
-  config_map_["HoverFocus"] = false;
-  config_map_["AudioScrubbing"] = true;
-  config_map_["AutorecoveryInterval"] = 1;
-  config_map_["Language"] = "en_US";
-  config_map_["ScrollZooms"] = false;
-  config_map_["EnableSeekToImport"] = false;
-  config_map_["EditToolAlsoSeeks"] = false;
-  config_map_["EditToolSelectsLinks"] = false;
-  config_map_["EnableDragFilesToTimeline"] = true;
-  config_map_["InvertTimelineScrollAxes"] = true;
-  config_map_["SelectAlsoSeeks"] = false;
-  config_map_["PasteSeeks"] = true;
-  config_map_["SelectAlsoSeeks"] = false;
-  config_map_["SetNameWithMarker"] = false;
-  config_map_["AutoSeekToBeginning"] = true;
-  config_map_["DropFileOnMediaToReplace"] = false;
-  config_map_["AddDefaultEffectsToClips"] = true;
-  config_map_["AutoscaleByDefault"] = false;
-  config_map_["Autoscroll"] = AutoScroll::kPage;
-  config_map_["AutoSelectDivider"] = true;
-  config_map_["SetNameWithMarker"] = false;
-  config_map_["RectifiedWaveforms"] = false;
-  config_map_["DropWithoutSequenceBehavior"] = TimelineWidget::kDWSAsk;
-  config_map_["Loop"] = false;
+  SetEntryInternal(QStringLiteral("TimecodeDisplay"), NodeParam::kInt, Timecode::kTimecodeDropFrame);
+  SetEntryInternal(QStringLiteral("DefaultStillLength"), NodeParam::kRational, QVariant::fromValue(rational(2)));
+  SetEntryInternal(QStringLiteral("HoverFocus"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("AudioScrubbing"), NodeParam::kBoolean, true);
+  SetEntryInternal(QStringLiteral("AutorecoveryInterval"), NodeParam::kInt, 1);
+  SetEntryInternal(QStringLiteral("Language"), NodeParam::kString, "en_US");
+  SetEntryInternal(QStringLiteral("ScrollZooms"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("EnableSeekToImport"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("EditToolAlsoSeeks"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("EditToolSelectsLinks"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("EnableDragFilesToTimeline"), NodeParam::kBoolean, true);
+  SetEntryInternal(QStringLiteral("InvertTimelineScrollAxes"), NodeParam::kBoolean, true);
+  SetEntryInternal(QStringLiteral("SelectAlsoSeeks"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("PasteSeeks"), NodeParam::kBoolean, true);
+  SetEntryInternal(QStringLiteral("SelectAlsoSeeks"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("SetNameWithMarker"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("AutoSeekToBeginning"), NodeParam::kBoolean, true);
+  SetEntryInternal(QStringLiteral("DropFileOnMediaToReplace"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("AddDefaultEffectsToClips"), NodeParam::kBoolean, true);
+  SetEntryInternal(QStringLiteral("AutoscaleByDefault"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("Autoscroll"), NodeParam::kInt, AutoScroll::kPage);
+  SetEntryInternal(QStringLiteral("AutoSelectDivider"), NodeParam::kBoolean, true);
+  SetEntryInternal(QStringLiteral("SetNameWithMarker"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("RectifiedWaveforms"), NodeParam::kBoolean, false);
+  SetEntryInternal(QStringLiteral("DropWithoutSequenceBehavior"), NodeParam::kInt, TimelineWidget::kDWSAsk);
+  SetEntryInternal(QStringLiteral("Loop"), NodeParam::kBoolean, false);
 
-  config_map_["AutoCacheInterval"] = 250;
+  SetEntryInternal(QStringLiteral("AutoCacheInterval"), NodeParam::kInt, 250);
 
-  config_map_["NodeCatColor0"] = QVariant::fromValue(Color(0.75f, 0.75f, 0.75f));
-  config_map_["NodeCatColor1"] = QVariant::fromValue(Color(0.25f, 0.25f, 0.25f));
-  config_map_["NodeCatColor2"] = QVariant::fromValue(Color(0.75f, 0.75f, 0.25f));
-  config_map_["NodeCatColor3"] = QVariant::fromValue(Color(0.75f, 0.25f, 0.75f));
-  config_map_["NodeCatColor4"] = QVariant::fromValue(Color(0.25f, 0.75f, 0.75f));
-  config_map_["NodeCatColor5"] = QVariant::fromValue(Color(0.50f, 0.50f, 0.50f));
-  config_map_["NodeCatColor6"] = QVariant::fromValue(Color(0.25f, 0.75f, 0.25f));
-  config_map_["NodeCatColor7"] = QVariant::fromValue(Color(0.25f, 0.25f, 0.75f));
-  config_map_["NodeCatColor8"] = QVariant::fromValue(Color(0.75f, 0.25f, 0.25f));
+  SetEntryInternal(QStringLiteral("NodeCatColor0"), NodeParam::kColor, QVariant::fromValue(Color(0.75f, 0.75f, 0.75f)));
+  SetEntryInternal(QStringLiteral("NodeCatColor1"), NodeParam::kColor, QVariant::fromValue(Color(0.25f, 0.25f, 0.25f)));
+  SetEntryInternal(QStringLiteral("NodeCatColor2"), NodeParam::kColor, QVariant::fromValue(Color(0.75f, 0.75f, 0.25f)));
+  SetEntryInternal(QStringLiteral("NodeCatColor3"), NodeParam::kColor, QVariant::fromValue(Color(0.75f, 0.25f, 0.75f)));
+  SetEntryInternal(QStringLiteral("NodeCatColor4"), NodeParam::kColor, QVariant::fromValue(Color(0.25f, 0.75f, 0.75f)));
+  SetEntryInternal(QStringLiteral("NodeCatColor5"), NodeParam::kColor, QVariant::fromValue(Color(0.50f, 0.50f, 0.50f)));
+  SetEntryInternal(QStringLiteral("NodeCatColor6"), NodeParam::kColor, QVariant::fromValue(Color(0.25f, 0.75f, 0.25f)));
+  SetEntryInternal(QStringLiteral("NodeCatColor7"), NodeParam::kColor, QVariant::fromValue(Color(0.25f, 0.25f, 0.75f)));
+  SetEntryInternal(QStringLiteral("NodeCatColor8"), NodeParam::kColor, QVariant::fromValue(Color(0.75f, 0.25f, 0.25f)));
 
-  config_map_["AudioOutput"] = QString();
-  config_map_["AudioInput"] = QString();
+  SetEntryInternal(QStringLiteral("AudioOutput"), NodeParam::kString, QString());
+  SetEntryInternal(QStringLiteral("AudioInput"), NodeParam::kString, QString());
 
-  config_map_["DiskCacheBehind"] = QVariant::fromValue(rational(1));
-  config_map_["DiskCacheAhead"] = QVariant::fromValue(rational(5));
+  SetEntryInternal(QStringLiteral("DiskCacheBehind"), NodeParam::kRational, QVariant::fromValue(rational(1)));
+  SetEntryInternal(QStringLiteral("DiskCacheAhead"), NodeParam::kRational, QVariant::fromValue(rational(5)));
 
-  config_map_["DefaultSequenceWidth"] = 1920;
-  config_map_["DefaultSequenceHeight"] = 1080;
-  config_map_["DefaultSequenceFrameRate"] = QVariant::fromValue(rational(1001, 30000));
-  config_map_["DefaultSequenceAudioFrequency"] = 48000;
-  config_map_["DefaultSequenceAudioLayout"] = QVariant::fromValue(static_cast<uint64_t>(AV_CH_LAYOUT_STEREO));
-  config_map_["DefaultSequencePreviewFormat"] = PixelFormat::PIX_FMT_RGBA16F;
+  SetEntryInternal(QStringLiteral("DefaultSequenceWidth"), NodeParam::kInt, 1920);
+  SetEntryInternal(QStringLiteral("DefaultSequenceHeight"), NodeParam::kInt, 1080);
+  SetEntryInternal(QStringLiteral("DefaultSequenceFrameRate"), NodeParam::kRational, QVariant::fromValue(rational(1001, 30000)));
+  SetEntryInternal(QStringLiteral("DefaultSequenceAudioFrequency"), NodeParam::kInt, 48000);
+  SetEntryInternal(QStringLiteral("DefaultSequenceAudioLayout"), NodeParam::kInt, QVariant::fromValue(static_cast<int64_t>(AV_CH_LAYOUT_STEREO)));
+  SetEntryInternal(QStringLiteral("DefaultSequencePreviewFormat"), NodeParam::kInt, PixelFormat::PIX_FMT_RGBA16F);
 
   // Online/offline settings
-  config_map_["OnlinePixelFormat"] = PixelFormat::PIX_FMT_RGBA32F;
-  config_map_["OfflinePixelFormat"] = PixelFormat::PIX_FMT_RGBA16F;
-  config_map_["OnlineOCIOMethod"] = ColorManager::kOCIOAccurate;
-  config_map_["OfflineOCIOMethod"] = ColorManager::kOCIOFast;
+  SetEntryInternal(QStringLiteral("OnlinePixelFormat"), NodeParam::kInt, PixelFormat::PIX_FMT_RGBA32F);
+  SetEntryInternal(QStringLiteral("OfflinePixelFormat"), NodeParam::kInt, PixelFormat::PIX_FMT_RGBA16F);
+  SetEntryInternal(QStringLiteral("OnlineOCIOMethod"), NodeParam::kInt, ColorManager::kOCIOAccurate);
+  SetEntryInternal(QStringLiteral("OfflineOCIOMethod"), NodeParam::kInt, ColorManager::kOCIOFast);
 }
 
 void Config::Load()
@@ -171,7 +176,7 @@ void Config::Load()
 
           current_config_[key] = QVariant::fromValue(match.flipped());
         } else {
-          current_config_[key] = value;
+          current_config_[key] = NodeInput::StringToValue(current_config_.GetConfigEntryType(key), value, false);
         }
       }
 
@@ -216,10 +221,10 @@ void Config::Save()
   // Anything after the hyphen is considered "unimportant" information
   writer.writeTextElement("Version", QCoreApplication::applicationVersion().split('-').first());
 
-  QMapIterator<QString, QVariant> iterator(current_config_.config_map_);
+  QMapIterator<QString, ConfigEntry> iterator(current_config_.config_map_);
   while (iterator.hasNext()) {
     iterator.next();
-    writer.writeTextElement(iterator.key(), iterator.value().toString());
+    writer.writeTextElement(iterator.key(), NodeInput::ValueToString(iterator.value().type, iterator.value().data, false));
   }
 
   writer.writeEndElement(); // Configuration
@@ -231,12 +236,17 @@ void Config::Save()
 
 QVariant Config::operator[](const QString &key) const
 {
-  return config_map_[key];
+  return config_map_[key].data;
 }
 
 QVariant &Config::operator[](const QString &key)
 {
-  return config_map_[key];
+  return config_map_[key].data;
+}
+
+NodeParam::DataType Config::GetConfigEntryType(const QString &key) const
+{
+  return config_map_[key].type;
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/config/config.h b/app/config/config.h
index 342d50484..dfed5a23d 100644
--- a/app/config/config.h
+++ b/app/config/config.h
@@ -26,6 +26,7 @@
 #include <QVariant>
 
 #include "common/timecodefunctions.h"
+#include "node/param.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -43,10 +44,19 @@ public:
 
   QVariant& operator[](const QString&);
 
+  NodeParam::DataType GetConfigEntryType(const QString& key) const;
+
 private:
   Config();
 
-  QMap<QString, QVariant> config_map_;
+  struct ConfigEntry {
+    NodeParam::DataType type;
+    QVariant data;
+  };
+
+  void SetEntryInternal(const QString& key, NodeParam::DataType type, const QVariant& data);
+
+  QMap<QString, ConfigEntry> config_map_;
 
   static Config current_config_;
 
diff --git a/app/core.cpp b/app/core.cpp
index 419e612c0..5f483f3ba 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -205,7 +205,7 @@ void Core::Start()
 void Core::Stop()
 {
   // Save Config
-  //Config::Save();
+  Config::Save();
 
   // Save recently opened projects
   {
diff --git a/app/node/input.cpp b/app/node/input.cpp
index 4e75caa5b..890cb57e5 100644
--- a/app/node/input.cpp
+++ b/app/node/input.cpp
@@ -327,17 +327,46 @@ void NodeInput::SetDefaultValue(const QVector<QVariant> &default_value)
 
 QString NodeInput::ValueToString(const QVariant &value) const
 {
-  return ValueToString(data_type_, value);
+  return ValueToString(data_type_, value, true);
 }
 
-QString NodeInput::ValueToString(const DataType& data_type, const QVariant &value)
+QString NodeInput::ValueToString(const DataType& data_type, const QVariant &value, bool value_is_a_key_track)
 {
-  switch (data_type) {
-  case kRational:
+  if (!value_is_a_key_track && data_type == kVec2) {
+    QVector2D vec = value.value<QVector2D>();
+
+    return QStringLiteral("%1:%2").arg(QString::number(vec.x()),
+                                       QString::number(vec.y()));
+  } else if (!value_is_a_key_track && data_type == kVec3) {
+    QVector3D vec = value.value<QVector3D>();
+
+    return QStringLiteral("%1:%2:%3").arg(QString::number(vec.x()),
+                                          QString::number(vec.y()),
+                                          QString::number(vec.z()));
+  } else if (!value_is_a_key_track && data_type == kVec4) {
+    QVector4D vec = value.value<QVector4D>();
+
+    return QStringLiteral("%1:%2:%3:%4").arg(QString::number(vec.x()),
+                                             QString::number(vec.y()),
+                                             QString::number(vec.z()),
+                                             QString::number(vec.w()));
+  } else if (!value_is_a_key_track && data_type == kColor) {
+    Color c = value.value<Color>();
+
+    return QStringLiteral("%1:%2:%3:%4").arg(QString::number(c.red()),
+                                             QString::number(c.green()),
+                                             QString::number(c.blue()),
+                                             QString::number(c.alpha()));
+  } else if (data_type == kRational) {
     return value.value<rational>().toString();
-  case kFootage:
+  } else if (data_type == kFootage) {
     return QString::number(reinterpret_cast<quintptr>(value.value<StreamPtr>().get()));
-  default:
+  } else if (data_type == kTexture
+             || data_type == kSamples
+             || data_type == kBuffer) {
+    // These data types need no XML representation
+    return QString();
+  } else {
     if (value.canConvert<QString>()) {
       return value.toString();
     }
@@ -346,22 +375,31 @@ QString NodeInput::ValueToString(const DataType& data_type, const QVariant &valu
       qWarning() << "Failed to convert type" << ToHex(data_type) << "to string";
     }
 
-    /* fall through */
-
-    // These data types need no XML representation
-  case kTexture:
-  case kSamples:
-  case kBuffer:
     return QString();
   }
 }
 
-QVariant NodeInput::StringToValue(const DataType& data_type, const QString &string)
+QVariant NodeInput::StringToValue(const DataType& data_type, const QString &string, bool value_is_a_key_track)
 {
-  switch (data_type) {
-  case kRational:
+  if (!value_is_a_key_track && data_type == kVec2) {
+    QStringList vals = string.split(':');
+
+    return QVector2D(vals.at(0).toFloat(), vals.at(1).toFloat());
+  } else if (!value_is_a_key_track && data_type == kVec3) {
+    QStringList vals = string.split(':');
+
+    return QVector3D(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat());
+  } else if (!value_is_a_key_track && data_type == kVec4) {
+    QStringList vals = string.split(':');
+
+    return QVector4D(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat(), vals.at(3).toFloat());
+  } else if (!value_is_a_key_track && data_type == kColor) {
+    QStringList vals = string.split(':');
+
+    return QVariant::fromValue(Color(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat(), vals.at(3).toFloat()));
+  } else if (data_type == kRational) {
     return QVariant::fromValue(rational::fromString(string));
-  default:
+  } else {
     return string;
   }
 }
@@ -429,7 +467,7 @@ QVariant NodeInput::StringToValue(const QString &string, QList<XMLNodeData::Foot
     footage_connections.append({this, string.toULongLong()});
   }
 
-  return StringToValue(data_type_, string);
+  return StringToValue(data_type_, string, true);
 }
 
 NodeOutput *NodeInput::get_connected_output() const
diff --git a/app/node/input.h b/app/node/input.h
index cbf401250..10d09e2a5 100644
--- a/app/node/input.h
+++ b/app/node/input.h
@@ -278,9 +278,9 @@ public:
 
   void set_combobox_strings(const QStringList& strings);
 
-  static QString ValueToString(const DataType& data_type, const QVariant& value);
+  static QString ValueToString(const DataType& data_type, const QVariant& value, bool value_is_a_key_track);
 
-  static QVariant StringToValue(const DataType &data_type, const QString &string);
+  static QVariant StringToValue(const DataType &data_type, const QString &string, bool value_is_a_key_track);
 
   void GetDependencies(QList<Node*>& list, bool traverse, bool exclusive_only) const;
 
diff --git a/app/node/param.cpp b/app/node/param.cpp
index b5604c413..601b393da 100644
--- a/app/node/param.cpp
+++ b/app/node/param.cpp
@@ -240,8 +240,8 @@ QString NodeParam::GetPrettyDataTypeName(const NodeParam::DataType &type)
 QByteArray NodeParam::ValueToBytes(const NodeParam::DataType &type, const QVariant &value)
 {
   switch (type) {
-  case kInt: return ValueToBytesInternal<int>(value);
-  case kFloat: return ValueToBytesInternal<float>(value);
+  case kInt: return ValueToBytesInternal<int64_t>(value);
+  case kFloat: return ValueToBytesInternal<double>(value);
   case kColor: return ValueToBytesInternal<Color>(value);
   case kText: return value.toString().toUtf8();
   case kBoolean: return ValueToBytesInternal<bool>(value);
diff --git a/app/node/param.h b/app/node/param.h
index 03e667936..0157d7bdd 100644
--- a/app/node/param.h
+++ b/app/node/param.h
@@ -67,7 +67,7 @@ public:
     /**
      * Integer type
      *
-     * Resolves to `int` (may resolve to `long` in the future).
+     * Resolves to int64_t.
      */
     kInt = 0x1,
 
diff --git a/app/render/audioplaybackcache.cpp b/app/render/audioplaybackcache.cpp
index e8ba9dabc..9b9e8897b 100644
--- a/app/render/audioplaybackcache.cpp
+++ b/app/render/audioplaybackcache.cpp
@@ -238,11 +238,11 @@ QList<TimeRange> AudioPlaybackCache::GetValidRanges(const TimeRange& range, cons
 
 void AudioPlaybackCache::UpdateFilename(const QString &s)
 {
-  filename_ = QDir(GetCacheFilename()).filePath(s);
+  filename_ = QDir(GetCacheDirectory()).filePath(s);
   filename_.append(QStringLiteral(".pcm"));
 }
 
-const QString &AudioPlaybackCache::GetCacheFilename() const
+const QString &AudioPlaybackCache::GetPCMFilename() const
 {
   return filename_;
 }
diff --git a/app/render/audioplaybackcache.h b/app/render/audioplaybackcache.h
index fe9c7cd6f..facba48d3 100644
--- a/app/render/audioplaybackcache.h
+++ b/app/render/audioplaybackcache.h
@@ -46,7 +46,7 @@ public:
 
   //void SetUuid(const QUuid& id);
 
-  const QString& GetCacheFilename() const;
+  const QString& GetPCMFilename() const;
 
   QList<TimeRange> GetValidRanges(const TimeRange &range, const qint64 &job_time);
 
diff --git a/app/render/backend/opengl/openglproxy.cpp b/app/render/backend/opengl/openglproxy.cpp
index 1bc204713..4b580711a 100644
--- a/app/render/backend/opengl/openglproxy.cpp
+++ b/app/render/backend/opengl/openglproxy.cpp
@@ -297,9 +297,12 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
 
     switch (data_type) {
     case NodeInput::kInt:
+      // kInt technically specifies a LongLong, but OpenGL doesn't support those. This may lead to
+      // over/underflows if the number is large enough, but the likelihood of that is quite low.
       shader->setUniformValue(variable_location, value.toInt());
       break;
     case NodeInput::kFloat:
+      // kFloat technically specifies a double but as above, OpenGL doesn't support those.
       shader->setUniformValue(variable_location, value.toFloat());
       break;
     case NodeInput::kVec2:
diff --git a/app/task/export/export.cpp b/app/task/export/export.cpp
index bcbdc083b..69cdfe502 100644
--- a/app/task/export/export.cpp
+++ b/app/task/export/export.cpp
@@ -105,7 +105,7 @@ bool ExportTask::Run()
 
   if (params_.audio_enabled()) {
     // Write audio data now
-    encoder_->WriteAudio(audio_params(), audio_data_.GetCacheFilename());
+    encoder_->WriteAudio(audio_params(), audio_data_.GetPCMFilename());
   }
 
   encoder_->Close();
diff --git a/app/widget/nodetableview/nodetableview.cpp b/app/widget/nodetableview/nodetableview.cpp
index 01fc8c315..7696ace3b 100644
--- a/app/widget/nodetableview/nodetableview.cpp
+++ b/app/widget/nodetableview/nodetableview.cpp
@@ -157,7 +157,7 @@ void NodeTableView::SetTime(const rational &time)
         {
           QVector<QVariant> split_values = input->split_normal_value_into_track_values(value.data());
           for (int k=0;k<split_values.size();k++) {
-            sub_item->setText(2 + k, NodeInput::ValueToString(value.type(), split_values.at(k)));
+            sub_item->setText(2 + k, NodeInput::ValueToString(value.type(), split_values.at(k), true));
           }
         }
         }
diff --git a/app/widget/viewer/audiowaveformview.cpp b/app/widget/viewer/audiowaveformview.cpp
index 18193fc1f..490d49b47 100644
--- a/app/widget/viewer/audiowaveformview.cpp
+++ b/app/widget/viewer/audiowaveformview.cpp
@@ -66,7 +66,7 @@ void AudioWaveformView::paintEvent(QPaintEvent *event)
   const AudioParams& params = playback_->GetParameters();
 
   if (!playback_
-      || playback_->GetCacheFilename().isEmpty()
+      || playback_->GetPCMFilename().isEmpty()
       || !params.is_valid()) {
     return;
   }
@@ -78,7 +78,7 @@ void AudioWaveformView::paintEvent(QPaintEvent *event)
     cached_waveform_ = QPixmap(size());
     cached_waveform_.fill(Qt::transparent);
 
-    QFile fs(playback_->GetCacheFilename());
+    QFile fs(playback_->GetPCMFilename());
 
     if (fs.open(QFile::ReadOnly)) {
 
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index d8f561bd0..3c1cc304c 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -502,7 +502,7 @@ void ViewerWidget::PushScrubbedAudio()
 {
   if (!IsPlaying() && Config::Current()["AudioScrubbing"].toBool()) {
     // Get audio src device from renderer
-    QString audio_fn = GetConnectedNode()->audio_playback_cache()->GetCacheFilename();
+    QString audio_fn = GetConnectedNode()->audio_playback_cache()->GetPCMFilename();
     QFile audio_src(audio_fn);
 
     if (audio_src.open(QFile::ReadOnly)) {
@@ -616,7 +616,7 @@ void ViewerWidget::FinishPlayPreprocess()
 {
   int64_t playback_start_time = ruler()->GetTime();
 
-  QString audio_fn = GetConnectedNode()->audio_playback_cache()->GetCacheFilename();
+  QString audio_fn = GetConnectedNode()->audio_playback_cache()->GetPCMFilename();
   if (!audio_fn.isEmpty()) {
     AudioManager::instance()->SetOutputParams(GetConnectedNode()->audio_playback_cache()->GetParameters());
     AudioManager::instance()->StartOutput(audio_fn,

From 0075733da1791bcd641ba1c4cd8a505f0f9a1301 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 8 Aug 2020 03:08:40 +1000
Subject: [PATCH 107/138] footageviewer: fixed bug that signalled a null
 footage file

---
 app/panel/footageviewer/footageviewer.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/panel/footageviewer/footageviewer.cpp b/app/panel/footageviewer/footageviewer.cpp
index 073177d46..608f7f8cc 100644
--- a/app/panel/footageviewer/footageviewer.cpp
+++ b/app/panel/footageviewer/footageviewer.cpp
@@ -39,7 +39,14 @@ FootageViewerPanel::FootageViewerPanel(QWidget *parent) :
 
 QList<Footage *> FootageViewerPanel::GetSelectedFootage() const
 {
-  return {static_cast<FootageViewerWidget*>(GetTimeBasedWidget())->GetFootage()};
+  QList<Footage *> list;
+  Footage* f = static_cast<FootageViewerWidget*>(GetTimeBasedWidget())->GetFootage();
+
+  if (f) {
+    list.append(f);
+  }
+
+  return list;
 }
 
 void FootageViewerPanel::SetFootage(Footage *f)

From 4fac0837991225b9d652db2a28562ece67165a32 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 8 Aug 2020 03:17:21 +1000
Subject: [PATCH 108/138] lol i accidentally deleted the mac fix when i
 reverted the cmake files

big time oof
---
 app/CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 7ea42d7f5..931702964 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -126,7 +126,12 @@ target_include_directories(
   ${FFMPEG_INCLUDE_DIRS}
   ${OCIO_INCLUDE_DIRS}
   ${OIIO_INCLUDE_DIRS}
-  ${OPENEXR_INCLUDE_DIR}
+  ${OPENEXR_INCLUDES}
+
+  # HACK: Brew on macOS separates OpenEXR and IlmBase into two folders even though they seem to
+  #       expect to be in one. This includes the IlmBase files as if they were in the same folders
+  #       as the OpenEXR headers.
+  ${ILMBASE_INCLUDES}/OpenEXR
 )
 
 # Set link libraries

From 901f1001affa63e20aec6205a64408a145f1ebf3 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 9 Aug 2020 14:03:11 +1000
Subject: [PATCH 109/138] renderer: improved memory management

Clear up more memory when it isn't used for a while.
---
 app/codec/ffmpeg/ffmpegdecoder.cpp  | 24 +++++++------------
 app/render/backend/renderworker.cpp | 37 +++++++++++++++++++++++++++++
 app/render/backend/renderworker.h   | 11 +++++++++
 3 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp
index 4c54a42df..e8a0b7844 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.cpp
+++ b/app/codec/ffmpeg/ffmpegdecoder.cpp
@@ -52,7 +52,8 @@ QHash< Stream*, QList<FFmpegDecoderInstance*> > FFmpegDecoder::instance_map_;
 QMutex FFmpegDecoder::instance_map_lock_;
 QHash< Stream*, FFmpegFramePool* > FFmpegDecoder::frame_pool_map_;
 
-// FIXME: Hardcoded, ideally this value is dynamically chosen based on memory restraints
+// FIXME: Hardcoded value. It seems to work fine, but is there a possibility we should make
+//        this a dynamic value somehow or a configurable value?
 const int FFmpegDecoderInstance::kMaxFrameLife = 2000;
 
 FFmpegDecoder::FFmpegDecoder() :
@@ -94,11 +95,12 @@ bool FFmpegDecoder::Open()
     if (stream()->type() == Stream::kVideo) {
       QMutexLocker map_locker(&instance_map_lock_);
 
-      // FIXME: Test code, this should be changed later
       FFmpegFramePool* frame_pool = frame_pool_map_.value(stream().get());
 
       if (!frame_pool) {
-        frame_pool = new FFmpegFramePool(256,
+        // FIXME: Hardcoded value. It seems to work fine, but is there a possibility we should make
+        //        this a dynamic value somehow or a configurable value?
+        frame_pool = new FFmpegFramePool(32,
                                          our_instance->stream()->codecpar->width,
                                          our_instance->stream()->codecpar->height,
                                          static_cast<AVPixelFormat>(our_instance->stream()->codecpar->format));
@@ -106,7 +108,6 @@ bool FFmpegDecoder::Open()
       }
 
       our_instance->SetFramePool(frame_pool);
-      // End test code
     }
 
     // Determine which Olive native pixel format we retrieved
@@ -1300,8 +1301,8 @@ FFmpegDecoderInstance::FFmpegDecoderInstance(const char *filename, int stream_in
     // Start clear timer
     clear_timer_ = new QTimer();
     clear_timer_->setInterval(kMaxFrameLife);
-    //clear_timer_->moveToThread(qApp->thread());
-    connect(clear_timer_, &QTimer::timeout, this, &FFmpegDecoderInstance::ClearTimerEvent);
+    clear_timer_->moveToThread(qApp->thread());
+    connect(clear_timer_, &QTimer::timeout, this, &FFmpegDecoderInstance::ClearTimerEvent, Qt::DirectConnection);
     QMetaObject::invokeMethod(clear_timer_, "start", Qt::QueuedConnection);
   }
 
@@ -1330,16 +1331,9 @@ void FFmpegDecoderInstance::ClearResources()
 
   // Stop timer
   if (clear_timer_) {
-
-    if (clear_timer_->thread() == QThread::currentThread()) {
-      clear_timer_->stop();
-    } else {
-      QMetaObject::invokeMethod(clear_timer_, "stop", Qt::BlockingQueuedConnection);
-    }
-
-    QMetaObject::invokeMethod(clear_timer_, "deleteLater", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(clear_timer_, "stop", Qt::QueuedConnection);
+    clear_timer_->deleteLater();
     clear_timer_ = nullptr;
-
   }
 
   if (opts_) {
diff --git a/app/render/backend/renderworker.cpp b/app/render/backend/renderworker.cpp
index 5b670fc0d..252cb1210 100644
--- a/app/render/backend/renderworker.cpp
+++ b/app/render/backend/renderworker.cpp
@@ -22,6 +22,7 @@
 
 #include <QDir>
 #include <QThread>
+#include <QTimer>
 
 #include "audio/audiovisualwaveform.h"
 #include "common/functiontimer.h"
@@ -31,12 +32,27 @@
 
 OLIVE_NAMESPACE_ENTER
 
+// FIXME: Hardcoded value. It seems to work fine, but is there a possibility we should make
+//        this a dynamic value somehow or a configurable value?
+const int RenderWorker::kMaxDecoderLife = 6000;
+
 RenderWorker::RenderWorker(RenderBackend* parent) :
   parent_(parent),
   available_(true),
   generate_audio_previews_(false),
   render_mode_(RenderMode::kOnline)
 {
+  cleanup_timer_ = new QTimer();
+  cleanup_timer_->setInterval(kMaxDecoderLife);
+  connect(cleanup_timer_, &QTimer::timeout, this, &RenderWorker::ClearOldDecoders, Qt::DirectConnection);
+  cleanup_timer_->moveToThread(qApp->thread());
+  QMetaObject::invokeMethod(cleanup_timer_, "start", Qt::QueuedConnection);
+}
+
+RenderWorker::~RenderWorker()
+{
+  QMetaObject::invokeMethod(cleanup_timer_, "stop", Qt::QueuedConnection);
+  cleanup_timer_->deleteLater();
 }
 
 void RenderWorker::Hash(RenderTicketPtr ticket, ViewerOutput *viewer, const QVector<rational> &times)
@@ -72,6 +88,24 @@ QByteArray RenderWorker::HashNode(const Node *n, const VideoParams &params, cons
   return hasher.result();
 }
 
+void RenderWorker::ClearOldDecoders()
+{
+  QMutexLocker locker(&decoder_lock_);
+
+  QHash<Stream*, qint64>::iterator i = decoder_age_.begin();
+
+  while (i != decoder_age_.end()) {
+    if (i.value() < QDateTime::currentMSecsSinceEpoch() - kMaxDecoderLife) {
+      // This decoder is old, remove it
+      decoder_cache_.remove(i.key());
+
+      i = decoder_age_.erase(i);
+    } else {
+      i++;
+    }
+  }
+}
+
 void RenderWorker::RenderFrame(RenderTicketPtr ticket, ViewerOutput* viewer, const rational &time)
 {
   ticket_ = ticket;
@@ -294,6 +328,7 @@ QVariant RenderWorker::GetCachedFrame(const Node* node, const rational& time)
 DecoderPtr RenderWorker::ResolveDecoderFromInput(StreamPtr stream)
 {
   // Access a map of Node inputs and decoder instances and retrieve a frame!
+  QMutexLocker locker(&decoder_lock_);
 
   DecoderPtr decoder = decoder_cache_.value(stream.get());
 
@@ -311,6 +346,8 @@ DecoderPtr RenderWorker::ResolveDecoderFromInput(StreamPtr stream)
     }
   }
 
+  decoder_age_.insert(stream.get(), QDateTime::currentMSecsSinceEpoch());
+
   return decoder;
 }
 
diff --git a/app/render/backend/renderworker.h b/app/render/backend/renderworker.h
index a709663d8..6d4729cb9 100644
--- a/app/render/backend/renderworker.h
+++ b/app/render/backend/renderworker.h
@@ -38,6 +38,8 @@ class RenderWorker : public QObject, public NodeTraverser
 public:
   RenderWorker(RenderBackend* parent);
 
+  virtual ~RenderWorker() override;
+
   bool IsAvailable() const
   {
     return available_;
@@ -169,7 +171,9 @@ private:
 
   QMatrix4x4 video_download_matrix_;
 
+  QMutex decoder_lock_;
   DecoderCache decoder_cache_;
+  QHash<Stream*, qint64> decoder_age_;
 
   TimeRange audio_render_time_;
   bool available_;
@@ -182,6 +186,13 @@ private:
 
   RenderMode::Mode render_mode_;
 
+  QTimer* cleanup_timer_;
+
+  static const int kMaxDecoderLife;
+
+private slots:
+  void ClearOldDecoders();
+
 };
 
 OLIVE_NAMESPACE_EXIT

From 28dcff10c030ad96c5b89ecbb7cb567a00772207 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 01:47:26 +1000
Subject: [PATCH 110/138] various: implement sequence pixel aspect ratios and
 interlacing settings

Implements the following:
- Sequences have pixel aspect ratios that work in tandem with footage PARs
  to render footage correctly. Viewer and export also acknowledge PARs
- Sequences can have interlacing settings. This doesn't do anything yet,
  eventually the renderer will need to interlace/deinterlace/reinterlace
  appropriately in order to conform all the footage to the sequence. Export
  acknowledges interlacing, but this only affects metadata, not the image.
---
 app/codec/ffmpeg/ffmpegdecoder.cpp            |  16 +-
 app/codec/ffmpeg/ffmpegencoder.cpp            |  31 +++-
 app/codec/frame.cpp                           |  17 +-
 app/codec/frame.h                             |   5 -
 app/codec/oiio/oiiodecoder.cpp                |  15 +-
 app/codec/oiio/oiiodecoder.h                  |   2 +
 app/common/ratiodialog.cpp                    |   3 +-
 app/config/config.cpp                         |   4 +-
 app/core.cpp                                  |  85 +---------
 app/core.h                                    |  36 ----
 app/dialog/export/export.cpp                  |  18 +-
 app/dialog/export/exportaudiotab.cpp          |  37 +----
 app/dialog/export/exportaudiotab.h            |  25 ++-
 app/dialog/export/exportvideotab.cpp          |  86 ++--------
 app/dialog/export/exportvideotab.h            |  85 ++++++++--
 .../videostreamproperties.cpp                 |  85 ++--------
 .../streamproperties/videostreamproperties.h  |  20 +--
 app/dialog/sequence/sequence.cpp              |  17 +-
 .../sequence/sequencedialogparametertab.cpp   | 157 +++++-------------
 .../sequence/sequencedialogparametertab.h     |  70 +++++---
 .../sequence/sequencedialogpresettab.cpp      |  41 +++--
 app/dialog/sequence/sequencedialogpresettab.h |   2 +-
 app/dialog/sequence/sequencepreset.h          |  30 +++-
 app/node/output/viewer/viewer.cpp             |   5 +
 app/node/output/viewer/viewer.h               |   2 +
 app/project/item/footage/imagestream.cpp      |   2 +-
 app/project/item/footage/imagestream.h        |  13 +-
 app/project/item/sequence/sequence.cpp        |  18 +-
 app/render/audioparams.cpp                    |  46 +++++
 app/render/audioparams.h                      |  13 ++
 app/render/backend/opengl/openglproxy.cpp     |  16 +-
 app/render/backend/renderworker.cpp           |   6 +
 app/render/pixelformat.cpp                    |   4 +-
 app/render/videoparams.cpp                    | 102 ++++++++++--
 app/render/videoparams.h                      |  50 +++++-
 app/widget/CMakeLists.txt                     |   1 +
 .../nodetableview/nodetabletraverser.cpp      |   3 +-
 app/widget/standardcombos/CMakeLists.txt      |  28 ++++
 .../standardcombos/channellayoutcombobox.h    |  62 +++++++
 app/widget/standardcombos/frameratecombobox.h |  62 +++++++
 .../standardcombos/interlacedcombobox.h       |  57 +++++++
 .../standardcombos/pixelaspectratiocombobox.h | 127 ++++++++++++++
 .../standardcombos/pixelformatcombobox.h      |  67 ++++++++
 .../standardcombos/sampleratecombobox.h       |  61 +++++++
 app/widget/standardcombos/standardcombos.h    |  32 ++++
 .../standardcombos/videodividercombobox.h     |  69 ++++++++
 app/widget/viewer/footageviewer.cpp           |   4 +
 app/widget/viewer/viewer.cpp                  |  25 +--
 app/widget/viewer/viewer.h                    |   8 +-
 app/widget/viewer/viewersizer.cpp             |  25 +--
 app/widget/viewer/viewersizer.h               |  11 +-
 51 files changed, 1201 insertions(+), 605 deletions(-)
 create mode 100644 app/widget/standardcombos/CMakeLists.txt
 create mode 100644 app/widget/standardcombos/channellayoutcombobox.h
 create mode 100644 app/widget/standardcombos/frameratecombobox.h
 create mode 100644 app/widget/standardcombos/interlacedcombobox.h
 create mode 100644 app/widget/standardcombos/pixelaspectratiocombobox.h
 create mode 100644 app/widget/standardcombos/pixelformatcombobox.h
 create mode 100644 app/widget/standardcombos/sampleratecombobox.h
 create mode 100644 app/widget/standardcombos/standardcombos.h
 create mode 100644 app/widget/standardcombos/videodividercombobox.h

diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp
index e8a0b7844..b5c64f81c 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.cpp
+++ b/app/codec/ffmpeg/ffmpegdecoder.cpp
@@ -463,8 +463,9 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
       if (avstream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
 
         bool image_is_still = false;
-        ImageStream::Interlacing interlacing = ImageStream::kInterlaceNone;
         rational pixel_aspect_ratio;
+        rational frame_rate;
+        VideoParams::Interlacing interlacing = VideoParams::kInterlaceNone;
 
         {
           // Read at least two frames to get more information about this video stream
@@ -479,15 +480,19 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
               // Check if video is interlaced and what field dominance it has if so
               if (frame->interlaced_frame) {
                 if (frame->top_field_first) {
-                  interlacing = ImageStream::kInterlacedTopFirst;
+                  interlacing = VideoParams::kInterlacedTopFirst;
                 } else {
-                  interlacing = ImageStream::kInterlacedBottomFirst;
+                  interlacing = VideoParams::kInterlacedBottomFirst;
                 }
               }
 
               pixel_aspect_ratio = av_guess_sample_aspect_ratio(instance.fmt_ctx(),
                                                                 instance.stream(),
                                                                 frame);
+
+              frame_rate = av_guess_frame_rate(instance.fmt_ctx(),
+                                               instance.stream(),
+                                               frame);
             }
 
             // Read second frame
@@ -521,7 +526,7 @@ bool FFmpegDecoder::Probe(Footage *f, const QAtomicInt* cancelled)
         } else {
           VideoStreamPtr video_stream = std::make_shared<VideoStream>();
 
-          video_stream->set_frame_rate(av_guess_frame_rate(fmt_ctx, avstream, nullptr));
+          video_stream->set_frame_rate(frame_rate);
           video_stream->set_start_time(avstream->start_time);
 
           image_stream = video_stream;
@@ -783,9 +788,10 @@ FramePtr FFmpegDecoder::BuffersToNativeFrame(int divider, int width, int height,
   copy->set_video_params(VideoParams(width,
                                      height,
                                      native_pix_fmt_,
+                                     std::static_pointer_cast<ImageStream>(stream())->pixel_aspect_ratio(),
+                                     std::static_pointer_cast<ImageStream>(stream())->interlacing(),
                                      divider));
   copy->set_timestamp(Timecode::timestamp_to_time(ts, time_base_));
-  copy->set_sample_aspect_ratio(std::static_pointer_cast<ImageStream>(stream())->pixel_aspect_ratio());
   copy->allocate();
 
   // Convert frame to RGB/A for the rest of the pipeline
diff --git a/app/codec/ffmpeg/ffmpegencoder.cpp b/app/codec/ffmpeg/ffmpegencoder.cpp
index 84349c8d1..562d4f82e 100644
--- a/app/codec/ffmpeg/ffmpegencoder.cpp
+++ b/app/codec/ffmpeg/ffmpegencoder.cpp
@@ -138,6 +138,17 @@ bool FFmpegEncoder::WriteFrame(FramePtr frame, rational time)
   encoded_frame->height = frame->height();
   encoded_frame->format = video_codec_ctx_->pix_fmt;
 
+  // Set interlacing
+  if (frame->video_params().interlacing() != VideoParams::kInterlaceNone) {
+    encoded_frame->interlaced_frame = 1;
+
+    if (frame->video_params().interlacing() == VideoParams::kInterlacedTopFirst) {
+      encoded_frame->top_field_first = 1;
+    } else {
+      encoded_frame->top_field_first = 0;
+    }
+  }
+
   error_code = av_frame_get_buffer(encoded_frame, 0);
   if (error_code < 0) {
     FFmpegError("Failed to create AVFrame buffer", error_code);
@@ -443,10 +454,28 @@ bool FFmpegEncoder::InitializeStream(AVMediaType type, AVStream** stream_ptr, AV
   if (type == AVMEDIA_TYPE_VIDEO) {
     codec_ctx->width = params().video_params().width();
     codec_ctx->height = params().video_params().height();
-    codec_ctx->sample_aspect_ratio = {1, 1};
+    codec_ctx->sample_aspect_ratio = params().video_params().pixel_aspect_ratio().toAVRational();
     codec_ctx->time_base = params().video_params().time_base().toAVRational();
     codec_ctx->pix_fmt = av_get_pix_fmt(params().video_pix_fmt().toUtf8());
 
+    if (params().video_params().interlacing() != VideoParams::kInterlaceNone) {
+      // FIXME: I actually don't know what these flags do, the documentation helpfully doesn't
+      //        explain them at all. I hope using both of them is the right thing to do.
+      codec_ctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME;
+
+
+      if (params().video_params().interlacing() == VideoParams::kInterlacedTopFirst) {
+        codec_ctx->field_order = AV_FIELD_TT;
+      } else {
+        codec_ctx->field_order = AV_FIELD_BB;
+
+        if (codec_id == AV_CODEC_ID_H264) {
+          // For some reason, FFmpeg doesn't set libx264's bff flag so we have to do it ourselves
+          av_opt_set(video_codec_ctx_->priv_data, "x264opts", "bff=1", AV_OPT_SEARCH_CHILDREN);
+        }
+      }
+    }
+
     // Set custom options
     {
       QHash<QString, QString>::const_iterator i;
diff --git a/app/codec/frame.cpp b/app/codec/frame.cpp
index bc821b038..4ca93f42b 100644
--- a/app/codec/frame.cpp
+++ b/app/codec/frame.cpp
@@ -27,8 +27,7 @@
 OLIVE_NAMESPACE_ENTER
 
 Frame::Frame() :
-  timestamp_(0),
-  sample_aspect_ratio_(1)
+  timestamp_(0)
 {
 }
 
@@ -106,20 +105,6 @@ void Frame::set_pixel(int x, int y, const Color &c)
   c.toData(data_.data() + byte_offset, video_params().format());
 }
 
-const rational &Frame::sample_aspect_ratio() const
-{
-  return sample_aspect_ratio_;
-}
-
-void Frame::set_sample_aspect_ratio(const rational &aspect_ratio)
-{
-  if (aspect_ratio.isNull()) {
-    sample_aspect_ratio_ = 1;
-  } else {
-    sample_aspect_ratio_ = aspect_ratio;
-  }
-}
-
 const rational &Frame::timestamp() const
 {
   return timestamp_;
diff --git a/app/codec/frame.h b/app/codec/frame.h
index daea040ce..7f49948a8 100644
--- a/app/codec/frame.h
+++ b/app/codec/frame.h
@@ -57,9 +57,6 @@ public:
   bool contains_pixel(int x, int y) const;
   void set_pixel(int x, int y, const Color& c);
 
-  const rational& sample_aspect_ratio() const;
-  void set_sample_aspect_ratio(const rational& sample_aspect_ratio);
-
   /**
    * @brief Get frame's timestamp.
    *
@@ -116,8 +113,6 @@ private:
 
   int64_t native_timestamp_;
 
-  rational sample_aspect_ratio_;
-
   int linesize_;
 
 };
diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp
index 238c7c6b8..6a5e9f0c8 100644
--- a/app/codec/oiio/oiiodecoder.cpp
+++ b/app/codec/oiio/oiiodecoder.cpp
@@ -118,16 +118,14 @@ bool OIIODecoder::Probe(Footage *f, const QAtomicInt *cancelled)
   image_stream->set_width(in->spec().width);
   image_stream->set_height(in->spec().height);
   image_stream->set_format(GetFormatFromOIIOBasetype(in->spec()));
-
-  // FIXME: Haven't looked, does OIIO report pixel aspect ratio somewhere?
-  image_stream->set_pixel_aspect_ratio(1);
+  image_stream->set_pixel_aspect_ratio(GetPixelAspectRatioFromOIIO(in->spec()));
 
   // Images will always have just one stream
   image_stream->set_index(0);
 
   // OIIO automatically premultiplies alpha
-  // FIXME: We usually disassociate the alpha for the color management later, for 8-bit images this likely reduces the
-  //        fidelity?
+  // FIXME: We usually disassociate the alpha for the color management later, for 8-bit images this
+  //        likely reduces the fidelity?
   image_stream->set_premultiplied_alpha(true);
 
   // Get stats for this image and dump them into the Footage file
@@ -181,6 +179,8 @@ FramePtr OIIODecoder::RetrieveVideo(const rational &timecode, const int& divider
   frame->set_video_params(VideoParams(buffer_->spec().width,
                                       buffer_->spec().height,
                                       pix_fmt_,
+                                      GetPixelAspectRatioFromOIIO(buffer_->spec()),
+                                      VideoParams::kInterlaceNone, // FIXME: Does OIIO deinterlace for us?
                                       divider));
   frame->allocate();
 
@@ -294,6 +294,11 @@ PixelFormat::Format OIIODecoder::GetFormatFromOIIOBasetype(const OIIO::ImageSpec
   }
 }
 
+rational OIIODecoder::GetPixelAspectRatioFromOIIO(const OpenImageIO_v2_1::ImageSpec &spec)
+{
+  return rational::fromDouble(spec.extra_attribs.get_float("PixelAspectRatio", 1));
+}
+
 bool OIIODecoder::FileTypeIsSupported(const QString& fn)
 {
   // We prioritize OIIO over FFmpeg to pick up still images more effectively, but some OIIO decoders (notably OpenJPEG)
diff --git a/app/codec/oiio/oiiodecoder.h b/app/codec/oiio/oiiodecoder.h
index be0b6fca2..1b0a052c0 100644
--- a/app/codec/oiio/oiiodecoder.h
+++ b/app/codec/oiio/oiiodecoder.h
@@ -57,6 +57,8 @@ public:
 
   static PixelFormat::Format GetFormatFromOIIOBasetype(const OIIO::ImageSpec& spec);
 
+  static rational GetPixelAspectRatioFromOIIO(const OIIO::ImageSpec& spec);
+
 private:
 #if OIIO_VERSION < 10903
   OIIO::ImageInput* image_;
diff --git a/app/common/ratiodialog.cpp b/app/common/ratiodialog.cpp
index 35bf48820..cb01147e3 100644
--- a/app/common/ratiodialog.cpp
+++ b/app/common/ratiodialog.cpp
@@ -70,7 +70,8 @@ double GetFloatRatioFromUser(QWidget* parent,
 
       if (numer_ok
           && denom_ok
-          && num > 0) {
+          && num > 0
+          && den > 0) {
         // Exit loop and set this ratio
         if (ok_in) {
           *ok_in = true;
diff --git a/app/config/config.cpp b/app/config/config.cpp
index 2f5f96a88..24bce9245 100644
--- a/app/config/config.cpp
+++ b/app/config/config.cpp
@@ -107,7 +107,9 @@ void Config::SetDefaults()
 
   SetEntryInternal(QStringLiteral("DefaultSequenceWidth"), NodeParam::kInt, 1920);
   SetEntryInternal(QStringLiteral("DefaultSequenceHeight"), NodeParam::kInt, 1080);
+  SetEntryInternal(QStringLiteral("DefaultSequencePixelAspect"), NodeParam::kRational, QVariant::fromValue(rational(1)));
   SetEntryInternal(QStringLiteral("DefaultSequenceFrameRate"), NodeParam::kRational, QVariant::fromValue(rational(1001, 30000)));
+  SetEntryInternal(QStringLiteral("DefaultSequenceInterlacing"), NodeParam::kInt, VideoParams::kInterlaceNone);
   SetEntryInternal(QStringLiteral("DefaultSequenceAudioFrequency"), NodeParam::kInt, 48000);
   SetEntryInternal(QStringLiteral("DefaultSequenceAudioLayout"), NodeParam::kInt, QVariant::fromValue(static_cast<int64_t>(AV_CH_LAYOUT_STEREO)));
   SetEntryInternal(QStringLiteral("DefaultSequencePreviewFormat"), NodeParam::kInt, PixelFormat::PIX_FMT_RGBA16F);
@@ -158,7 +160,7 @@ void Config::Load()
 
           double config_fr = value.toDouble();
 
-          QList<rational> supported_frame_rates = Core::SupportedFrameRates();
+          const QVector<rational>& supported_frame_rates = VideoParams::kSupportedFrameRates;
 
           rational match = supported_frame_rates.first();
           double match_diff = qAbs(match.toDouble() - config_fr);
diff --git a/app/core.cpp b/app/core.cpp
index 5f483f3ba..1a5d14fbc 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -171,6 +171,7 @@ void Core::DeclareTypesForQt()
   qRegisterMetaType<OLIVE_NAMESPACE::ShaderJob>();
   qRegisterMetaType<OLIVE_NAMESPACE::GenerateJob>();
   qRegisterMetaType<OLIVE_NAMESPACE::VideoParams>();
+  qRegisterMetaType<OLIVE_NAMESPACE::VideoParams::Interlacing>();
   qRegisterMetaType<OLIVE_NAMESPACE::MainWindowLayoutInfo>();
   qRegisterMetaType<OLIVE_NAMESPACE::RenderTicketPtr>();
 }
@@ -868,90 +869,6 @@ bool Core::CloseAllExceptActiveProject()
   return true;
 }
 
-QList<rational> Core::SupportedFrameRates()
-{
-  QList<rational> frame_rates;
-
-  frame_rates.append(rational(10, 1));            // 10 FPS
-  frame_rates.append(rational(15, 1));            // 15 FPS
-  frame_rates.append(rational(24000, 1001));      // 23.976 FPS
-  frame_rates.append(rational(24, 1));            // 24 FPS
-  frame_rates.append(rational(25, 1));            // 25 FPS
-  frame_rates.append(rational(30000, 1001));      // 29.97 FPS
-  frame_rates.append(rational(30, 1));            // 30 FPS
-  frame_rates.append(rational(48000, 1001));      // 47.952 FPS
-  frame_rates.append(rational(48, 1));            // 48 FPS
-  frame_rates.append(rational(50, 1));            // 50 FPS
-  frame_rates.append(rational(60000, 1001));      // 59.94 FPS
-  frame_rates.append(rational(60, 1));            // 60 FPS
-
-  return frame_rates;
-}
-
-QList<int> Core::SupportedSampleRates()
-{
-  QList<int> sample_rates;
-
-  sample_rates.append(8000);         // 8000 Hz
-  sample_rates.append(11025);        // 11025 Hz
-  sample_rates.append(16000);        // 16000 Hz
-  sample_rates.append(22050);        // 22050 Hz
-  sample_rates.append(24000);        // 24000 Hz
-  sample_rates.append(32000);        // 32000 Hz
-  sample_rates.append(44100);        // 44100 Hz
-  sample_rates.append(48000);        // 48000 Hz
-  sample_rates.append(88200);        // 88200 Hz
-  sample_rates.append(96000);        // 96000 Hz
-
-  return sample_rates;
-}
-
-QList<uint64_t> Core::SupportedChannelLayouts()
-{
-  QList<uint64_t> channel_layouts;
-
-  channel_layouts.append(AV_CH_LAYOUT_MONO);
-  channel_layouts.append(AV_CH_LAYOUT_STEREO);
-  channel_layouts.append(AV_CH_LAYOUT_2_1);
-  channel_layouts.append(AV_CH_LAYOUT_5POINT1);
-  channel_layouts.append(AV_CH_LAYOUT_7POINT1);
-
-  return channel_layouts;
-}
-
-QList<int> Core::SupportedDividers()
-{
-  return {1, 2, 3, 4, 6, 8, 12, 16};
-}
-
-QString Core::FrameRateToString(const rational &frame_rate)
-{
-  return tr("%1 FPS").arg(frame_rate.toDouble());
-}
-
-QString Core::SampleRateToString(const int &sample_rate)
-{
-  return tr("%1 Hz").arg(sample_rate);
-}
-
-QString Core::ChannelLayoutToString(const uint64_t &layout)
-{
-  switch (layout) {
-  case AV_CH_LAYOUT_MONO:
-    return tr("Mono");
-  case AV_CH_LAYOUT_STEREO:
-    return tr("Stereo");
-  case AV_CH_LAYOUT_2_1:
-    return tr("2.1");
-  case AV_CH_LAYOUT_5POINT1:
-    return tr("5.1");
-  case AV_CH_LAYOUT_7POINT1:
-    return tr("7.1");
-  default:
-    return tr("Unknown (0x%1)").arg(layout, 1, 16);
-  }
-}
-
 QString Core::GetProjectFilter()
 {
   return QStringLiteral("%1 (*.ove)").arg(tr("Olive Project"));
diff --git a/app/core.h b/app/core.h
index 1ead89b5c..01d941f0a 100644
--- a/app/core.h
+++ b/app/core.h
@@ -169,42 +169,6 @@ public:
 
   static QString PasteStringFromClipboard();
 
-  /**
-   * @brief Return a list of supported frame rates in rational form
-   *
-   * These rationals can be flipped to create a timebase in this frame rate.
-   */
-  static QList<rational> SupportedFrameRates();
-
-  /**
-   * @brief Return a list of supported sample rates in integer form
-   */
-  static QList<int> SupportedSampleRates();
-  /**
-   * @brief Return a list of supported channel layouts as or'd flags
-   */
-  static QList<uint64_t> SupportedChannelLayouts();
-
-  /**
-   * @brief Return a list of supported dividers
-   */
-  static QList<int> SupportedDividers();
-
-  /**
-   * @brief Convert rational frame rate (i.e. flipped timebase) to a user-friendly string
-   */
-  static QString FrameRateToString(const rational& frame_rate);
-
-  /**
-   * @brief Convert integer sample rate to a user-friendly string
-   */
-  static QString SampleRateToString(const int &sample_rate);
-
-  /**
-   * @brief Convert channel layout to a user-friendly string
-   */
-  static QString ChannelLayoutToString(const uint64_t &layout);
-
   /**
    * @brief Recursively count files in a file/directory list
    */
diff --git a/app/dialog/export/export.cpp b/app/dialog/export/export.cpp
index b23950cfc..9e59c94d6 100644
--- a/app/dialog/export/export.cpp
+++ b/app/dialog/export/export.cpp
@@ -177,9 +177,11 @@ ExportDialog::ExportDialog(ViewerOutput *viewer_node, QWidget *parent) :
   video_tab_->width_slider()->SetDefaultValue(viewer_node_->video_params().width());
   video_tab_->height_slider()->SetValue(viewer_node_->video_params().height());
   video_tab_->height_slider()->SetDefaultValue(viewer_node_->video_params().height());
-  video_tab_->set_frame_rate(viewer_node_->video_params().time_base().flipped());
-  audio_tab_->set_sample_rate(viewer_node_->audio_params().sample_rate());
-  audio_tab_->set_channel_layout(viewer_node_->audio_params().channel_layout());
+  video_tab_->frame_rate_combobox()->SetFrameRate(viewer_node_->video_params().time_base().flipped());
+  video_tab_->pixel_aspect_combobox()->SetPixelAspectRatio(viewer_node_->video_params().pixel_aspect_ratio());
+  video_tab_->interlaced_combobox()->SetInterlaceMode(viewer_node_->video_params().interlacing());
+  audio_tab_->sample_rate_combobox()->SetSampleRate(viewer_node_->audio_params().sample_rate());
+  audio_tab_->channel_layout_combobox()->SetChannelLayout(viewer_node_->audio_params().channel_layout());
 
   video_aspect_ratio_ = static_cast<double>(viewer_node_->video_params().width()) / static_cast<double>(viewer_node_->video_params().height());
 
@@ -423,12 +425,14 @@ ExportParams ExportDialog::GenerateParams() const
 
   VideoParams video_render_params(static_cast<int>(video_tab_->width_slider()->GetValue()),
                                   static_cast<int>(video_tab_->height_slider()->GetValue()),
-                                  video_tab_->frame_rate().flipped(),
+                                  video_tab_->frame_rate_combobox()->GetFrameRate().flipped(),
                                   PixelFormat::instance()->GetConfiguredFormatForMode(render_mode),
+                                  video_tab_->pixel_aspect_combobox()->GetPixelAspectRatio(),
+                                  video_tab_->interlaced_combobox()->GetInterlaceMode(),
                                   render_mode);
 
   AudioParams audio_render_params(audio_tab_->sample_rate_combobox()->currentData().toInt(),
-                                  audio_tab_->channel_layout_combobox()->currentData().toULongLong(),
+                                  audio_tab_->channel_layout_combobox()->GetChannelLayout(),
                                   SampleFormat::kInternalFormat);
 
   ExportParams params;
@@ -462,8 +466,8 @@ ExportParams ExportDialog::GenerateParams() const
 
 void ExportDialog::UpdateViewerDimensions()
 {
-  preview_viewer_->SetOverrideSize(static_cast<int>(video_tab_->width_slider()->GetValue()),
-                                   static_cast<int>(video_tab_->height_slider()->GetValue()));
+  preview_viewer_->SetViewerResolution(static_cast<int>(video_tab_->width_slider()->GetValue()),
+                                       static_cast<int>(video_tab_->height_slider()->GetValue()));
 
   QMatrix4x4 transform =
       ExportParams::GenerateMatrix(static_cast<ExportParams::VideoScalingMethod>(video_tab_->scaling_method_combobox()->currentData().toInt()),
diff --git a/app/dialog/export/exportaudiotab.cpp b/app/dialog/export/exportaudiotab.cpp
index d83cdf39f..c6f4ae003 100644
--- a/app/dialog/export/exportaudiotab.cpp
+++ b/app/dialog/export/exportaudiotab.cpp
@@ -46,22 +46,14 @@ ExportAudioTab::ExportAudioTab(QWidget* parent) :
 
   layout->addWidget(new QLabel(tr("Sample Rate:")), row, 0);
 
-  sample_rate_combobox_ = new QComboBox();
-  sample_rates_ = Core::SupportedSampleRates();
-  foreach (const int& sr, sample_rates_) {
-    sample_rate_combobox_->addItem(Core::SampleRateToString(sr), sr);
-  }
+  sample_rate_combobox_ = new SampleRateComboBox();
   layout->addWidget(sample_rate_combobox_, row, 1);
 
   row++;
 
   layout->addWidget(new QLabel(tr("Channel Layout:")), row, 0);
 
-  channel_layout_combobox_ = new QComboBox();
-  channel_layouts_ = Core::SupportedChannelLayouts();
-  foreach (const uint64_t& ch_layout, channel_layouts_) {
-    channel_layout_combobox_->addItem(Core::ChannelLayoutToString(ch_layout), QVariant::fromValue(ch_layout));
-  }
+  channel_layout_combobox_ = new ChannelLayoutComboBox();
   layout->addWidget(channel_layout_combobox_, row, 1);
 
   row++;
@@ -72,29 +64,4 @@ ExportAudioTab::ExportAudioTab(QWidget* parent) :
   outer_layout->addStretch();
 }
 
-QComboBox *ExportAudioTab::codec_combobox() const
-{
-  return codec_combobox_;
-}
-
-QComboBox *ExportAudioTab::sample_rate_combobox() const
-{
-  return sample_rate_combobox_;
-}
-
-QComboBox *ExportAudioTab::channel_layout_combobox() const
-{
-  return channel_layout_combobox_;
-}
-
-void ExportAudioTab::set_sample_rate(int rate)
-{
-  sample_rate_combobox_->setCurrentIndex(sample_rates_.indexOf(rate));
-}
-
-void ExportAudioTab::set_channel_layout(uint64_t layout)
-{
-  channel_layout_combobox_->setCurrentIndex(channel_layouts_.indexOf(layout));
-}
-
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/export/exportaudiotab.h b/app/dialog/export/exportaudiotab.h
index b14a1e3b9..924d0b655 100644
--- a/app/dialog/export/exportaudiotab.h
+++ b/app/dialog/export/exportaudiotab.h
@@ -25,6 +25,7 @@
 #include <QWidget>
 
 #include "common/define.h"
+#include "widget/standardcombos/standardcombos.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -33,20 +34,26 @@ class ExportAudioTab : public QWidget
 public:
   ExportAudioTab(QWidget* parent = nullptr);
 
-  QComboBox* codec_combobox() const;
-  QComboBox* sample_rate_combobox() const;
-  QComboBox* channel_layout_combobox() const;
+  QComboBox* codec_combobox() const
+  {
+    return codec_combobox_;
+  }
 
-  void set_sample_rate(int rate);
-  void set_channel_layout(uint64_t layout);
+  SampleRateComboBox* sample_rate_combobox() const
+  {
+    return sample_rate_combobox_;
+  }
+
+  ChannelLayoutComboBox* channel_layout_combobox() const
+  {
+    return channel_layout_combobox_;
+  }
 
 private:
   QComboBox* codec_combobox_;
-  QComboBox* sample_rate_combobox_;
-  QComboBox* channel_layout_combobox_;
+  SampleRateComboBox* sample_rate_combobox_;
+  ChannelLayoutComboBox* channel_layout_combobox_;
 
-  QList<int> sample_rates_;
-  QList<uint64_t> channel_layouts_;
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/export/exportvideotab.cpp b/app/dialog/export/exportvideotab.cpp
index 298e5bc11..9d62c360f 100644
--- a/app/dialog/export/exportvideotab.cpp
+++ b/app/dialog/export/exportvideotab.cpp
@@ -49,71 +49,6 @@ ExportVideoTab::ExportVideoTab(ColorManager* color_manager, QWidget *parent) :
   outer_layout->addStretch();
 }
 
-ExportCodec::Codec ExportVideoTab::GetSelectedCodec() const
-{
-  return static_cast<ExportCodec::Codec>(codec_combobox()->currentData().toInt());
-}
-
-QComboBox *ExportVideoTab::codec_combobox() const
-{
-  return codec_combobox_;
-}
-
-IntegerSlider *ExportVideoTab::width_slider() const
-{
-  return width_slider_;
-}
-
-IntegerSlider *ExportVideoTab::height_slider() const
-{
-  return height_slider_;
-}
-
-QCheckBox *ExportVideoTab::maintain_aspect_checkbox() const
-{
-  return maintain_aspect_checkbox_;
-}
-
-QComboBox *ExportVideoTab::scaling_method_combobox() const
-{
-  return scaling_method_combobox_;
-}
-
-const rational &ExportVideoTab::frame_rate() const
-{
-  return frame_rates_.at(frame_rate_combobox_->currentIndex());
-}
-
-void ExportVideoTab::set_frame_rate(const rational &frame_rate)
-{
-  frame_rate_combobox_->setCurrentIndex(frame_rates_.indexOf(frame_rate));
-}
-
-QString ExportVideoTab::CurrentOCIOColorSpace()
-{
-  return color_space_chooser_->input();
-}
-
-CodecSection *ExportVideoTab::GetCodecSection() const
-{
-  return static_cast<CodecSection*>(codec_stack_->currentWidget());
-}
-
-void ExportVideoTab::SetCodecSection(CodecSection *section)
-{
-  codec_stack_->setCurrentWidget(section);
-}
-
-ImageSection *ExportVideoTab::image_section() const
-{
-  return image_section_;
-}
-
-H264Section *ExportVideoTab::h264_section() const
-{
-  return h264_section_;
-}
-
 QWidget* ExportVideoTab::SetupResolutionSection()
 {
   int row = 0;
@@ -163,14 +98,23 @@ QWidget* ExportVideoTab::SetupResolutionSection()
 
   layout->addWidget(new QLabel(tr("Frame Rate:")), row, 0);
 
-  frame_rate_combobox_ = new QComboBox();
-  frame_rates_ = Core::SupportedFrameRates();
-  foreach (const rational& fr, frame_rates_) {
-    frame_rate_combobox_->addItem(Core::FrameRateToString(fr));
-  }
-
+  frame_rate_combobox_ = new FrameRateComboBox();
   layout->addWidget(frame_rate_combobox_, row, 1);
 
+  row++;
+
+  layout->addWidget(new QLabel(tr("Pixel Aspect Ratio:")), row, 0);
+
+  pixel_aspect_combobox_ = new PixelAspectRatioComboBox();
+  layout->addWidget(pixel_aspect_combobox_, row, 1);
+
+  row++;
+
+  layout->addWidget(new QLabel(tr("Interlacing:")), row, 0);
+
+  interlaced_combobox_ = new InterlacedComboBox();
+  layout->addWidget(interlaced_combobox_, row, 1);
+
   return resolution_group;
 }
 
diff --git a/app/dialog/export/exportvideotab.h b/app/dialog/export/exportvideotab.h
index dd67e2ea7..fe35d884b 100644
--- a/app/dialog/export/exportvideotab.h
+++ b/app/dialog/export/exportvideotab.h
@@ -31,6 +31,7 @@
 #include "render/colormanager.h"
 #include "widget/colorwheel/colorspacechooser.h"
 #include "widget/slider/integerslider.h"
+#include "widget/standardcombos/standardcombos.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -40,24 +41,75 @@ class ExportVideoTab : public QWidget
 public:
   ExportVideoTab(ColorManager* color_manager, QWidget* parent = nullptr);
 
-  ExportCodec::Codec GetSelectedCodec() const;
+  ExportCodec::Codec GetSelectedCodec() const
+  {
+    return static_cast<ExportCodec::Codec>(codec_combobox()->currentData().toInt());
+  }
 
-  QComboBox* codec_combobox() const;
+  QComboBox* codec_combobox() const
+  {
+    return codec_combobox_;
+  }
 
-  IntegerSlider* width_slider() const;
-  IntegerSlider* height_slider() const;
-  QCheckBox* maintain_aspect_checkbox() const;
-  QComboBox* scaling_method_combobox() const;
+  IntegerSlider* width_slider() const
+  {
+    return width_slider_;
+  }
 
-  const rational& frame_rate() const;
-  void set_frame_rate(const rational& frame_rate);
+  IntegerSlider* height_slider() const
+  {
+    return height_slider_;
+  }
 
-  QString CurrentOCIOColorSpace();
+  QCheckBox* maintain_aspect_checkbox() const
+  {
+    return maintain_aspect_checkbox_;
+  }
 
-  CodecSection* GetCodecSection() const;
-  void SetCodecSection(CodecSection* section);
-  ImageSection* image_section() const;
-  H264Section* h264_section() const;
+  QComboBox* scaling_method_combobox() const
+  {
+    return scaling_method_combobox_;
+  }
+
+  FrameRateComboBox* frame_rate_combobox() const
+  {
+    return frame_rate_combobox_;
+  }
+
+  QString CurrentOCIOColorSpace()
+  {
+    return color_space_chooser_->input();
+  }
+
+  CodecSection* GetCodecSection() const
+  {
+    return static_cast<CodecSection*>(codec_stack_->currentWidget());
+  }
+
+  void SetCodecSection(CodecSection* section)
+  {
+    codec_stack_->setCurrentWidget(section);
+  }
+
+  ImageSection* image_section() const
+  {
+    return image_section_;
+  }
+
+  H264Section* h264_section() const
+  {
+    return h264_section_;
+  }
+
+  InterlacedComboBox* interlaced_combobox() const
+  {
+    return interlaced_combobox_;
+  }
+
+  PixelAspectRatioComboBox* pixel_aspect_combobox() const
+  {
+    return pixel_aspect_combobox_;
+  }
 
   const int& threads() const
   {
@@ -80,7 +132,7 @@ private:
   QWidget* SetupCodecSection();
 
   QComboBox* codec_combobox_;
-  QComboBox* frame_rate_combobox_;
+  FrameRateComboBox* frame_rate_combobox_;
   QCheckBox* maintain_aspect_checkbox_;
   QComboBox* scaling_method_combobox_;
 
@@ -93,10 +145,11 @@ private:
   IntegerSlider* width_slider_;
   IntegerSlider* height_slider_;
 
-  QList<rational> frame_rates_;
-
   ColorManager* color_manager_;
 
+  InterlacedComboBox* interlaced_combobox_;
+  PixelAspectRatioComboBox* pixel_aspect_combobox_;
+
   int threads_;
 
   QString pix_fmt_;
diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
index 04212ddf8..17f4e83eb 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
@@ -28,7 +28,7 @@
 #include <OpenColorIO/OpenColorIO.h>
 namespace OCIO = OCIO_NAMESPACE::v1;
 
-#include "common/ratiodialog.h"
+#include "core.h"
 #include "project/item/footage/footage.h"
 #include "project/project.h"
 #include "undo/undostack.h"
@@ -45,45 +45,16 @@ VideoStreamProperties::VideoStreamProperties(ImageStreamPtr stream) :
 
   video_layout->addWidget(new QLabel(tr("Pixel Aspect:")), row, 0);
 
-  pixel_aspect_combo_ = new QComboBox();
+  pixel_aspect_combo_ = new PixelAspectRatioComboBox();
+  pixel_aspect_combo_->SetPixelAspectRatio(stream->pixel_aspect_ratio());
   video_layout->addWidget(pixel_aspect_combo_, row, 1);
 
-  AddPixelAspectRatio(tr("Square Pixels"), rational(1));
-  AddPixelAspectRatio(tr("NTSC Standard"), rational(8, 9));
-  AddPixelAspectRatio(tr("NTSC Widescreen"), rational(32, 27));
-  AddPixelAspectRatio(tr("PAL Standard"), rational(16, 15));
-  AddPixelAspectRatio(tr("PAL Widescreen"), rational(64, 45));
-  AddPixelAspectRatio(tr("HD Anamorphic 1080"), rational(4, 3));
-
-  // Always add custom item last, much of the logic relies on this. Set this to the current AR so
-  // that if none of the above are ==, it will eventually select this item
-  AddPixelAspectRatio(QString(), rational());
-  UpdateCustomItem(stream->pixel_aspect_ratio());
-
-  // Determine which index to select on startup
-  for (int i=0; i<pixel_aspect_combo_->count(); i++) {
-    if (pixel_aspect_combo_->itemData(i).value<rational>() == stream->pixel_aspect_ratio()) {
-      pixel_aspect_combo_->setCurrentIndex(i);
-      break;
-    }
-  }
-
-  // Pick up index signal to query for custom aspect ratio if requested
-  connect(pixel_aspect_combo_, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-          this, &VideoStreamProperties::PixelAspectComboBoxChanged);
-
   row++;
 
   video_layout->addWidget(new QLabel(tr("Interlacing:")), row, 0);
 
-  video_interlace_combo_ = new QComboBox();
-
-  // These must match the Interlacing enum in ImageStream
-  video_interlace_combo_->addItem(tr("None (Progressive)"));
-  video_interlace_combo_->addItem(tr("Top-Field First"));
-  video_interlace_combo_->addItem(tr("Bottom-Field First"));
-
-  video_interlace_combo_->setCurrentIndex(stream->interlacing());
+  video_interlace_combo_ = new InterlacedComboBox();
+  video_interlace_combo_->SetInterlaceMode(stream->interlacing());
 
   video_layout->addWidget(video_interlace_combo_, row, 1);
 
@@ -153,14 +124,14 @@ void VideoStreamProperties::Accept(QUndoCommand *parent)
 
   if (video_premultiply_alpha_->isChecked() != stream_->premultiplied_alpha()
       || set_colorspace != stream_->colorspace(false)
-      || static_cast<ImageStream::Interlacing>(video_interlace_combo_->currentIndex()) != stream_->interlacing()
-      || pixel_aspect_combo_->currentData().value<rational>() != stream_->pixel_aspect_ratio()) {
+      || static_cast<VideoParams::Interlacing>(video_interlace_combo_->currentIndex()) != stream_->interlacing()
+      || pixel_aspect_combo_->GetPixelAspectRatio() != stream_->pixel_aspect_ratio()) {
 
     new VideoStreamChangeCommand(stream_,
                                  video_premultiply_alpha_->isChecked(),
                                  set_colorspace,
-                                 static_cast<ImageStream::Interlacing>(video_interlace_combo_->currentIndex()),
-                                 pixel_aspect_combo_->currentData().value<rational>(),
+                                 static_cast<VideoParams::Interlacing>(video_interlace_combo_->currentIndex()),
+                                 pixel_aspect_combo_->GetPixelAspectRatio(),
                                  parent);
   }
 
@@ -199,46 +170,10 @@ bool VideoStreamProperties::IsImageSequence(ImageStream *stream)
   return (stream->type() == Stream::kVideo && static_cast<VideoStream*>(stream)->is_image_sequence());
 }
 
-void VideoStreamProperties::AddPixelAspectRatio(const QString &name, const rational &ratio)
-{
-  pixel_aspect_combo_->addItem(GetPixelAspectRatioItemText(name, ratio),
-                               QVariant::fromValue(ratio));
-}
-
-QString VideoStreamProperties::GetPixelAspectRatioItemText(const QString &name, const rational &ratio)
-{
-  return tr("%1 (%2)").arg(name, QString::number(ratio.toDouble(), 'f', 4));
-}
-
-void VideoStreamProperties::UpdateCustomItem(const rational &ratio)
-{
-  const int custom_index = pixel_aspect_combo_->count() - 1;
-
-  pixel_aspect_combo_->setItemText(custom_index,
-                                   GetPixelAspectRatioItemText(tr("Custom"), ratio));
-  pixel_aspect_combo_->setItemData(custom_index,
-                                   QVariant::fromValue(ratio));
-}
-
-void VideoStreamProperties::PixelAspectComboBoxChanged(int index)
-{
-  // Detect if custom was selected, in which case query what the new AR should be
-  if (index == pixel_aspect_combo_->count() - 1) {
-    // Query for custom pixel aspect ratio
-    bool ok;
-
-    double custom_ratio = GetFloatRatioFromUser(this, tr("Set Custom Pixel Aspect Ratio"), &ok);
-
-    if (ok) {
-      UpdateCustomItem(rational::fromDouble(custom_ratio));
-    }
-  }
-}
-
 VideoStreamProperties::VideoStreamChangeCommand::VideoStreamChangeCommand(ImageStreamPtr stream,
                                                                           bool premultiplied,
                                                                           QString colorspace,
-                                                                          ImageStream::Interlacing interlacing,
+                                                                          VideoParams::Interlacing interlacing,
                                                                           const rational &pixel_ar,
                                                                           QUndoCommand *parent) :
   UndoCommand(parent),
diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.h b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
index a1d534cee..5926fb77b 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.h
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
@@ -28,6 +28,7 @@
 #include "streamproperties.h"
 #include "undo/undocommand.h"
 #include "widget/slider/integerslider.h"
+#include "widget/standardcombos/standardcombos.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -43,12 +44,6 @@ public:
 private:
   static bool IsImageSequence(ImageStream* stream);
 
-  void AddPixelAspectRatio(const QString& name, const rational& ratio);
-
-  static QString GetPixelAspectRatioItemText(const QString& name, const rational& ratio);
-
-  void UpdateCustomItem(const rational& ratio);
-
   /**
    * @brief Attached video stream
    */
@@ -67,7 +62,7 @@ private:
   /**
    * @brief Setting for video interlacing
    */
-  QComboBox* video_interlace_combo_;
+  InterlacedComboBox* video_interlace_combo_;
 
   /**
    * @brief Sets the start index for image sequences
@@ -82,14 +77,14 @@ private:
   /**
    * @brief Sets the pixel aspect ratio of the stream
    */
-  QComboBox* pixel_aspect_combo_;
+  PixelAspectRatioComboBox* pixel_aspect_combo_;
 
   class VideoStreamChangeCommand : public UndoCommand {
   public:
     VideoStreamChangeCommand(ImageStreamPtr stream,
                              bool premultiplied,
                              QString colorspace,
-                             ImageStream::Interlacing interlacing,
+                             VideoParams::Interlacing interlacing,
                              const rational& pixel_ar,
                              QUndoCommand* parent = nullptr);
 
@@ -104,12 +99,12 @@ private:
 
     bool new_premultiplied_;
     QString new_colorspace_;
-    ImageStream::Interlacing new_interlacing_;
+    VideoParams::Interlacing new_interlacing_;
     rational new_pixel_ar_;
 
     bool old_premultiplied_;
     QString old_colorspace_;
-    ImageStream::Interlacing old_interlacing_;
+    VideoParams::Interlacing old_interlacing_;
     rational old_pixel_ar_;
 
   };
@@ -138,9 +133,6 @@ private:
 
   };
 
-private slots:
-  void PixelAspectComboBoxChanged(int index);
-
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/sequence/sequence.cpp b/app/dialog/sequence/sequence.cpp
index 7dd12122b..3006c2b73 100644
--- a/app/dialog/sequence/sequence.cpp
+++ b/app/dialog/sequence/sequence.cpp
@@ -102,24 +102,17 @@ void SequenceDialog::accept()
     return;
   }
 
-  // Get the rational at the combobox's index (which will be correct provided AddFrameRate() was used at all time)
-  rational video_time_base = parameter_tab_->GetSelectedVideoFrameRate().flipped();
-
-  // Get the rational at the combobox's index (which will be correct provided AddFrameRate() was used at all time)
-  int audio_sample_rate = parameter_tab_->GetSelectedAudioSampleRate();
-
-  // Get the audio channel layout value
-  uint64_t channels = parameter_tab_->GetSelectedAudioChannelLayout();
-
   // Generate video and audio parameter structs from data
   VideoParams video_params = VideoParams(parameter_tab_->GetSelectedVideoWidth(),
                                          parameter_tab_->GetSelectedVideoHeight(),
-                                         video_time_base,
+                                         parameter_tab_->GetSelectedVideoFrameRate().flipped(),
                                          parameter_tab_->GetSelectedPreviewFormat(),
+                                         parameter_tab_->GetSelectedVideoPixelAspect(),
+                                         parameter_tab_->GetSelectedVideoInterlacingMode(),
                                          parameter_tab_->GetSelectedPreviewResolution());
 
-  AudioParams audio_params = AudioParams(audio_sample_rate,
-                                         channels,
+  AudioParams audio_params = AudioParams(parameter_tab_->GetSelectedAudioSampleRate(),
+                                         parameter_tab_->GetSelectedAudioChannelLayout(),
                                          SampleFormat::kInternalFormat);
 
   if (make_undoable_) {
diff --git a/app/dialog/sequence/sequencedialogparametertab.cpp b/app/dialog/sequence/sequencedialogparametertab.cpp
index 1c8742675..98689b16c 100644
--- a/app/dialog/sequence/sequencedialogparametertab.cpp
+++ b/app/dialog/sequence/sequencedialogparametertab.cpp
@@ -35,8 +35,16 @@ SequenceDialogParameterTab::SequenceDialogParameterTab(Sequence* sequence, QWidg
   video_layout->addWidget(video_height_field_, row, 1);
   row++;
   video_layout->addWidget(new QLabel(tr("Frame Rate:")), row, 0);
-  video_frame_rate_field_ = new QComboBox();
+  video_frame_rate_field_ = new FrameRateComboBox();
   video_layout->addWidget(video_frame_rate_field_, row, 1);
+  row++;
+  video_layout->addWidget(new QLabel(tr("Pixel Aspect Ratio:")), row, 0);
+  video_pixel_aspect_field_ = new PixelAspectRatioComboBox();
+  video_layout->addWidget(video_pixel_aspect_field_, row, 1);
+  row++;
+  video_layout->addWidget(new QLabel(tr("Interlacing:")));
+  video_interlaced_field_ = new InterlacedComboBox();
+  video_layout->addWidget(video_interlaced_field_, row, 1);
   layout->addWidget(video_group);
 
   row = 0;
@@ -46,11 +54,11 @@ SequenceDialogParameterTab::SequenceDialogParameterTab(Sequence* sequence, QWidg
   audio_group->setTitle(tr("Audio"));
   QGridLayout* audio_layout = new QGridLayout(audio_group);
   audio_layout->addWidget(new QLabel(tr("Sample Rate:")), row, 0);
-  audio_sample_rate_field_ = new QComboBox();
+  audio_sample_rate_field_ = new SampleRateComboBox();
   audio_layout->addWidget(audio_sample_rate_field_, row, 1);
   row++;
   audio_layout->addWidget(new QLabel(tr("Channels:")), row, 0);
-  audio_channels_field_ = new QComboBox();
+  audio_channels_field_ = new ChannelLayoutComboBox();
   audio_layout->addWidget(audio_channels_field_, row, 1);
   layout->addWidget(audio_group);
 
@@ -61,83 +69,29 @@ SequenceDialogParameterTab::SequenceDialogParameterTab(Sequence* sequence, QWidg
   preview_group->setTitle(tr("Preview"));
   QGridLayout* preview_layout = new QGridLayout(preview_group);
   preview_layout->addWidget(new QLabel(tr("Resolution:")), row, 0);
-  preview_resolution_field_ = new QComboBox();
+  preview_resolution_field_ = new VideoDividerComboBox();
   preview_layout->addWidget(preview_resolution_field_, row, 1);
   preview_resolution_label_ = new QLabel();
   preview_layout->addWidget(preview_resolution_label_, row, 2);
   row++;
   preview_layout->addWidget(new QLabel(tr("Format:")), row, 0);
-  preview_format_field_ = new QComboBox();
+  preview_format_field_ = new PixelFormatComboBox(true, true);
   preview_layout->addWidget(preview_format_field_, row, 1, 1, 2);
   layout->addWidget(preview_group);
 
-  // Set up available frame rates
-  frame_rate_list_ = Core::SupportedFrameRates();
-  foreach (const rational& fr, frame_rate_list_) {
-    video_frame_rate_field_->addItem(Core::FrameRateToString(fr));
-  }
-
-  // Set up available sample rates
-  sample_rate_list_ = Core::SupportedSampleRates();
-  foreach (const int& sr, sample_rate_list_) {
-    audio_sample_rate_field_->addItem(Core::SampleRateToString(sr));
-  }
-
-  // Set up available channel layouts
-  channel_layout_list_ = Core::SupportedChannelLayouts();
-  foreach (const uint64_t& ch_layout, channel_layout_list_) {
-    audio_channels_field_->addItem(Core::ChannelLayoutToString(ch_layout), QVariant::fromValue(ch_layout));
-  }
-
-  // Set up preview dividers
-  divider_list_ = Core::SupportedDividers();
-  foreach (int d, divider_list_) {
-    QString name;
-
-    if (d == 1) {
-      name = tr("Full");
-    } else {
-      name = tr("1/%1").arg(d);
-    }
-
-    preview_resolution_field_->addItem(name);
-  }
-  connect(preview_resolution_field_, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-          this, &SequenceDialogParameterTab::UpdatePreviewResolutionLabel);
-
-  // Set up preview formats
-  for (int i=0;i<PixelFormat::PIX_FMT_COUNT;i++) {
-    PixelFormat::Format pix_fmt = static_cast<PixelFormat::Format>(i);
-
-    // We always render with an alpha channel internally
-    if (PixelFormat::FormatHasAlphaChannel(pix_fmt)
-        && PixelFormat::FormatIsFloat(pix_fmt)) {
-      preview_format_field_->addItem(PixelFormat::GetName(pix_fmt));
-
-      preview_format_list_.append(pix_fmt);
-    }
-  }
-
   // Set values based on input sequence
   video_width_field_->SetValue(sequence->video_params().width());
   video_height_field_->SetValue(sequence->video_params().height());
+  video_frame_rate_field_->SetFrameRate(sequence->video_params().time_base().flipped());
+  video_pixel_aspect_field_->SetPixelAspectRatio(sequence->video_params().pixel_aspect_ratio());
+  video_interlaced_field_->SetInterlaceMode(sequence->video_params().interlacing());
+  preview_resolution_field_->SetDivider(sequence->video_params().divider());
+  preview_format_field_->SetPixelFormat(sequence->video_params().format());
+  audio_sample_rate_field_->SetSampleRate(sequence->audio_params().sample_rate());
+  audio_channels_field_->SetChannelLayout(sequence->audio_params().channel_layout());
 
-  int frame_rate_index = frame_rate_list_.indexOf(sequence->video_params().time_base().flipped());
-  video_frame_rate_field_->setCurrentIndex(frame_rate_index);
-
-  int sample_rate_index = sample_rate_list_.indexOf(sequence->audio_params().sample_rate());
-  audio_sample_rate_field_->setCurrentIndex(sample_rate_index);
-
-  for (int i=0;i<audio_channels_field_->count();i++) {
-    if (audio_channels_field_->itemData(i).toULongLong() == sequence->audio_params().channel_layout()) {
-      audio_channels_field_->setCurrentIndex(i);
-      break;
-    }
-  }
-
-  preview_resolution_field_->setCurrentIndex(divider_list_.indexOf(sequence->video_params().divider()));
-
-  preview_format_field_->setCurrentIndex(preview_format_list_.indexOf(sequence->video_params().format()));
+  connect(preview_resolution_field_, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+          this, &SequenceDialogParameterTab::UpdatePreviewResolutionLabel);
 
   layout->addStretch();
 
@@ -148,62 +102,31 @@ SequenceDialogParameterTab::SequenceDialogParameterTab(Sequence* sequence, QWidg
   UpdatePreviewResolutionLabel();
 }
 
-int SequenceDialogParameterTab::GetSelectedVideoWidth() const
-{
-  return video_width_field_->GetValue();
-}
-
-int SequenceDialogParameterTab::GetSelectedVideoHeight() const
-{
-  return video_height_field_->GetValue();
-}
-
-const rational &SequenceDialogParameterTab::GetSelectedVideoFrameRate() const
-{
-  return frame_rate_list_.at(video_frame_rate_field_->currentIndex());
-}
-
-int SequenceDialogParameterTab::GetSelectedAudioSampleRate() const
-{
-  return sample_rate_list_.at(audio_sample_rate_field_->currentIndex());
-}
-
-uint64_t SequenceDialogParameterTab::GetSelectedAudioChannelLayout() const
-{
-  return audio_channels_field_->currentData().toULongLong();
-}
-
-int SequenceDialogParameterTab::GetSelectedPreviewResolution() const
-{
-  return divider_list_.at(preview_resolution_field_->currentIndex());
-}
-
-PixelFormat::Format SequenceDialogParameterTab::GetSelectedPreviewFormat() const
-{
-  return preview_format_list_.at(preview_format_field_->currentIndex());
-}
-
 void SequenceDialogParameterTab::PresetChanged(const SequencePreset &preset)
 {
   video_width_field_->SetValue(preset.width());
   video_height_field_->SetValue(preset.height());
-  video_frame_rate_field_->setCurrentIndex(frame_rate_list_.indexOf(preset.frame_rate()));
-  audio_sample_rate_field_->setCurrentIndex(sample_rate_list_.indexOf(preset.sample_rate()));
-  audio_channels_field_->setCurrentIndex(channel_layout_list_.indexOf(preset.channel_layout()));
-  preview_resolution_field_->setCurrentIndex(divider_list_.indexOf(preset.preview_divider()));
-  preview_format_field_->setCurrentIndex(preview_format_list_.indexOf(preset.preview_format()));
+  video_frame_rate_field_->SetFrameRate(preset.frame_rate());
+  video_pixel_aspect_field_->SetPixelAspectRatio(preset.pixel_aspect());
+  video_interlaced_field_->SetInterlaceMode(preset.interlacing());
+  audio_sample_rate_field_->SetSampleRate(preset.sample_rate());
+  audio_channels_field_->SetChannelLayout(preset.channel_layout());
+  preview_resolution_field_->SetDivider(preset.preview_divider());
+  preview_format_field_->SetPixelFormat(preset.preview_format());
 }
 
 void SequenceDialogParameterTab::SavePresetClicked()
 {
   emit SaveParametersAsPreset({QString(),
-                               static_cast<int>(video_width_field_->GetValue()),
-                               static_cast<int>(video_height_field_->GetValue()),
-                               frame_rate_list_.at(video_frame_rate_field_->currentIndex()),
-                               sample_rate_list_.at(audio_sample_rate_field_->currentIndex()),
-                               channel_layout_list_.at(audio_channels_field_->currentIndex()),
-                               divider_list_.at(preview_resolution_field_->currentIndex()),
-                               preview_format_list_.at(preview_format_field_->currentIndex())});
+                               GetSelectedVideoWidth(),
+                               GetSelectedVideoHeight(),
+                               GetSelectedVideoFrameRate(),
+                               GetSelectedVideoPixelAspect(),
+                               GetSelectedVideoInterlacingMode(),
+                               GetSelectedAudioSampleRate(),
+                               GetSelectedAudioChannelLayout(),
+                               GetSelectedPreviewResolution(),
+                               GetSelectedPreviewFormat()});
 }
 
 void SequenceDialogParameterTab::UpdatePreviewResolutionLabel()
@@ -211,7 +134,9 @@ void SequenceDialogParameterTab::UpdatePreviewResolutionLabel()
   VideoParams test_param(video_width_field_->GetValue(),
                          video_height_field_->GetValue(),
                          PixelFormat::PIX_FMT_INVALID,
-                         divider_list_.at(preview_resolution_field_->currentIndex()));
+                         rational(1),
+                         VideoParams::kInterlaceNone,
+                         preview_resolution_field_->currentData().toInt());
 
   preview_resolution_label_->setText(tr("(%1x%2)").arg(QString::number(test_param.effective_width()),
                                                        QString::number(test_param.effective_height())));
diff --git a/app/dialog/sequence/sequencedialogparametertab.h b/app/dialog/sequence/sequencedialogparametertab.h
index 2baab8fb2..794abe505 100644
--- a/app/dialog/sequence/sequencedialogparametertab.h
+++ b/app/dialog/sequence/sequencedialogparametertab.h
@@ -8,6 +8,7 @@
 #include "project/item/sequence/sequence.h"
 #include "sequencepreset.h"
 #include "widget/slider/integerslider.h"
+#include "widget/standardcombos/standardcombos.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -17,19 +18,50 @@ class SequenceDialogParameterTab : public QWidget
 public:
   SequenceDialogParameterTab(Sequence* sequence, QWidget* parent = nullptr);
 
-  int GetSelectedVideoWidth() const;
+  int GetSelectedVideoWidth() const
+  {
+    return video_width_field_->GetValue();
+  }
 
-  int GetSelectedVideoHeight() const;
+  int GetSelectedVideoHeight() const
+  {
+    return video_height_field_->GetValue();
+  }
 
-  const rational& GetSelectedVideoFrameRate() const;
+  rational GetSelectedVideoFrameRate() const
+  {
+    return video_frame_rate_field_->GetFrameRate();
+  }
 
-  int GetSelectedAudioSampleRate() const;
+  rational GetSelectedVideoPixelAspect() const
+  {
+    return video_pixel_aspect_field_->GetPixelAspectRatio();
+  }
 
-  uint64_t GetSelectedAudioChannelLayout() const;
+  VideoParams::Interlacing GetSelectedVideoInterlacingMode() const
+  {
+    return video_interlaced_field_->GetInterlaceMode();
+  }
 
-  int GetSelectedPreviewResolution() const;
+  int GetSelectedAudioSampleRate() const
+  {
+    return audio_sample_rate_field_->GetSampleRate();
+  }
 
-  PixelFormat::Format GetSelectedPreviewFormat() const;
+  uint64_t GetSelectedAudioChannelLayout() const
+  {
+    return audio_channels_field_->GetChannelLayout();
+  }
+
+  int GetSelectedPreviewResolution() const
+  {
+    return preview_resolution_field_->GetDivider();
+  }
+
+  PixelFormat::Format GetSelectedPreviewFormat() const
+  {
+    return preview_format_field_->GetPixelFormat();
+  }
 
 public slots:
   void PresetChanged(const SequencePreset& preset);
@@ -42,27 +74,21 @@ private:
 
   IntegerSlider* video_height_field_;
 
-  QComboBox* video_frame_rate_field_;
+  FrameRateComboBox* video_frame_rate_field_;
 
-  QComboBox* audio_sample_rate_field_;
+  PixelAspectRatioComboBox* video_pixel_aspect_field_;
 
-  QComboBox* audio_channels_field_;
+  InterlacedComboBox* video_interlaced_field_;
 
-  QComboBox* preview_resolution_field_;
+  SampleRateComboBox* audio_sample_rate_field_;
+
+  ChannelLayoutComboBox* audio_channels_field_;
+
+  VideoDividerComboBox* preview_resolution_field_;
 
   QLabel* preview_resolution_label_;
 
-  QComboBox* preview_format_field_;
-
-  QList<rational> frame_rate_list_;
-
-  QList<int> sample_rate_list_;
-
-  QList<uint64_t> channel_layout_list_;
-
-  QList<int> divider_list_;
-
-  QList<PixelFormat::Format> preview_format_list_;
+  PixelFormatComboBox* preview_format_field_;
 
 private slots:
   void SavePresetClicked();
diff --git a/app/dialog/sequence/sequencedialogpresettab.cpp b/app/dialog/sequence/sequencedialogpresettab.cpp
index 8bf6837dd..44a2af0f9 100644
--- a/app/dialog/sequence/sequencedialogpresettab.cpp
+++ b/app/dialog/sequence/sequencedialogpresettab.cpp
@@ -31,6 +31,7 @@
 
 #include "common/filefunctions.h"
 #include "node/input.h"
+#include "render/videoparams.h"
 #include "ui/icons/icons.h"
 #include "widget/menu/menu.h"
 
@@ -40,6 +41,8 @@ const int kDataIsPreset = Qt::UserRole;
 const int kDataPresetIsCustomRole = Qt::UserRole + 1;
 const int kDataPresetDataRole = Qt::UserRole + 2;
 
+const PixelFormat::Format kDefaultPreviewFormat = PixelFormat::PIX_FMT_RGBA16F;
+
 SequenceDialogPresetTab::SequenceDialogPresetTab(QWidget* parent) :
   QWidget(parent),
   PresetManager<SequencePreset>(this, QStringLiteral("sequencepresets"))
@@ -65,8 +68,12 @@ SequenceDialogPresetTab::SequenceDialogPresetTab(QWidget* parent) :
   preset_tree_->addTopLevelItem(CreateHDPresetFolder(tr("1080p"), 1920, 1080, 3));
   preset_tree_->addTopLevelItem(CreateHDPresetFolder(tr("720p"), 1280, 720, 2));
 
-  preset_tree_->addTopLevelItem(CreateSDPresetFolder(tr("NTSC"), 720, 480, rational(30000, 1001), 1));
-  preset_tree_->addTopLevelItem(CreateSDPresetFolder(tr("PAL"), 720, 576, rational(25, 1), 1));
+  preset_tree_->addTopLevelItem(CreateSDPresetFolder(tr("NTSC"), 720, 480, rational(30000, 1001),
+                                                     VideoParams::kPixelAspectNTSCStandard,
+                                                     VideoParams::kPixelAspectNTSCWidescreen, 1));
+  preset_tree_->addTopLevelItem(CreateSDPresetFolder(tr("PAL"), 720, 576, rational(25, 1),
+                                                     VideoParams::kPixelAspectPALStandard,
+                                                     VideoParams::kPixelAspectPALWidescreen, 1));
 
   // Load custom presets
   for (int i=0;i<GetNumberOfPresets();i++) {
@@ -98,46 +105,56 @@ QTreeWidgetItem *SequenceDialogPresetTab::CreateHDPresetFolder(const QString &na
                                                  width,
                                                  height,
                                                  rational(24000, 1001),
+                                                 VideoParams::kPixelAspectSquare,
+                                                 VideoParams::kInterlaceNone,
                                                  48000,
                                                  AV_CH_LAYOUT_STEREO,
                                                  divider,
-                                                 PixelFormat::PIX_FMT_RGBA16F));
+                                                 kDefaultPreviewFormat));
   AddStandardItem(parent, SequencePreset::Create(tr("%1 25 FPS").arg(name),
                                                  width,
                                                  height,
                                                  rational(25, 1),
+                                                 VideoParams::kPixelAspectSquare,
+                                                 VideoParams::kInterlaceNone,
                                                  48000,
                                                  AV_CH_LAYOUT_STEREO,
                                                  divider,
-                                                 PixelFormat::PIX_FMT_RGBA16F));
+                                                 kDefaultPreviewFormat));
   AddStandardItem(parent, SequencePreset::Create(tr("%1 29.97 FPS").arg(name),
                                                  width,
                                                  height,
                                                  rational(30000, 1001),
+                                                 VideoParams::kPixelAspectSquare,
+                                                 VideoParams::kInterlaceNone,
                                                  48000,
                                                  AV_CH_LAYOUT_STEREO,
                                                  divider,
-                                                 PixelFormat::PIX_FMT_RGBA16F));
+                                                 kDefaultPreviewFormat));
   AddStandardItem(parent, SequencePreset::Create(tr("%1 50 FPS").arg(name),
                                                  width,
                                                  height,
                                                  rational(50, 1),
+                                                 VideoParams::kPixelAspectSquare,
+                                                 VideoParams::kInterlaceNone,
                                                  48000,
                                                  AV_CH_LAYOUT_STEREO,
                                                  divider,
-                                                 PixelFormat::PIX_FMT_RGBA16F));
+                                                 kDefaultPreviewFormat));
   AddStandardItem(parent, SequencePreset::Create(tr("%1 59.94 FPS").arg(name),
                                                  width,
                                                  height,
                                                  rational(60000, 1001),
+                                                 VideoParams::kPixelAspectSquare,
+                                                 VideoParams::kInterlaceNone,
                                                  48000,
                                                  AV_CH_LAYOUT_STEREO,
                                                  divider,
-                                                 PixelFormat::PIX_FMT_RGBA16F));
+                                                 kDefaultPreviewFormat));
   return parent;
 }
 
-QTreeWidgetItem *SequenceDialogPresetTab::CreateSDPresetFolder(const QString &name, int width, int height, const rational& frame_rate, int divider)
+QTreeWidgetItem *SequenceDialogPresetTab::CreateSDPresetFolder(const QString &name, int width, int height, const rational& frame_rate, const rational &standard_par, const rational &wide_par, int divider)
 {
   QTreeWidgetItem* parent = CreateFolder(name);
   preset_tree_->addTopLevelItem(parent);
@@ -145,18 +162,22 @@ QTreeWidgetItem *SequenceDialogPresetTab::CreateSDPresetFolder(const QString &na
                                                  width,
                                                  height,
                                                  frame_rate,
+                                                 standard_par,
+                                                 VideoParams::kInterlacedTopFirst,
                                                  48000,
                                                  AV_CH_LAYOUT_STEREO,
                                                  divider,
-                                                 PixelFormat::PIX_FMT_RGBA16F));
+                                                 kDefaultPreviewFormat));
   AddStandardItem(parent, SequencePreset::Create(tr("%1 Widescreen").arg(name),
                                                  width,
                                                  height,
                                                  frame_rate,
+                                                 wide_par,
+                                                 VideoParams::kInterlacedTopFirst,
                                                  48000,
                                                  AV_CH_LAYOUT_STEREO,
                                                  divider,
-                                                 PixelFormat::PIX_FMT_RGBA16F));
+                                                 kDefaultPreviewFormat));
   return parent;
 }
 
diff --git a/app/dialog/sequence/sequencedialogpresettab.h b/app/dialog/sequence/sequencedialogpresettab.h
index df5ba5596..a2ef8a95d 100644
--- a/app/dialog/sequence/sequencedialogpresettab.h
+++ b/app/dialog/sequence/sequencedialogpresettab.h
@@ -49,7 +49,7 @@ private:
 
   QTreeWidgetItem *CreateHDPresetFolder(const QString& name, int width, int height, int divider);
 
-  QTreeWidgetItem *CreateSDPresetFolder(const QString& name, int width, int height, const rational &frame_rate, int divider);
+  QTreeWidgetItem *CreateSDPresetFolder(const QString& name, int width, int height, const rational &frame_rate, const rational& standard_par, const rational& wide_par, int divider);
 
   QTreeWidgetItem* GetSelectedItem();
   QTreeWidgetItem* GetSelectedCustomPreset();
diff --git a/app/dialog/sequence/sequencepreset.h b/app/dialog/sequence/sequencepreset.h
index 4b0dc776e..6b134b8f1 100644
--- a/app/dialog/sequence/sequencepreset.h
+++ b/app/dialog/sequence/sequencepreset.h
@@ -27,6 +27,7 @@
 #include "common/xmlutils.h"
 #include "dialog/sequence/presetmanager.h"
 #include "render/pixelformat.h"
+#include "render/videoparams.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -38,6 +39,8 @@ public:
                  int width,
                  int height,
                  const rational& frame_rate,
+                 const rational& pixel_aspect,
+                 VideoParams::Interlacing interlacing,
                  int sample_rate,
                  uint64_t channel_layout,
                  int preview_divider,
@@ -45,6 +48,8 @@ public:
     width_(width),
     height_(height),
     frame_rate_(frame_rate),
+    pixel_aspect_(pixel_aspect),
+    interlacing_(interlacing),
     sample_rate_(sample_rate),
     channel_layout_(channel_layout),
     preview_divider_(preview_divider),
@@ -57,13 +62,16 @@ public:
                           int width,
                           int height,
                           const rational& frame_rate,
+                          const rational& pixel_aspect,
+                          VideoParams::Interlacing interlacing,
                           int sample_rate,
                           uint64_t channel_layout,
                           int preview_divider,
                           PixelFormat::Format preview_format)
   {
-    return std::make_shared<SequencePreset>(name, width, height, frame_rate, sample_rate,
-                                            channel_layout, preview_divider, preview_format);
+    return std::make_shared<SequencePreset>(name, width, height, frame_rate, pixel_aspect,
+                                            interlacing, sample_rate, channel_layout,
+                                            preview_divider, preview_format);
   }
 
   virtual void Load(QXmlStreamReader* reader) override
@@ -77,6 +85,10 @@ public:
         height_ = reader->readElementText().toInt();
       } else if (reader->name() == QStringLiteral("framerate")) {
         frame_rate_ = rational::fromString(reader->readElementText());
+      } else if (reader->name() == QStringLiteral("pixelaspect")) {
+        pixel_aspect_ = rational::fromString(reader->readElementText());
+      } else if (reader->name() == QStringLiteral("interlacing")) {
+        interlacing_ = static_cast<VideoParams::Interlacing>(reader->readElementText().toInt());
       } else if (reader->name() == QStringLiteral("samplerate")) {
         sample_rate_ = reader->readElementText().toInt();
       } else if (reader->name() == QStringLiteral("chlayout")) {
@@ -97,6 +109,8 @@ public:
     writer->writeTextElement(QStringLiteral("width"), QString::number(width_));
     writer->writeTextElement(QStringLiteral("height"), QString::number(height_));
     writer->writeTextElement(QStringLiteral("framerate"), frame_rate_.toString());
+    writer->writeTextElement(QStringLiteral("pixelaspect"), pixel_aspect_.toString());
+    writer->writeTextElement(QStringLiteral("interlacing_"), QString::number(interlacing_));
     writer->writeTextElement(QStringLiteral("samplerate"), QString::number(sample_rate_));
     writer->writeTextElement(QStringLiteral("chlayout"), QString::number(channel_layout_));
     writer->writeTextElement(QStringLiteral("divider"), QString::number(preview_divider_));
@@ -118,6 +132,16 @@ public:
     return frame_rate_;
   }
 
+  const rational& pixel_aspect() const
+  {
+    return pixel_aspect_;
+  }
+
+  VideoParams::Interlacing interlacing() const
+  {
+    return interlacing_;
+  }
+
   int sample_rate() const
   {
     return sample_rate_;
@@ -142,6 +166,8 @@ private:
   int width_;
   int height_;
   rational frame_rate_;
+  rational pixel_aspect_;
+  VideoParams::Interlacing interlacing_;
   int sample_rate_;
   uint64_t channel_layout_;
   int preview_divider_;
diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp
index 0d96a049e..93280bf65 100644
--- a/app/node/output/viewer/viewer.cpp
+++ b/app/node/output/viewer/viewer.cpp
@@ -136,6 +136,7 @@ void ViewerOutput::set_video_params(const VideoParams &video)
 {
   bool size_changed = video_params_.width() != video.width() || video_params_.height() != video.height();
   bool timebase_changed = video_params_.time_base() != video.time_base();
+  bool pixel_aspect_changed = video_params_.pixel_aspect_ratio() != video.pixel_aspect_ratio();
 
   video_params_ = video;
 
@@ -143,6 +144,10 @@ void ViewerOutput::set_video_params(const VideoParams &video)
     emit SizeChanged(video_params_.width(), video_params_.height());
   }
 
+  if (pixel_aspect_changed) {
+    emit PixelAspectChanged(video_params_.pixel_aspect_ratio());
+  }
+
   if (timebase_changed) {
     video_frame_cache_.SetTimebase(video_params_.time_base());
     emit TimebaseChanged(video_params_.time_base());
diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h
index c2b1c49e1..2d67c9800 100644
--- a/app/node/output/viewer/viewer.h
+++ b/app/node/output/viewer/viewer.h
@@ -131,6 +131,8 @@ signals:
 
   void SizeChanged(int width, int height);
 
+  void PixelAspectChanged(const rational& pixel_aspect);
+
   void VideoParamsChanged();
   void AudioParamsChanged();
 
diff --git a/app/project/item/footage/imagestream.cpp b/app/project/item/footage/imagestream.cpp
index 908ac8adc..a4a53df0a 100644
--- a/app/project/item/footage/imagestream.cpp
+++ b/app/project/item/footage/imagestream.cpp
@@ -29,7 +29,7 @@ OLIVE_NAMESPACE_ENTER
 
 ImageStream::ImageStream() :
   premultiplied_alpha_(false),
-  interlacing_(kInterlaceNone),
+  interlacing_(VideoParams::kInterlaceNone),
   pixel_aspect_ratio_(1)
 {
   set_type(kImage);
diff --git a/app/project/item/footage/imagestream.h b/app/project/item/footage/imagestream.h
index 47f59f3f2..dfa01bab9 100644
--- a/app/project/item/footage/imagestream.h
+++ b/app/project/item/footage/imagestream.h
@@ -22,6 +22,7 @@
 #define IMAGESTREAM_H
 
 #include "render/pixelformat.h"
+#include "render/videoparams.h"
 #include "stream.h"
 
 OLIVE_NAMESPACE_ENTER
@@ -75,18 +76,12 @@ public:
 
   QString get_colorspace_match_string() const;
 
-  enum Interlacing {
-    kInterlaceNone,
-    kInterlacedTopFirst,
-    kInterlacedBottomFirst
-  };
-
-  Interlacing interlacing() const
+  VideoParams::Interlacing interlacing() const
   {
     return interlacing_;
   }
 
-  void set_interlacing(Interlacing i)
+  void set_interlacing(VideoParams::Interlacing i)
   {
     interlacing_ = i;
 
@@ -122,7 +117,7 @@ private:
   int height_;
   bool premultiplied_alpha_;
   QString colorspace_;
-  Interlacing interlacing_;
+  VideoParams::Interlacing interlacing_;
 
   PixelFormat::Format format_;
 
diff --git a/app/project/item/sequence/sequence.cpp b/app/project/item/sequence/sequence.cpp
index 9e89a0aaa..fcf76c8dd 100644
--- a/app/project/item/sequence/sequence.cpp
+++ b/app/project/item/sequence/sequence.cpp
@@ -65,7 +65,8 @@ void Sequence::Load(QXmlStreamReader *reader, XMLNodeData& xml_node_data, const
 
     if (reader->name() == QStringLiteral("video")) {
       int video_width = 0, video_height = 0, preview_div = 1;
-      rational video_timebase;
+      rational video_timebase, video_pixel_aspect;
+      VideoParams::Interlacing video_interlacing = VideoParams::kInterlaceNone;
       PixelFormat::Format preview_format = PixelFormat::PIX_FMT_INVALID;
 
       while (XMLReadNextStartElement(reader)) {
@@ -83,12 +84,17 @@ void Sequence::Load(QXmlStreamReader *reader, XMLNodeData& xml_node_data, const
           preview_div = reader->readElementText().toInt();
         } else if (reader->name() == QStringLiteral("format")) {
           preview_format = static_cast<PixelFormat::Format>(reader->readElementText().toInt());
+        } else if (reader->name() == QStringLiteral("pixelaspect")) {
+          video_pixel_aspect = rational::fromString(reader->readElementText());
+        } else if (reader->name() == QStringLiteral("interlacing")) {
+          video_interlacing = static_cast<VideoParams::Interlacing>(reader->readElementText().toInt());
         } else {
           reader->skipCurrentElement();
         }
       }
 
-      set_video_params(VideoParams(video_width, video_height, video_timebase, preview_format, preview_div));
+      set_video_params(VideoParams(video_width, video_height, video_timebase, preview_format,
+                                   video_pixel_aspect, video_interlacing, preview_div));
     } else if (reader->name() == QStringLiteral("audio")) {
       int rate = 0;
       uint64_t layout = 0;
@@ -156,6 +162,8 @@ void Sequence::Save(QXmlStreamWriter *writer) const
   writer->writeTextElement(QStringLiteral("width"), QString::number(video_params().width()));
   writer->writeTextElement(QStringLiteral("height"), QString::number(video_params().height()));
   writer->writeTextElement(QStringLiteral("timebase"), video_params().time_base().toString());
+  writer->writeTextElement(QStringLiteral("pixelaspect"), video_params().pixel_aspect_ratio().toString());
+  writer->writeTextElement(QStringLiteral("interlacing"), QString::number(video_params().interlacing()));
   writer->writeTextElement(QStringLiteral("divider"), QString::number(video_params().divider()));
   writer->writeTextElement(QStringLiteral("format"), QString::number(video_params().format()));
 
@@ -245,6 +253,8 @@ void Sequence::set_default_parameters()
                                height,
                                Config::Current()["DefaultSequenceFrameRate"].value<rational>(),
                                static_cast<PixelFormat::Format>(Config::Current()["DefaultSequencePreviewFormat"].toInt()),
+                               Config::Current()["DefaultSequencePixelAspect"].value<rational>(),
+                               Config::Current()["DefaultSequenceInterlacing"].value<VideoParams::Interlacing>(),
                                VideoParams::generate_auto_divider(width, height)));
   set_audio_params(AudioParams(Config::Current()["DefaultSequenceAudioFrequency"].toInt(),
                    Config::Current()["DefaultSequenceAudioLayout"].toULongLong(),
@@ -269,6 +279,8 @@ void Sequence::set_parameters_from_footage(const QList<Footage *> footage)
                                        vs->height(),
                                        vs->frame_rate().flipped(),
                                        static_cast<PixelFormat::Format>(Config::Current()["DefaultSequencePreviewFormat"].toInt()),
+                                       vs->pixel_aspect_ratio(),
+                                       vs->interlacing(),
                                        VideoParams::generate_auto_divider(vs->width(), vs->height())));
           found_video_params = true;
         }
@@ -284,6 +296,8 @@ void Sequence::set_parameters_from_footage(const QList<Footage *> footage)
                                        is->height(),
                                        video_params().time_base(),
                                        static_cast<PixelFormat::Format>(Config::Current()["DefaultSequencePreviewFormat"].toInt()),
+                                       is->pixel_aspect_ratio(),
+                                       is->interlacing(),
                                        VideoParams::generate_auto_divider(is->width(), is->height())));
         }
         break;
diff --git a/app/render/audioparams.cpp b/app/render/audioparams.cpp
index 35c51aedf..90ab792d9 100644
--- a/app/render/audioparams.cpp
+++ b/app/render/audioparams.cpp
@@ -24,8 +24,31 @@ extern "C" {
 #include <libavformat/avformat.h>
 }
 
+#include <QCoreApplication>
+
 OLIVE_NAMESPACE_ENTER
 
+const QVector<int> AudioParams::kSupportedSampleRates = {
+  8000,          // 8000 Hz
+  11025,         // 11025 Hz
+  16000,         // 16000 Hz
+  22050,         // 22050 Hz
+  24000,         // 24000 Hz
+  32000,         // 32000 Hz
+  44100,         // 44100 Hz
+  48000,         // 48000 Hz
+  88200,         // 88200 Hz
+  96000          // 96000 Hz
+};
+
+const QVector<uint64_t> AudioParams::kSupportedChannelLayouts = {
+  AV_CH_LAYOUT_MONO,
+  AV_CH_LAYOUT_STEREO,
+  AV_CH_LAYOUT_2_1,
+  AV_CH_LAYOUT_5POINT1,
+  AV_CH_LAYOUT_7POINT1
+};
+
 int AudioParams::time_to_bytes(const double &time) const
 {
   Q_ASSERT(is_valid());
@@ -127,4 +150,27 @@ bool AudioParams::is_valid() const
           && format_ != SampleFormat::SAMPLE_FMT_COUNT);
 }
 
+QString AudioParams::SampleRateToString(const int &sample_rate)
+{
+  return QCoreApplication::translate("AudioParams", "%1 Hz").arg(sample_rate);
+}
+
+QString AudioParams::ChannelLayoutToString(const uint64_t &layout)
+{
+  switch (layout) {
+  case AV_CH_LAYOUT_MONO:
+    return QCoreApplication::translate("AudioParams", "Mono");
+  case AV_CH_LAYOUT_STEREO:
+    return QCoreApplication::translate("AudioParams", "Stereo");
+  case AV_CH_LAYOUT_2_1:
+    return QCoreApplication::translate("AudioParams", "2.1");
+  case AV_CH_LAYOUT_5POINT1:
+    return QCoreApplication::translate("AudioParams", "5.1");
+  case AV_CH_LAYOUT_7POINT1:
+    return QCoreApplication::translate("AudioParams", "7.1");
+  default:
+    return QCoreApplication::translate("AudioParams", "Unknown (0x%1)").arg(layout, 1, 16);
+  }
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/audioparams.h b/app/render/audioparams.h
index 617685a5e..56028a579 100644
--- a/app/render/audioparams.h
+++ b/app/render/audioparams.h
@@ -80,6 +80,19 @@ public:
   bool operator==(const AudioParams& other) const;
   bool operator!=(const AudioParams& other) const;
 
+  static const QVector<uint64_t> kSupportedChannelLayouts;
+  static const QVector<int> kSupportedSampleRates;
+
+  /**
+   * @brief Convert integer sample rate to a user-friendly string
+   */
+  static QString SampleRateToString(const int &sample_rate);
+
+  /**
+   * @brief Convert channel layout to a user-friendly string
+   */
+  static QString ChannelLayoutToString(const uint64_t &layout);
+
 private:
   int sample_rate_;
 
diff --git a/app/render/backend/opengl/openglproxy.cpp b/app/render/backend/opengl/openglproxy.cpp
index 4b580711a..224f52c41 100644
--- a/app/render/backend/opengl/openglproxy.cpp
+++ b/app/render/backend/opengl/openglproxy.cpp
@@ -149,22 +149,26 @@ QVariant OpenGLProxy::FrameToValue(FramePtr frame, StreamPtr stream, const Video
     VideoParams frame_params = frame->video_params();
 
     // Check frame aspect ratio
-    if (frame->sample_aspect_ratio() != 1) {
+    rational true_pixel_aspect_ratio = frame_params.pixel_aspect_ratio() / params.pixel_aspect_ratio();
+
+    if (true_pixel_aspect_ratio != 1) {
       int new_width = frame_params.width();
       int new_height = frame_params.height();
 
       // Scale the frame in a way that does not reduce the resolution
-      if (frame->sample_aspect_ratio() > 1) {
+      if (frame_params.pixel_aspect_ratio() > 1) {
         // Make wider
-        new_width = qRound(static_cast<double>(new_width) * frame->sample_aspect_ratio().toDouble());
+        new_width = qRound(static_cast<double>(new_width) * frame_params.pixel_aspect_ratio().toDouble());
       } else {
         // Make taller
-        new_height = qRound(static_cast<double>(new_height) / frame->sample_aspect_ratio().toDouble());
+        new_height = qRound(static_cast<double>(new_height) / frame_params.pixel_aspect_ratio().toDouble());
       }
 
       frame_params = VideoParams(new_width,
                                  new_height,
                                  frame_params.format(),
+                                 frame_params.pixel_aspect_ratio(),
+                                 frame_params.interlacing(),
                                  frame_params.divider());
     }
 
@@ -178,6 +182,8 @@ QVariant OpenGLProxy::FrameToValue(FramePtr frame, StreamPtr stream, const Video
     VideoParams dest_params(frame_params.width(),
                             frame_params.height(),
                             texture_fmt,
+                            frame_params.pixel_aspect_ratio(),
+                            frame_params.interlacing(),
                             frame_params.divider());
 
     // Create destination texture
@@ -420,6 +426,8 @@ QVariant OpenGLProxy::RunNodeAccelerated(const Node *node,
                             params.height(),
                             params.time_base(),
                             output_format,
+                            params.pixel_aspect_ratio(),
+                            params.interlacing(),
                             params.divider());
 
   int real_iteration_count;
diff --git a/app/render/backend/renderworker.cpp b/app/render/backend/renderworker.cpp
index 252cb1210..1f7902190 100644
--- a/app/render/backend/renderworker.cpp
+++ b/app/render/backend/renderworker.cpp
@@ -127,6 +127,8 @@ void RenderWorker::RenderFrame(RenderTicketPtr ticket, ViewerOutput* viewer, con
                                       video_params_.height(),
                                       video_params_.time_base(),
                                       output_format,
+                                      video_params_.pixel_aspect_ratio(),
+                                      video_params_.interlacing(),
                                       video_params_.divider()));
   frame->set_timestamp(time);
   frame->allocate();
@@ -295,6 +297,8 @@ QVariant RenderWorker::ProcessFrameGeneration(const Node* node, const GenerateJo
                                       video_params_.height(),
                                       video_params_.time_base(),
                                       output_fmt,
+                                      video_params_.pixel_aspect_ratio(),
+                                      video_params_.interlacing(),
                                       video_params_.divider()));
   frame->allocate();
 
@@ -316,6 +320,8 @@ QVariant RenderWorker::GetCachedFrame(const Node* node, const rational& time)
                                       f->height() * video_params_.divider(),
                                       f->video_params().time_base(),
                                       f->video_params().format(),
+                                      f->video_params().pixel_aspect_ratio(),
+                                      f->video_params().interlacing(),
                                       video_params_.divider()));
 
       return CachedFrameToTexture(f);
diff --git a/app/render/pixelformat.cpp b/app/render/pixelformat.cpp
index 4c1ee999d..01abf0aff 100644
--- a/app/render/pixelformat.cpp
+++ b/app/render/pixelformat.cpp
@@ -263,8 +263,8 @@ FramePtr PixelFormat::ConvertPixelFormat(FramePtr frame, const PixelFormat::Form
   // Create a destination frame with the same parameters
   FramePtr converted = Frame::Create();
   converted->set_video_params(VideoParams(frame->video_params().width(),
-                                                   frame->video_params().height(),
-                                                   dest_format));
+                                          frame->video_params().height(),
+                                          dest_format));
   converted->set_timestamp(frame->timestamp());
   converted->allocate();
 
diff --git a/app/render/videoparams.cpp b/app/render/videoparams.cpp
index 8f59f41bd..8e20a717e 100644
--- a/app/render/videoparams.cpp
+++ b/app/render/videoparams.cpp
@@ -26,28 +26,70 @@
 
 OLIVE_NAMESPACE_ENTER
 
+const rational VideoParams::kPixelAspectSquare(1);
+const rational VideoParams::kPixelAspectNTSCStandard(8, 9);
+const rational VideoParams::kPixelAspectNTSCWidescreen(32, 27);
+const rational VideoParams::kPixelAspectPALStandard(16, 15);
+const rational VideoParams::kPixelAspectPALWidescreen(64, 45);
+const rational VideoParams::kPixelAspect1080Anamorphic(4, 3);
+
+const QVector<rational> VideoParams::kSupportedFrameRates = {
+  rational(10, 1),             // 10 FPS
+  rational(15, 1),             // 15 FPS
+  rational(24000, 1001),       // 23.976 FPS
+  rational(24, 1),             // 24 FPS
+  rational(25, 1),             // 25 FPS
+  rational(30000, 1001),       // 29.97 FPS
+  rational(30, 1),             // 30 FPS
+  rational(48000, 1001),       // 47.952 FPS
+  rational(48, 1),             // 48 FPS
+  rational(50, 1),             // 50 FPS
+  rational(60000, 1001),       // 59.94 FPS
+  rational(60, 1)              // 60 FPS
+};
+
+const QVector<int> VideoParams::kSupportedDividers = {1, 2, 3, 4, 6, 8, 12, 16};
+
+const QVector<rational> VideoParams::kStandardPixelAspects = {
+  VideoParams::kPixelAspectSquare,
+  VideoParams::kPixelAspectNTSCStandard,
+  VideoParams::kPixelAspectNTSCWidescreen,
+  VideoParams::kPixelAspectPALStandard,
+  VideoParams::kPixelAspectPALWidescreen,
+  VideoParams::kPixelAspect1080Anamorphic
+};
+
 VideoParams::VideoParams() :
-  format_(PixelFormat::PIX_FMT_INVALID)
+  width_(0),
+  height_(0),
+  format_(PixelFormat::PIX_FMT_INVALID),
+  interlacing_(Interlacing::kInterlaceNone)
 {
 }
 
-VideoParams::VideoParams(const int &width, const int &height, const PixelFormat::Format &format, const int& divider) :
+VideoParams::VideoParams(const int &width, const int &height, const PixelFormat::Format &format, const rational& pixel_aspect_ratio, const Interlacing &interlacing, const int& divider) :
   width_(width),
   height_(height),
   format_(format),
+  pixel_aspect_ratio_(pixel_aspect_ratio),
+  interlacing_(interlacing),
   divider_(divider)
 {
   calculate_effective_size();
+  validate_pixel_aspect_ratio();
 }
 
-VideoParams::VideoParams(const int &width, const int &height, const rational &time_base, const PixelFormat::Format &format, const int &divider) :
+VideoParams::VideoParams(const int &width, const int &height, const rational &time_base, const PixelFormat::Format &format, const rational& pixel_aspect_ratio, const Interlacing &interlacing, const int &divider) :
   width_(width),
   height_(height),
   time_base_(time_base),
   format_(format),
+  pixel_aspect_ratio_(pixel_aspect_ratio),
+  interlacing_(interlacing),
   divider_(divider)
 {
   calculate_effective_size();
+  validate_pixel_aspect_ratio();
 }
 
 int VideoParams::generate_auto_divider(qint64 width, qint64 height)
@@ -60,16 +102,14 @@ int VideoParams::generate_auto_divider(qint64 width, qint64 height)
   double squared_divider = double(megapixels) / double(target_res);
   double divider = qSqrt(squared_divider);
 
-  QList<int> supported_dividers = Core::SupportedDividers();
-
-  if (divider <= supported_dividers.first()) {
-    return supported_dividers.first();
-  } else if (divider >= supported_dividers.last()) {
-    return supported_dividers.last();
+  if (divider <= kSupportedDividers.first()) {
+    return kSupportedDividers.first();
+  } else if (divider >= kSupportedDividers.last()) {
+    return kSupportedDividers.last();
   } else {
-    for (int i=1; i<supported_dividers.size(); i++) {
-      int prev_divider = supported_dividers.at(i-1);
-      int next_divider = supported_dividers.at(i);
+    for (int i=1; i<kSupportedDividers.size(); i++) {
+      int prev_divider = kSupportedDividers.at(i-1);
+      int next_divider = kSupportedDividers.at(i);
 
       if (divider >= prev_divider && divider <= next_divider) {
         double prev_diff = qAbs(prev_divider - divider);
@@ -94,6 +134,7 @@ bool VideoParams::operator==(const VideoParams &rhs) const
       && height() == rhs.height()
       && time_base() == rhs.time_base()
       && format() == rhs.format()
+      && pixel_aspect_ratio() == rhs.pixel_aspect_ratio()
       && divider() == rhs.divider();
 }
 
@@ -109,12 +150,49 @@ void VideoParams::calculate_effective_size()
   effective_height_ = qCeil(height() / divider_ * 0.5) * 2;
 }
 
+void VideoParams::validate_pixel_aspect_ratio()
+{
+  if (pixel_aspect_ratio_.isNull()) {
+    pixel_aspect_ratio_ = 1;
+  }
+}
+
 bool VideoParams::is_valid() const
 {
   return (width() > 0
           && height() > 0
+          && !pixel_aspect_ratio_.isNull()
           && format_ != PixelFormat::PIX_FMT_INVALID
           && format_ != PixelFormat::PIX_FMT_COUNT);
 }
 
+QString VideoParams::FrameRateToString(const rational &frame_rate)
+{
+  return QCoreApplication::translate("VideoParams", "%1 FPS").arg(frame_rate.toDouble());
+}
+
+QStringList VideoParams::GetStandardPixelAspectRatioNames()
+{
+  QStringList strings = {
+    QCoreApplication::translate("VideoParams", "Square Pixels (%1)"),
+    QCoreApplication::translate("VideoParams", "NTSC Standard (%1)"),
+    QCoreApplication::translate("VideoParams", "NTSC Widescreen (%1)"),
+    QCoreApplication::translate("VideoParams", "PAL Standard (%1)"),
+    QCoreApplication::translate("VideoParams", "PAL Widescreen (%1)"),
+    QCoreApplication::translate("VideoParams", "HD Anamorphic 1080 (%1)")
+  };
+
+  // Format each
+  for (int i=0; i<strings.size(); i++) {
+    strings.replace(i, FormatPixelAspectRatioString(strings.at(i), kStandardPixelAspects.at(i)));
+  }
+
+  return strings;
+}
+
+QString VideoParams::FormatPixelAspectRatioString(const QString &format, const rational &ratio)
+{
+  return format.arg(QString::number(ratio.toDouble(), 'f', 4));
+}
+
 OLIVE_NAMESPACE_EXIT
diff --git a/app/render/videoparams.h b/app/render/videoparams.h
index 56534ed3c..9eb331ea0 100644
--- a/app/render/videoparams.h
+++ b/app/render/videoparams.h
@@ -29,9 +29,19 @@ OLIVE_NAMESPACE_ENTER
 
 class VideoParams {
 public:
+  enum Interlacing {
+    kInterlaceNone,
+    kInterlacedTopFirst,
+    kInterlacedBottomFirst
+  };
+
   VideoParams();
-  VideoParams(const int& width, const int& height, const PixelFormat::Format& format, const int& divider = 1);
-  VideoParams(const int& width, const int& height, const rational& time_base, const PixelFormat::Format& format, const int& divider = 1);
+  VideoParams(const int& width, const int& height, const PixelFormat::Format& format,
+              const rational& pixel_aspect_ratio = 1,
+              const Interlacing& interlacing = kInterlaceNone, const int& divider = 1);
+  VideoParams(const int& width, const int& height, const rational& time_base,
+              const PixelFormat::Format& format, const rational& pixel_aspect_ratio = 1,
+              const Interlacing& interlacing = kInterlaceNone, const int& divider = 1);
 
   const int& width() const
   {
@@ -68,6 +78,16 @@ public:
     return format_;
   }
 
+  const rational& pixel_aspect_ratio() const
+  {
+    return pixel_aspect_ratio_;
+  }
+
+  Interlacing interlacing() const
+  {
+    return interlacing_;
+  }
+
   static int generate_auto_divider(qint64 width, qint64 height);
 
   bool is_valid() const;
@@ -75,15 +95,40 @@ public:
   bool operator==(const VideoParams& rhs) const;
   bool operator!=(const VideoParams& rhs) const;
 
+  static const rational kPixelAspectSquare;
+  static const rational kPixelAspectNTSCStandard;
+  static const rational kPixelAspectNTSCWidescreen;
+  static const rational kPixelAspectPALStandard;
+  static const rational kPixelAspectPALWidescreen;
+  static const rational kPixelAspect1080Anamorphic;
+
+  static const QVector<rational> kSupportedFrameRates;
+  static const QVector<rational> kStandardPixelAspects;
+  static const QVector<int> kSupportedDividers;
+
+  /**
+   * @brief Convert rational frame rate (i.e. flipped timebase) to a user-friendly string
+   */
+  static QString FrameRateToString(const rational& frame_rate);
+
+  static QStringList GetStandardPixelAspectRatioNames();
+  static QString FormatPixelAspectRatioString(const QString& format, const rational& ratio);
+
 private:
   void calculate_effective_size();
 
+  void validate_pixel_aspect_ratio();
+
   int width_;
   int height_;
   rational time_base_;
 
   PixelFormat::Format format_;
 
+  rational pixel_aspect_ratio_;
+
+  Interlacing interlacing_;
+
   int divider_;
   int effective_width_;
   int effective_height_;
@@ -92,5 +137,6 @@ private:
 OLIVE_NAMESPACE_EXIT
 
 Q_DECLARE_METATYPE(OLIVE_NAMESPACE::VideoParams)
+Q_DECLARE_METATYPE(OLIVE_NAMESPACE::VideoParams::Interlacing)
 
 #endif // VIDEOPARAMS_H
diff --git a/app/widget/CMakeLists.txt b/app/widget/CMakeLists.txt
index 01ba47053..1a05cbe55 100644
--- a/app/widget/CMakeLists.txt
+++ b/app/widget/CMakeLists.txt
@@ -41,6 +41,7 @@ add_subdirectory(projecttoolbar)
 add_subdirectory(resizablescrollbar)
 add_subdirectory(scope)
 add_subdirectory(slider)
+add_subdirectory(standardcombos)
 add_subdirectory(taskview)
 add_subdirectory(timebased)
 add_subdirectory(timelinewidget)
diff --git a/app/widget/nodetableview/nodetabletraverser.cpp b/app/widget/nodetableview/nodetabletraverser.cpp
index 1ca0e1080..77d92afb6 100644
--- a/app/widget/nodetableview/nodetabletraverser.cpp
+++ b/app/widget/nodetableview/nodetabletraverser.cpp
@@ -29,7 +29,8 @@ QVariant NodeTableTraverser::ProcessVideoFootage(StreamPtr stream, const rationa
   return QVariant::fromValue(VideoParams(video_stream->width(),
                                          video_stream->height(),
                                          video_stream->timebase(),
-                                         video_stream->format()));
+                                         video_stream->format(),
+                                         video_stream->pixel_aspect_ratio()));
 }
 
 QVariant NodeTableTraverser::ProcessAudioFootage(StreamPtr stream, const TimeRange &input_time)
diff --git a/app/widget/standardcombos/CMakeLists.txt b/app/widget/standardcombos/CMakeLists.txt
new file mode 100644
index 000000000..cbfac1d51
--- /dev/null
+++ b/app/widget/standardcombos/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  widget/standardcombos/channellayoutcombobox.h
+  widget/standardcombos/frameratecombobox.h
+  widget/standardcombos/interlacedcombobox.h
+  widget/standardcombos/pixelaspectratiocombobox.h
+  widget/standardcombos/pixelformatcombobox.h
+  widget/standardcombos/sampleratecombobox.h
+  widget/standardcombos/standardcombos.h
+  widget/standardcombos/videodividercombobox.h
+  PARENT_SCOPE
+)
diff --git a/app/widget/standardcombos/channellayoutcombobox.h b/app/widget/standardcombos/channellayoutcombobox.h
new file mode 100644
index 000000000..7deec22e6
--- /dev/null
+++ b/app/widget/standardcombos/channellayoutcombobox.h
@@ -0,0 +1,62 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef CHANNELLAYOUTCOMBOBOX_H
+#define CHANNELLAYOUTCOMBOBOX_H
+
+#include <QComboBox>
+
+#include "render/audioparams.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class ChannelLayoutComboBox : public QComboBox
+{
+  Q_OBJECT
+public:
+  ChannelLayoutComboBox(QWidget* parent = nullptr) :
+    QComboBox(parent)
+  {
+    foreach (const uint64_t& ch_layout, AudioParams::kSupportedChannelLayouts) {
+      this->addItem(AudioParams::ChannelLayoutToString(ch_layout),
+                    QVariant::fromValue(ch_layout));
+    }
+  }
+
+  uint64_t GetChannelLayout() const
+  {
+    return this->currentData().toULongLong();
+  }
+
+  void SetChannelLayout(uint64_t ch)
+  {
+    for (int i=0; i<this->count(); i++) {
+      if (this->itemData(i).toULongLong() == ch) {
+        this->setCurrentIndex(i);
+        break;
+      }
+    }
+  }
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // CHANNELLAYOUTCOMBOBOX_H
diff --git a/app/widget/standardcombos/frameratecombobox.h b/app/widget/standardcombos/frameratecombobox.h
new file mode 100644
index 000000000..00eefe7aa
--- /dev/null
+++ b/app/widget/standardcombos/frameratecombobox.h
@@ -0,0 +1,62 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef FRAMERATECOMBOBOX_H
+#define FRAMERATECOMBOBOX_H
+
+#include <QComboBox>
+
+#include "common/rational.h"
+#include "render/videoparams.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class FrameRateComboBox : public QComboBox
+{
+  Q_OBJECT
+public:
+  FrameRateComboBox(QWidget* parent = nullptr) :
+    QComboBox(parent)
+  {
+    foreach (const rational& fr, VideoParams::kSupportedFrameRates) {
+      this->addItem(VideoParams::FrameRateToString(fr), QVariant::fromValue(fr));
+    }
+  }
+
+  rational GetFrameRate() const
+  {
+    return this->currentData().value<rational>();
+  }
+
+  void SetFrameRate(const rational& r)
+  {
+    for (int i=0; i<this->count(); i++) {
+      if (this->itemData(i).value<rational>() == r) {
+        this->setCurrentIndex(i);
+        break;
+      }
+    }
+  }
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // FRAMERATECOMBOBOX_H
diff --git a/app/widget/standardcombos/interlacedcombobox.h b/app/widget/standardcombos/interlacedcombobox.h
new file mode 100644
index 000000000..1bf54806b
--- /dev/null
+++ b/app/widget/standardcombos/interlacedcombobox.h
@@ -0,0 +1,57 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef INTERLACEDCOMBOBOX_H
+#define INTERLACEDCOMBOBOX_H
+
+#include <QComboBox>
+
+#include "render/videoparams.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class InterlacedComboBox : public QComboBox
+{
+  Q_OBJECT
+public:
+  InterlacedComboBox(QWidget* parent = nullptr) :
+    QComboBox(parent)
+  {
+    // These must match the Interlacing enum in VideoParams
+    this->addItem(tr("None (Progressive)"));
+    this->addItem(tr("Top-Field First"));
+    this->addItem(tr("Bottom-Field First"));
+  }
+
+  VideoParams::Interlacing GetInterlaceMode() const
+  {
+    return static_cast<VideoParams::Interlacing>(this->currentIndex());
+  }
+
+  void SetInterlaceMode(VideoParams::Interlacing mode)
+  {
+    this->setCurrentIndex(mode);
+  }
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // INTERLACEDCOMBOBOX_H
diff --git a/app/widget/standardcombos/pixelaspectratiocombobox.h b/app/widget/standardcombos/pixelaspectratiocombobox.h
new file mode 100644
index 000000000..a5e2d02b9
--- /dev/null
+++ b/app/widget/standardcombos/pixelaspectratiocombobox.h
@@ -0,0 +1,127 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef PIXELASPECTRATIOCOMBOBOX_H
+#define PIXELASPECTRATIOCOMBOBOX_H
+
+#include <QComboBox>
+
+#include "common/ratiodialog.h"
+#include "render/videoparams.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class PixelAspectRatioComboBox : public QComboBox
+{
+  Q_OBJECT
+public:
+  PixelAspectRatioComboBox(QWidget* parent = nullptr) :
+    QComboBox(parent),
+    dont_prompt_custom_par_(false)
+  {
+    QStringList par_names = VideoParams::GetStandardPixelAspectRatioNames();
+    for (int i=0; i<VideoParams::kStandardPixelAspects.size(); i++) {
+      const rational& ratio = VideoParams::kStandardPixelAspects.at(i);
+
+      this->addItem(par_names.at(i),
+                                   QVariant::fromValue(ratio));
+    }
+
+    // Always add custom item last, much of the logic relies on this. Set this to the current AR so
+    // that if none of the above are ==, it will eventually select this item
+    this->addItem(QString());
+    UpdateCustomItem(rational());
+
+    // Pick up index signal to query for custom aspect ratio if requested
+    connect(this, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, &PixelAspectRatioComboBox::IndexChanged);
+  }
+
+  rational GetPixelAspectRatio() const
+  {
+    return this->currentData().value<rational>();
+  }
+
+  void SetPixelAspectRatio(const rational& r)
+  {
+    // Determine which index to select on startup
+    for (int i=0; i<this->count(); i++) {
+      if (this->itemData(i).value<rational>() == r) {
+        this->setCurrentIndex(i);
+        return;
+      }
+    }
+
+    // Must not have found the ratio, so it must be custom
+    UpdateCustomItem(r);
+    dont_prompt_custom_par_ = true;
+    this->setCurrentIndex(this->count() - 1);
+    dont_prompt_custom_par_ = false;
+  }
+
+private slots:
+  void IndexChanged(int index)
+  {
+    if (dont_prompt_custom_par_) {
+      return;
+    }
+
+    // Detect if custom was selected, in which case query what the new AR should be
+    if (index == this->count() - 1) {
+      // Query for custom pixel aspect ratio
+      bool ok;
+
+      double custom_ratio = GetFloatRatioFromUser(this,
+                                                  tr("Set Custom Pixel Aspect Ratio"),
+                                                  &ok);
+
+      if (ok) {
+        UpdateCustomItem(rational::fromDouble(custom_ratio));
+      }
+    }
+  }
+
+private:
+  void UpdateCustomItem(const rational &ratio)
+  {
+    const int custom_index = this->count() - 1;
+
+    if (ratio.isNull()) {
+      this->setItemText(custom_index,
+                        tr("Custom..."));
+
+      // Use 1:1 to prevent any real chance of the PAR being set to 0
+      this->setItemData(custom_index,
+                        QVariant::fromValue(rational(1)));
+    } else {
+      this->setItemText(custom_index,
+                        VideoParams::FormatPixelAspectRatioString(tr("Custom (%1)"), ratio));
+      this->setItemData(custom_index,
+                        QVariant::fromValue(ratio));
+    }
+  }
+
+  bool dont_prompt_custom_par_;
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // PIXELASPECTRATIOCOMBOBOX_H
diff --git a/app/widget/standardcombos/pixelformatcombobox.h b/app/widget/standardcombos/pixelformatcombobox.h
new file mode 100644
index 000000000..48638a14b
--- /dev/null
+++ b/app/widget/standardcombos/pixelformatcombobox.h
@@ -0,0 +1,67 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef PIXELFORMATCOMBOBOX_H
+#define PIXELFORMATCOMBOBOX_H
+
+#include <QComboBox>
+
+#include "render/pixelformat.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class PixelFormatComboBox : public QComboBox
+{
+  Q_OBJECT
+public:
+  PixelFormatComboBox(bool alpha_only, bool float_only, QWidget* parent = nullptr) :
+    QComboBox(parent)
+  {
+    // Set up preview formats
+    for (int i=0;i<PixelFormat::PIX_FMT_COUNT;i++) {
+      PixelFormat::Format pix_fmt = static_cast<PixelFormat::Format>(i);
+
+      if ((!alpha_only || PixelFormat::FormatHasAlphaChannel(pix_fmt))
+          && (!float_only || PixelFormat::FormatIsFloat(pix_fmt))) {
+        this->addItem(PixelFormat::GetName(pix_fmt), pix_fmt);
+      }
+    }
+  }
+
+  PixelFormat::Format GetPixelFormat() const
+  {
+    return static_cast<PixelFormat::Format>(this->currentData().toInt());
+  }
+
+  void SetPixelFormat(PixelFormat::Format fmt)
+  {
+    for (int i=0; i<this->count(); i++) {
+      if (this->itemData(i).toInt() == fmt) {
+        this->setCurrentIndex(i);
+        break;
+      }
+    }
+  }
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // PIXELFORMATCOMBOBOX_H
diff --git a/app/widget/standardcombos/sampleratecombobox.h b/app/widget/standardcombos/sampleratecombobox.h
new file mode 100644
index 000000000..e7300517f
--- /dev/null
+++ b/app/widget/standardcombos/sampleratecombobox.h
@@ -0,0 +1,61 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef SAMPLERATECOMBOBOX_H
+#define SAMPLERATECOMBOBOX_H
+
+#include <QComboBox>
+
+#include "render/audioparams.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class SampleRateComboBox : public QComboBox
+{
+  Q_OBJECT
+public:
+  SampleRateComboBox(QWidget* parent = nullptr) :
+    QComboBox(parent)
+  {
+    foreach (int sr, AudioParams::kSupportedSampleRates) {
+      this->addItem(AudioParams::SampleRateToString(sr), sr);
+    }
+  }
+
+  int GetSampleRate() const
+  {
+    return this->currentData().toInt();
+  }
+
+  void SetSampleRate(int rate)
+  {
+    for (int i=0; i<this->count(); i++) {
+      if (this->itemData(i).toInt() == rate) {
+        this->setCurrentIndex(i);
+        break;
+      }
+    }
+  }
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // SAMPLERATECOMBOBOX_H
diff --git a/app/widget/standardcombos/standardcombos.h b/app/widget/standardcombos/standardcombos.h
new file mode 100644
index 000000000..e59aedab8
--- /dev/null
+++ b/app/widget/standardcombos/standardcombos.h
@@ -0,0 +1,32 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef STANDARDCOMBOS_H
+#define STANDARDCOMBOS_H
+
+#include "channellayoutcombobox.h"
+#include "frameratecombobox.h"
+#include "interlacedcombobox.h"
+#include "pixelaspectratiocombobox.h"
+#include "pixelformatcombobox.h"
+#include "sampleratecombobox.h"
+#include "videodividercombobox.h"
+
+#endif // STANDARDCOMBOS_H
diff --git a/app/widget/standardcombos/videodividercombobox.h b/app/widget/standardcombos/videodividercombobox.h
new file mode 100644
index 000000000..89b6c1b6a
--- /dev/null
+++ b/app/widget/standardcombos/videodividercombobox.h
@@ -0,0 +1,69 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef VIDEODIVIDERCOMBOBOX_H
+#define VIDEODIVIDERCOMBOBOX_H
+
+#include <QComboBox>
+
+#include "render/videoparams.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class VideoDividerComboBox : public QComboBox
+{
+  Q_OBJECT
+public:
+  VideoDividerComboBox(QWidget* parent = nullptr) :
+    QComboBox(parent)
+  {
+    foreach (int d, VideoParams::kSupportedDividers) {
+      QString name;
+
+      if (d == 1) {
+        name = tr("Full");
+      } else {
+        name = tr("1/%1").arg(d);
+      }
+
+      this->addItem(name, d);
+    }
+  }
+
+  int GetDivider() const
+  {
+    return this->currentData().toInt();
+  }
+
+  void SetDivider(int d)
+  {
+    for (int i=0; i<this->count(); i++) {
+      if (this->itemData(i).toInt() == d) {
+        this->setCurrentIndex(i);
+        break;
+      }
+    }
+  }
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // VIDEODIVIDERCOMBOBOX_H
diff --git a/app/widget/viewer/footageviewer.cpp b/app/widget/viewer/footageviewer.cpp
index 4cfab0008..c4df185ce 100644
--- a/app/widget/viewer/footageviewer.cpp
+++ b/app/widget/viewer/footageviewer.cpp
@@ -88,6 +88,8 @@ void FootageViewerWidget::SetFootage(Footage *footage)
                                                  video_stream->height(),
                                                  video_stream->frame_rate().flipped(),
                                                  static_cast<PixelFormat::Format>(Config::Current()["DefaultSequencePreviewFormat"].toInt()),
+                                                 video_stream->pixel_aspect_ratio(),
+                                                 video_stream->interlacing(),
                                                  VideoParams::generate_auto_divider(video_stream->width(), video_stream->height())));
       NodeParam::ConnectEdge(video_node_->output(), viewer_node_->texture_input());
     } else {
@@ -98,6 +100,8 @@ void FootageViewerWidget::SetFootage(Footage *footage)
                                                  height,
                                                  Config::Current()["DefaultSequenceFrameRate"].value<rational>(),
                                                  static_cast<PixelFormat::Format>(Config::Current()["DefaultSequencePreviewFormat"].toInt()),
+                                                 Config::Current()["DefaultSequencePixelAspect"].value<rational>(),
+                                                 Config::Current()["DefaultSequenceInterlacing"].value<VideoParams::Interlacing>(),
                                                  VideoParams::generate_auto_divider(width, height)));
     }
 
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 3c1cc304c..b6777049f 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -164,7 +164,8 @@ void ViewerWidget::TimeChangedEvent(const int64_t &i)
 
 void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
 {
-  connect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SizeChangedSlot);
+  connect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SetViewerResolution);
+  connect(n, &ViewerOutput::PixelAspectChanged, this, &ViewerWidget::SetViewerPixelAspect);
   connect(n, &ViewerOutput::LengthChanged, this, &ViewerWidget::LengthChangedSlot);
   connect(n, &ViewerOutput::VideoParamsChanged, this, &ViewerWidget::UpdateRendererVideoParameters);
   connect(n, &ViewerOutput::AudioParamsChanged, this, &ViewerWidget::UpdateRendererAudioParameters);
@@ -176,7 +177,8 @@ void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
 
   n->audio_playback_cache()->SetParameters(n->audio_params());
 
-  SizeChangedSlot(n->video_params().width(), n->video_params().height());
+  SetViewerResolution(n->video_params().width(), n->video_params().height());
+  SetViewerPixelAspect(n->video_params().pixel_aspect_ratio());
   last_length_ = rational();
   LengthChangedSlot(n->GetLength());
 
@@ -213,7 +215,8 @@ void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
 {
   PauseInternal();
 
-  disconnect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SizeChangedSlot);
+  disconnect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SetViewerResolution);
+  disconnect(n, &ViewerOutput::PixelAspectChanged, this, &ViewerWidget::SetViewerPixelAspect);
   disconnect(n, &ViewerOutput::LengthChanged, this, &ViewerWidget::LengthChangedSlot);
   disconnect(n, &ViewerOutput::VideoParamsChanged, this, &ViewerWidget::UpdateRendererVideoParameters);
   disconnect(n, &ViewerOutput::AudioParamsChanged, this, &ViewerWidget::UpdateRendererAudioParameters);
@@ -224,7 +227,7 @@ void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
   ruler()->SetPlaybackCache(nullptr);
 
   // Effectively disables the viewer and clears the state
-  SizeChangedSlot(0, 0);
+  SetViewerResolution(0, 0);
 
   display_widget_->DisconnectColorManager();
   foreach (ViewerWindow* window, windows_) {
@@ -280,11 +283,6 @@ void ViewerWidget::SetColorMenuEnabled(bool enabled)
   color_menu_enabled_ = enabled;
 }
 
-void ViewerWidget::SetOverrideSize(int width, int height)
-{
-  SizeChangedSlot(width, height);
-}
-
 void ViewerWidget::SetMatrix(const QMatrix4x4 &mat)
 {
   display_widget_->SetMatrix(mat);
@@ -1061,7 +1059,7 @@ void ViewerWidget::PlaybackTimerUpdate()
   }
 }
 
-void ViewerWidget::SizeChangedSlot(int width, int height)
+void ViewerWidget::SetViewerResolution(int width, int height)
 {
   sizer_->SetChildSize(width, height);
 
@@ -1070,6 +1068,13 @@ void ViewerWidget::SizeChangedSlot(int width, int height)
   }
 }
 
+void ViewerWidget::SetViewerPixelAspect(const rational &ratio)
+{
+  sizer_->SetPixelAspectRatio(ratio);
+
+  // FIXME: Update windows too
+}
+
 void ViewerWidget::LengthChangedSlot(const rational &length)
 {
   if (last_length_ != length) {
diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h
index 6e171e6e3..419aa8c65 100644
--- a/app/widget/viewer/viewer.h
+++ b/app/widget/viewer/viewer.h
@@ -73,8 +73,6 @@ public:
    */
   void SetColorMenuEnabled(bool enabled);
 
-  void SetOverrideSize(int width, int height);
-
   void SetMatrix(const QMatrix4x4& mat);
 
   /**
@@ -124,6 +122,10 @@ public slots:
 
   void CacheSequenceInOut();
 
+  void SetViewerResolution(int width, int height);
+
+  void SetViewerPixelAspect(const rational& ratio);
+
 signals:
   /**
    * @brief Wrapper for ViewerGLWidget::CursorColor()
@@ -257,8 +259,6 @@ private:
 private slots:
   void PlaybackTimerUpdate();
 
-  void SizeChangedSlot(int width, int height);
-
   void LengthChangedSlot(const rational& length);
 
   void UpdateRendererVideoParameters();
diff --git a/app/widget/viewer/viewersizer.cpp b/app/widget/viewer/viewersizer.cpp
index 8f492d488..75f85fd85 100644
--- a/app/widget/viewer/viewersizer.cpp
+++ b/app/widget/viewer/viewersizer.cpp
@@ -27,7 +27,9 @@ OLIVE_NAMESPACE_ENTER
 ViewerSizer::ViewerSizer(QWidget *parent) :
   QWidget(parent),
   widget_(nullptr),
-  aspect_ratio_(0),
+  width_(0),
+  height_(0),
+  pixel_aspect_(1),
   zoom_(0)
 {
 }
@@ -51,11 +53,12 @@ void ViewerSizer::SetChildSize(int width, int height)
   width_ = width;
   height_ = height;
 
-  if (!width_ || !height_) {
-    aspect_ratio_ = 0;
-  } else {
-    aspect_ratio_ = static_cast<double>(width_) / static_cast<double>(height_);
-  }
+  UpdateSize();
+}
+
+void ViewerSizer::SetPixelAspectRatio(const rational &pixel_aspect)
+{
+  pixel_aspect_ = pixel_aspect;
 
   UpdateSize();
 }
@@ -81,7 +84,7 @@ void ViewerSizer::UpdateSize()
   }
 
   // If the aspect ratio is 0, the widget is always hidden
-  if (qIsNull(aspect_ratio_)) {
+  if (!width_ || !height_) {
     widget_->setVisible(false);
     return;
   }
@@ -91,6 +94,8 @@ void ViewerSizer::UpdateSize()
   QSize child_size;
   QMatrix4x4 child_matrix;
 
+  double sequence_aspect_ratio = static_cast<double>(width_) / static_cast<double>(height_) * pixel_aspect_.toDouble();
+
   if (zoom_ <= 0) {
 
     // If zoom is 0, we auto-fit
@@ -98,12 +103,12 @@ void ViewerSizer::UpdateSize()
 
     child_size = size();
 
-    if (our_aspect_ratio > aspect_ratio_) {
+    if (our_aspect_ratio > sequence_aspect_ratio) {
       // This container is wider than the image, scale by height
-      child_size = QSize(qRound(child_size.height() * aspect_ratio_), height());
+      child_size = QSize(qRound(child_size.height() * sequence_aspect_ratio), height());
     } else {
       // This container is taller than the image, scale by width
-      child_size = QSize(width(), qRound(child_size.width() / aspect_ratio_));
+      child_size = QSize(width(), qRound(child_size.width() / sequence_aspect_ratio));
     }
 
   } else {
diff --git a/app/widget/viewer/viewersizer.h b/app/widget/viewer/viewersizer.h
index 2363f28cf..a6dbfc34f 100644
--- a/app/widget/viewer/viewersizer.h
+++ b/app/widget/viewer/viewersizer.h
@@ -24,6 +24,7 @@
 #include <QWidget>
 
 #include "common/define.h"
+#include "common/rational.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -56,6 +57,11 @@ public:
    */
   void SetChildSize(int width, int height);
 
+  /**
+   * @brief Set pixel aspect ratio
+   */
+  void SetPixelAspectRatio(const rational& pixel_aspect);
+
   /**
    * @brief Set the zoom value of the child widget
    *
@@ -91,10 +97,7 @@ private:
   int width_;
   int height_;
 
-  /**
-   * @brief Aspect ratio calculated from the size provided by SetChildSize()
-   */
-  double aspect_ratio_;
+  rational pixel_aspect_;
 
   /**
    * @brief Internal zoom value

From 4e3cafe5782edc23e8e9eec3e848d5d90ed61b5a Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 02:08:58 +1000
Subject: [PATCH 111/138] precachetask: removed unnecessary hash setting

Pre-cache doesn't need to set a memory cache since its only purpose is to
write to the disk cache.
---
 app/task/precache/precachetask.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/task/precache/precachetask.cpp b/app/task/precache/precachetask.cpp
index c8baf5bd3..4829affb1 100644
--- a/app/task/precache/precachetask.cpp
+++ b/app/task/precache/precachetask.cpp
@@ -80,9 +80,12 @@ QFuture<void> PreCacheTask::DownloadFrame(FramePtr frame, const QByteArray &hash
 
 void PreCacheTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times, qint64 job_time)
 {
-  foreach (const rational& t, times) {
-    viewer()->video_frame_cache()->SetHash(t, hash, job_time, true);
-  }
+  // Do nothing. Pre-cache essentially just creates more frames in the cache, it doesn't need to do
+  // anything else.
+
+  Q_UNUSED(hash)
+  Q_UNUSED(times)
+  Q_UNUSED(job_time)
 }
 
 void PreCacheTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples, qint64 job_time)

From e21b68be534cf284c81a8e8f6994917c8a429cef Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 02:09:24 +1000
Subject: [PATCH 112/138] renderer: queue hash setting from another thread

Fixes race condition that caused many segfaults.
---
 app/render/backend/renderbackend.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index 1de50ab2c..bcca87a21 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -524,7 +524,11 @@ void RenderBackend::SetHashes(FrameHashCache* cache, const QVector<rational>& ti
       }
     }
 
-    cache->SetHash(time, hash, job_time, hash_exists);
+    QMetaObject::invokeMethod(cache, "SetHash", Qt::QueuedConnection,
+                              OLIVE_NS_ARG(rational, time),
+                              Q_ARG(QByteArray, hash),
+                              Q_ARG(qint64, job_time),
+                              Q_ARG(bool, hash_exists));
   }
 }
 

From 4f1e7ea4ef2950642f114ffaddbbd62ee11e0038 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 02:54:03 +1000
Subject: [PATCH 113/138] oiio: fixed incorrect version namespace

---
 app/codec/oiio/oiiodecoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp
index 6a5e9f0c8..11e73ce03 100644
--- a/app/codec/oiio/oiiodecoder.cpp
+++ b/app/codec/oiio/oiiodecoder.cpp
@@ -294,7 +294,7 @@ PixelFormat::Format OIIODecoder::GetFormatFromOIIOBasetype(const OIIO::ImageSpec
   }
 }
 
-rational OIIODecoder::GetPixelAspectRatioFromOIIO(const OpenImageIO_v2_1::ImageSpec &spec)
+rational OIIODecoder::GetPixelAspectRatioFromOIIO(const OIIO::ImageSpec &spec)
 {
   return rational::fromDouble(spec.extra_attribs.get_float("PixelAspectRatio", 1));
 }

From ea7289805a35a08a32cf17f4659516487531563a Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 14:04:30 +1000
Subject: [PATCH 114/138] timeline: re-enable length changed signal

Fixes issue where length wouldn't update sometimes.
---
 app/node/output/viewer/viewer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp
index 93280bf65..c682fb8a6 100644
--- a/app/node/output/viewer/viewer.cpp
+++ b/app/node/output/viewer/viewer.cpp
@@ -50,7 +50,7 @@ ViewerOutput::ViewerOutput() :
     TrackList* list = new TrackList(this, static_cast<Timeline::TrackType>(i), track_input);
     track_lists_.replace(i, list);
     connect(list, &TrackList::TrackListChanged, this, &ViewerOutput::UpdateTrackCache);
-    //connect(list, &TrackList::LengthChanged, this, &ViewerOutput::VerifyLength);
+    connect(list, &TrackList::LengthChanged, this, &ViewerOutput::VerifyLength);
     connect(list, &TrackList::BlockAdded, this, &ViewerOutput::TrackListAddedBlock);
     connect(list, &TrackList::BlockRemoved, this, &ViewerOutput::BlockRemoved);
     connect(list, &TrackList::TrackAdded, this, &ViewerOutput::TrackListAddedTrack);

From 70085588d68c8445df900a33b50b50e01c6acf32 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 17:12:39 +1000
Subject: [PATCH 115/138] audiomonitor: fixed bug where audio was shown at
 normal speed even if playing faster

---
 app/widget/audiomonitor/audiomonitor.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/widget/audiomonitor/audiomonitor.cpp b/app/widget/audiomonitor/audiomonitor.cpp
index 86b53a8df..a4cbd853d 100644
--- a/app/widget/audiomonitor/audiomonitor.cpp
+++ b/app/widget/audiomonitor/audiomonitor.cpp
@@ -275,23 +275,33 @@ void AudioMonitor::UpdateValuesFromFile(QVector<double>& v)
   // Determines how many milliseconds have passed since last update
   qint64 current_time = QDateTime::currentMSecsSinceEpoch();
   qint64 time_passed = current_time - last_time_;
+  int abs_speed = qAbs(playback_speed_);
+
+  // Multiply by speed if the speed is not 1
+  if (abs_speed != 1) {
+    time_passed *= abs_speed;
+  }
 
   // Convert ms to float seconds and determine how many bytes that is
   qint64 bytes_to_read = params_.time_to_bytes(static_cast<double>(time_passed) * 0.001);
 
   if (playback_speed_ < 0) {
+    // If reversing, jump back by the amount of bytes we're going to read
     bytes_to_read = qMin(bytes_to_read, file_.pos());
 
     file_.seek(file_.pos() - bytes_to_read);
   }
 
+  // Read bytes in from file
   QByteArray b = file_.read(bytes_to_read);
 
   if (playback_speed_ < 0) {
+    // If reversing, head back to where we were before the read so that the next read starts
+    // from where we left off
     file_.seek(file_.pos() - bytes_to_read);
   }
 
-  int abs_speed = qAbs(playback_speed_);
+  // If speed is not 1, transform it here
   if (abs_speed != 1) {
     int sample_sz = params_.samples_to_bytes(1);
     int in_nb_samples = params_.bytes_to_samples(b.size());
@@ -299,8 +309,8 @@ void AudioMonitor::UpdateValuesFromFile(QVector<double>& v)
     QByteArray speed_adjusted(out_nb_samples * sample_sz, Qt::Uninitialized);
 
     for (int i=0;i<out_nb_samples;i++) {
-      memcpy(speed_adjusted.data() + params_.samples_to_bytes(i),
-             b.constData() + params_.samples_to_bytes(i * abs_speed),
+      memcpy(speed_adjusted.data() + i * sample_sz,
+             b.constData() + i * abs_speed * sample_sz,
              sample_sz);
     }
 

From 5723690a2114df0f218553975f3809569024509f Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 17:27:32 +1000
Subject: [PATCH 116/138] playbackcontrols: set play button policy to
 QPushButton default

Minor cosmetic improvement.
---
 app/widget/playbackcontrols/playbackcontrols.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/widget/playbackcontrols/playbackcontrols.cpp b/app/widget/playbackcontrols/playbackcontrols.cpp
index 4f1fdb64a..8a397786a 100644
--- a/app/widget/playbackcontrols/playbackcontrols.cpp
+++ b/app/widget/playbackcontrols/playbackcontrols.cpp
@@ -97,7 +97,10 @@ PlaybackControls::PlaybackControls(QWidget *parent) :
 
   // Default to showing play button
   playpause_stack_->setCurrentWidget(play_btn_);
-  playpause_stack_->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding);
+
+  // Hack to conform the play/pause button size to the other buttons (QStackedWidget has a
+  // different size policy by default)
+  playpause_stack_->setSizePolicy(prev_frame_btn_->sizePolicy());
 
   // Next Frame Button
   next_frame_btn_ = new QPushButton();

From ac649c86c58a1174a0b4fb02649d814f4b4e745e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 18:30:35 +1000
Subject: [PATCH 117/138] datatype: convert kInt type as a int64_t (which
 QVariant can't do automatically)

---
 app/node/input.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/node/input.cpp b/app/node/input.cpp
index 890cb57e5..ecc4906d8 100644
--- a/app/node/input.cpp
+++ b/app/node/input.cpp
@@ -366,6 +366,8 @@ QString NodeInput::ValueToString(const DataType& data_type, const QVariant &valu
              || data_type == kBuffer) {
     // These data types need no XML representation
     return QString();
+  } else if (data_type == kInt) {
+    return QString::number(value.value<int64_t>());
   } else {
     if (value.canConvert<QString>()) {
       return value.toString();
@@ -397,6 +399,8 @@ QVariant NodeInput::StringToValue(const DataType& data_type, const QString &stri
     QStringList vals = string.split(':');
 
     return QVariant::fromValue(Color(vals.at(0).toFloat(), vals.at(1).toFloat(), vals.at(2).toFloat(), vals.at(3).toFloat()));
+  } else if (data_type == kInt) {
+    return QVariant::fromValue(string.toLongLong());
   } else if (data_type == kRational) {
     return QVariant::fromValue(rational::fromString(string));
   } else {

From 192ea45a2423a0f254444f655a35a11eb2eb2f97 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 18:33:29 +1000
Subject: [PATCH 118/138] sequencedialog: use lower field dominance in standard
 definition presets

---
 app/dialog/sequence/sequencedialogpresettab.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/dialog/sequence/sequencedialogpresettab.cpp b/app/dialog/sequence/sequencedialogpresettab.cpp
index 44a2af0f9..18c9419db 100644
--- a/app/dialog/sequence/sequencedialogpresettab.cpp
+++ b/app/dialog/sequence/sequencedialogpresettab.cpp
@@ -163,7 +163,7 @@ QTreeWidgetItem *SequenceDialogPresetTab::CreateSDPresetFolder(const QString &na
                                                  height,
                                                  frame_rate,
                                                  standard_par,
-                                                 VideoParams::kInterlacedTopFirst,
+                                                 VideoParams::kInterlacedBottomFirst,
                                                  48000,
                                                  AV_CH_LAYOUT_STEREO,
                                                  divider,
@@ -173,7 +173,7 @@ QTreeWidgetItem *SequenceDialogPresetTab::CreateSDPresetFolder(const QString &na
                                                  height,
                                                  frame_rate,
                                                  wide_par,
-                                                 VideoParams::kInterlacedTopFirst,
+                                                 VideoParams::kInterlacedBottomFirst,
                                                  48000,
                                                  AV_CH_LAYOUT_STEREO,
                                                  divider,

From 03e33227b30e7a0a15ec28226832a439e47f51f2 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 20:30:11 +1000
Subject: [PATCH 119/138] cache: moved disk settings to a separate dialog

This way the cache settings can be accessed in both ProjectProperties and
Preferences.
---
 app/dialog/CMakeLists.txt                     |   1 +
 app/dialog/diskcache/CMakeLists.txt           |  22 ++++
 app/dialog/diskcache/diskcachedialog.cpp      | 107 ++++++++++++++++++
 app/dialog/diskcache/diskcachedialog.h        |  58 ++++++++++
 .../preferences/tabs/preferencesdisktab.cpp   |  51 +--------
 .../preferences/tabs/preferencesdisktab.h     |   9 --
 .../projectproperties/projectproperties.cpp   |  14 +++
 app/render/diskmanager.cpp                    |  20 ++++
 app/render/diskmanager.h                      |   3 +
 9 files changed, 230 insertions(+), 55 deletions(-)
 create mode 100644 app/dialog/diskcache/CMakeLists.txt
 create mode 100644 app/dialog/diskcache/diskcachedialog.cpp
 create mode 100644 app/dialog/diskcache/diskcachedialog.h

diff --git a/app/dialog/CMakeLists.txt b/app/dialog/CMakeLists.txt
index 1eed0ae0a..442f760e0 100644
--- a/app/dialog/CMakeLists.txt
+++ b/app/dialog/CMakeLists.txt
@@ -17,6 +17,7 @@
 add_subdirectory(about)
 add_subdirectory(actionsearch)
 add_subdirectory(color)
+add_subdirectory(diskcache)
 add_subdirectory(export)
 add_subdirectory(footageproperties)
 add_subdirectory(keyframeproperties)
diff --git a/app/dialog/diskcache/CMakeLists.txt b/app/dialog/diskcache/CMakeLists.txt
new file mode 100644
index 000000000..6ca59d549
--- /dev/null
+++ b/app/dialog/diskcache/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  dialog/diskcache/diskcachedialog.h
+  dialog/diskcache/diskcachedialog.cpp
+  PARENT_SCOPE
+)
diff --git a/app/dialog/diskcache/diskcachedialog.cpp b/app/dialog/diskcache/diskcachedialog.cpp
new file mode 100644
index 000000000..6e542b7c3
--- /dev/null
+++ b/app/dialog/diskcache/diskcachedialog.cpp
@@ -0,0 +1,107 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "diskcachedialog.h"
+
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QMessageBox>
+
+#include "config/config.h"
+
+OLIVE_NAMESPACE_ENTER
+
+DiskCacheDialog::DiskCacheDialog(DiskCacheFolder *folder, QWidget* parent) :
+  QDialog(parent),
+  folder_(folder)
+{
+  QGridLayout* layout = new QGridLayout(this);
+
+  int row = 0;
+
+  layout->addWidget(new QLabel(tr("Disk Cache: %1").arg(folder->GetPath())), row, 0, 1, 2);
+  setWindowTitle(tr("Disk Cache Settings"));
+
+  row++;
+
+  layout->addWidget(new QLabel(tr("Maximum Disk Cache:")), row, 0);
+
+  maximum_cache_slider_ = new FloatSlider();
+  maximum_cache_slider_->SetFormat(tr("%1 GB"));
+  maximum_cache_slider_->SetMinimum(1.0);
+  maximum_cache_slider_->SetValue(static_cast<double>(folder->GetLimit()) / static_cast<double>(kBytesInGigabyte));
+  layout->addWidget(maximum_cache_slider_, row, 1);
+
+  row++;
+
+  clear_cache_btn_ = new QPushButton(tr("Clear Disk Cache"));
+  connect(clear_cache_btn_, &QPushButton::clicked, this, &DiskCacheDialog::ClearDiskCache);
+  layout->addWidget(clear_cache_btn_, row, 1);
+
+  row++;
+
+  clear_disk_cache_ = new QCheckBox(tr("Automatically clear disk cache on close"));
+  clear_disk_cache_->setChecked(folder->GetClearOnClose());
+  layout->addWidget(clear_disk_cache_, row, 1);
+
+  row++;
+
+  QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+  connect(buttons, &QDialogButtonBox::accepted, this, &DiskCacheDialog::accept);
+  connect(buttons, &QDialogButtonBox::rejected, this, &DiskCacheDialog::reject);
+  layout->addWidget(buttons, row, 0, 1, 2);
+}
+
+void DiskCacheDialog::accept()
+{
+  qint64 new_disk_cache_limit = qRound64(maximum_cache_slider_->GetValue() * kBytesInGigabyte);
+  if (new_disk_cache_limit != folder_->GetLimit()) {
+    folder_->SetLimit(new_disk_cache_limit);
+  }
+
+  if (folder_->GetClearOnClose() != clear_disk_cache_->isChecked()) {
+    folder_->SetClearOnClose(clear_disk_cache_->isChecked());
+  }
+
+  QDialog::accept();
+}
+
+void DiskCacheDialog::ClearDiskCache()
+{
+  if (QMessageBox::question(this,
+                            tr("Clear Disk Cache"),
+                            tr("Are you sure you want to clear the disk cache in '%1'?").arg(Config::Current()["DiskCachePath"].toString()),
+                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    clear_cache_btn_->setEnabled(false);
+
+    if (DiskManager::instance()->ClearDiskCache(folder_->GetPath())) {
+      clear_cache_btn_->setText(tr("Disk Cache Cleared"));
+    } else {
+      QMessageBox::information(this,
+                               tr("Clear Disk Cache"),
+                               tr("Disk cache failed to fully clear. You may have to delete the cache files manually."),
+                               QMessageBox::Ok);
+      clear_cache_btn_->setText(tr("Disk Cache Partially Cleared"));
+    }
+  }
+}
+
+OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/diskcache/diskcachedialog.h b/app/dialog/diskcache/diskcachedialog.h
new file mode 100644
index 000000000..69c3a20f3
--- /dev/null
+++ b/app/dialog/diskcache/diskcachedialog.h
@@ -0,0 +1,58 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef DISKCACHEDIALOG_H
+#define DISKCACHEDIALOG_H
+
+#include <QCheckBox>
+#include <QDialog>
+#include <QPushButton>
+
+#include "render/diskmanager.h"
+#include "widget/slider/floatslider.h"
+
+OLIVE_NAMESPACE_ENTER
+
+class DiskCacheDialog : public QDialog
+{
+  Q_OBJECT
+public:
+  DiskCacheDialog(DiskCacheFolder* folder, QWidget* parent = nullptr);
+
+public slots:
+  virtual void accept() override;
+
+private:
+  DiskCacheFolder* folder_;
+
+  FloatSlider* maximum_cache_slider_;
+
+  QCheckBox* clear_disk_cache_;
+
+  QPushButton* clear_cache_btn_;
+
+private slots:
+  void ClearDiskCache();
+
+};
+
+OLIVE_NAMESPACE_EXIT
+
+#endif // DISKCACHEDIALOG_H
diff --git a/app/dialog/preferences/tabs/preferencesdisktab.cpp b/app/dialog/preferences/tabs/preferencesdisktab.cpp
index ea167d0c9..fef948409 100644
--- a/app/dialog/preferences/tabs/preferencesdisktab.cpp
+++ b/app/dialog/preferences/tabs/preferencesdisktab.cpp
@@ -52,26 +52,14 @@ PreferencesDiskTab::PreferencesDiskTab()
 
   row++;
 
-  disk_management_layout->addWidget(new QLabel(tr("Maximum Disk Cache:")), row, 0);
-
-  maximum_cache_slider_ = new FloatSlider();
-  maximum_cache_slider_->SetFormat(tr("%1 GB"));
-  maximum_cache_slider_->SetMinimum(1.0);
-  maximum_cache_slider_->SetValue(static_cast<double>(default_disk_cache_folder_->GetLimit()) / static_cast<double>(kBytesInGigabyte));
-  disk_management_layout->addWidget(maximum_cache_slider_, row, 1);
+  QPushButton* disk_cache_settings_btn = new QPushButton(tr("Disk Cache Settings"));
+  connect(disk_cache_settings_btn, &QPushButton::clicked, this, [this](){
+    DiskManager::instance()->ShowDiskCacheSettingsDialog(disk_cache_location_->text(), this);
+  });
+  disk_management_layout->addWidget(disk_cache_settings_btn, row, 1);
 
   row++;
 
-  clear_cache_btn_ = new QPushButton(tr("Clear Disk Cache"));
-  connect(clear_cache_btn_, &QPushButton::clicked, this, &PreferencesDiskTab::ClearDiskCache);
-  disk_management_layout->addWidget(clear_cache_btn_, row, 1);
-
-  row++;
-
-  clear_disk_cache_ = new QCheckBox(tr("Automatically clear disk cache on close"));
-  clear_disk_cache_->setChecked(default_disk_cache_folder_->GetClearOnClose());
-  disk_management_layout->addWidget(clear_disk_cache_, row, 1);
-
   QGroupBox* cache_behavior = new QGroupBox(tr("Cache Behavior"));
   outer_layout->addWidget(cache_behavior);
   QGridLayout* cache_behavior_layout = new QGridLayout(cache_behavior);
@@ -125,37 +113,8 @@ void PreferencesDiskTab::Accept()
     default_disk_cache_folder_->SetPath(disk_cache_location_->text());
   }
 
-  qint64 new_disk_cache_limit = qRound64(maximum_cache_slider_->GetValue() * kBytesInGigabyte);
-  if (new_disk_cache_limit != default_disk_cache_folder_->GetLimit()) {
-    default_disk_cache_folder_->SetLimit(new_disk_cache_limit);
-  }
-
-  if (default_disk_cache_folder_->GetClearOnClose() != clear_disk_cache_->isChecked()) {
-    default_disk_cache_folder_->SetClearOnClose(clear_disk_cache_->isChecked());
-  }
-
   Config::Current()["DiskCacheBehind"] = QVariant::fromValue(rational::fromDouble(cache_behind_slider_->GetValue()));
   Config::Current()["DiskCacheAhead"] = QVariant::fromValue(rational::fromDouble(cache_ahead_slider_->GetValue()));
 }
 
-void PreferencesDiskTab::ClearDiskCache()
-{
-  if (QMessageBox::question(this,
-                            tr("Clear Disk Cache"),
-                            tr("Are you sure you want to clear the disk cache in '%1'?").arg(Config::Current()["DiskCachePath"].toString()),
-                            QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
-    clear_cache_btn_->setEnabled(false);
-
-    if (DiskManager::instance()->ClearDiskCache(default_disk_cache_folder_->GetPath())) {
-      clear_cache_btn_->setText(tr("Disk Cache Cleared"));
-    } else {
-      QMessageBox::information(this,
-                               tr("Clear Disk Cache"),
-                               tr("Disk cache failed to fully clear. You may have to delete the cache files manually."),
-                               QMessageBox::Ok);
-      clear_cache_btn_->setText(tr("Disk Cache Partially Cleared"));
-    }
-  }
-}
-
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/preferences/tabs/preferencesdisktab.h b/app/dialog/preferences/tabs/preferencesdisktab.h
index c087abca6..5eb7438b7 100644
--- a/app/dialog/preferences/tabs/preferencesdisktab.h
+++ b/app/dialog/preferences/tabs/preferencesdisktab.h
@@ -45,21 +45,12 @@ public:
 private:
   PathWidget* disk_cache_location_;
 
-  FloatSlider* maximum_cache_slider_;
-
   FloatSlider* cache_ahead_slider_;
 
   FloatSlider* cache_behind_slider_;
 
-  QCheckBox* clear_disk_cache_;
-
-  QPushButton* clear_cache_btn_;
-
   DiskCacheFolder* default_disk_cache_folder_;
 
-private slots:
-  void ClearDiskCache();
-
 };
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/projectproperties/projectproperties.cpp b/app/dialog/projectproperties/projectproperties.cpp
index abddcc295..5a8713f5c 100644
--- a/app/dialog/projectproperties/projectproperties.cpp
+++ b/app/dialog/projectproperties/projectproperties.cpp
@@ -124,6 +124,19 @@ ProjectPropertiesDialog::ProjectPropertiesDialog(Project* p, QWidget *parent) :
 
     cache_layout->addWidget(cache_path_);
 
+    QPushButton* disk_cache_settings_btn = new QPushButton(tr("Disk Cache Settings"));
+    connect(disk_cache_settings_btn, &QPushButton::clicked, this, [this](){
+      if (disk_cache_use_default_btn_->isChecked()) {
+        DiskManager::instance()->ShowDiskCacheSettingsDialog(DiskManager::instance()->GetDefaultCacheFolder(), this);
+      } else if (disk_cache_store_alongside_project_btn_->isChecked()) {
+        // FIXME:
+        QMessageBox::information(this, QString(), tr("\"Store alignside project\" functionality not implemented yet"));
+      } else {
+        DiskManager::instance()->ShowDiskCacheSettingsDialog(cache_path_->text(), this);
+      }
+    });
+    cache_layout->addWidget(disk_cache_settings_btn);
+
     tabs->addTab(cache_group, tr("Disk Cache"));
   }
 
@@ -152,6 +165,7 @@ void ProjectPropertiesDialog::accept()
   if (disk_cache_use_default_btn_->isChecked()) {
     // Keep new cache path empty, which means default
   } else if (disk_cache_store_alongside_project_btn_->isChecked()) {
+    // FIXME:
     QMessageBox::information(this, QString(), tr("\"Store alignside project\" functionality not implemented yet"));
     return;
   } else {
diff --git a/app/render/diskmanager.cpp b/app/render/diskmanager.cpp
index d8883ca89..2cdbf2024 100644
--- a/app/render/diskmanager.cpp
+++ b/app/render/diskmanager.cpp
@@ -31,6 +31,7 @@
 #include "common/filefunctions.h"
 #include "config/config.h"
 #include "core.h"
+#include "dialog/diskcache/diskcachedialog.h"
 
 OLIVE_NAMESPACE_ENTER
 
@@ -165,6 +166,25 @@ QString DiskManager::GetDefaultDiskCachePath()
   return QDir(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation)).filePath("mediacache");
 }
 
+void DiskManager::ShowDiskCacheSettingsDialog(DiskCacheFolder *folder, QWidget *parent)
+{
+  DiskCacheDialog d(folder, parent);
+  d.exec();
+}
+
+void DiskManager::ShowDiskCacheSettingsDialog(const QString &path, QWidget *parent)
+{
+  if (!FileFunctions::DirectoryIsValid(path, true)) {
+    QMessageBox::critical(parent, tr("Disk Cache Error"),
+                          tr("Failed to open disk cache at \"%1\". Try a different folder.").arg(path));
+    return;
+  }
+
+  DiskCacheFolder* folder = GetOpenFolder(path);
+
+  ShowDiskCacheSettingsDialog(folder, parent);
+}
+
 DiskCacheFolder::DiskCacheFolder(const QString &path, QObject *parent) :
   QObject(parent)
 {
diff --git a/app/render/diskmanager.h b/app/render/diskmanager.h
index 6c46082c8..71ff30bac 100644
--- a/app/render/diskmanager.h
+++ b/app/render/diskmanager.h
@@ -135,6 +135,9 @@ public:
 
   static QString GetDefaultDiskCachePath();
 
+  void ShowDiskCacheSettingsDialog(DiskCacheFolder* folder, QWidget* parent);
+  void ShowDiskCacheSettingsDialog(const QString& path, QWidget* parent);
+
 public slots:
   void Accessed(const QString& cache_folder, const QByteArray& hash);
 

From 08d4c7b385dc85f739436336da2bbb0680c3bd5a Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 21:37:04 +1000
Subject: [PATCH 120/138] config: save style

---
 app/config/config.cpp                         |  2 +
 app/core.cpp                                  |  3 +-
 .../tabs/preferencesappearancetab.cpp         | 18 ++---
 .../tabs/preferencesappearancetab.h           |  9 +--
 app/ui/style/style.cpp                        | 67 ++++++-------------
 app/ui/style/style.h                          | 29 +++-----
 6 files changed, 43 insertions(+), 85 deletions(-)

diff --git a/app/config/config.cpp b/app/config/config.cpp
index 24bce9245..dce3449e2 100644
--- a/app/config/config.cpp
+++ b/app/config/config.cpp
@@ -31,6 +31,7 @@
 #include "common/filefunctions.h"
 #include "common/xmlutils.h"
 #include "core.h"
+#include "ui/style/style.h"
 #include "window/mainwindow/mainwindow.h"
 
 OLIVE_NAMESPACE_ENTER
@@ -60,6 +61,7 @@ Config &Config::Current()
 void Config::SetDefaults()
 {
   config_map_.clear();
+  SetEntryInternal(QStringLiteral("Style"), NodeParam::kString, StyleManager::kDefaultStyle);
   SetEntryInternal(QStringLiteral("TimecodeDisplay"), NodeParam::kInt, Timecode::kTimecodeDropFrame);
   SetEntryInternal(QStringLiteral("DefaultStillLength"), NodeParam::kRational, QVariant::fromValue(rational(2)));
   SetEntryInternal(QStringLiteral("HoverFocus"), NodeParam::kBoolean, false);
diff --git a/app/core.cpp b/app/core.cpp
index 1a5d14fbc..945bd3f2b 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -669,8 +669,7 @@ void Core::OpenStartupProject()
 void Core::StartGUI(bool full_screen)
 {
   // Set UI style
-  qApp->setStyle(QStyleFactory::create("Fusion"));
-  StyleManager::SetStyle(StyleManager::DefaultStyle());
+  StyleManager::Init();
 
   // Set up shared menus
   MenuShared::CreateInstance();
diff --git a/app/dialog/preferences/tabs/preferencesappearancetab.cpp b/app/dialog/preferences/tabs/preferencesappearancetab.cpp
index 4078c1f0f..1326edcd3 100644
--- a/app/dialog/preferences/tabs/preferencesappearancetab.cpp
+++ b/app/dialog/preferences/tabs/preferencesappearancetab.cpp
@@ -44,19 +44,19 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
   // Appearance -> Theme
   appearance_layout->addWidget(new QLabel(tr("Theme")), row, 0);
 
-  style_ = new QComboBox();
+  style_combobox_ = new QComboBox();
 
-  style_list_ = StyleManager::ListInternal();
+  const QMap<QString, QString>& themes = StyleManager::available_themes();
+  QMap<QString, QString>::const_iterator i;
+  for (i=themes.cbegin(); i!=themes.cend(); i++) {
+    style_combobox_->addItem(i.value(), i.key());
 
-  foreach (const StyleDescriptor& s, style_list_) {
-    style_->addItem(s.name(), s.path());
-
-    if (s.path() == StyleManager::GetStyle()) {
-      style_->setCurrentIndex(style_->count()-1);
+    if (StyleManager::GetStyle() == i.key()) {
+      style_combobox_->setCurrentIndex(style_combobox_->count()-1);
     }
   }
 
-  appearance_layout->addWidget(style_, row, 1);
+  appearance_layout->addWidget(style_combobox_, row, 1);
 
   row++;
 
@@ -89,7 +89,7 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
 
 void PreferencesAppearanceTab::Accept()
 {
-  QString style_path = style_->currentData().toString();
+  QString style_path = style_combobox_->currentData().toString();
 
   if (style_path != StyleManager::GetStyle()) {
     StyleManager::SetStyle(style_path);
diff --git a/app/dialog/preferences/tabs/preferencesappearancetab.h b/app/dialog/preferences/tabs/preferencesappearancetab.h
index 1ab267eb5..35dc1ffac 100644
--- a/app/dialog/preferences/tabs/preferencesappearancetab.h
+++ b/app/dialog/preferences/tabs/preferencesappearancetab.h
@@ -49,14 +49,7 @@ private:
   /**
    * @brief UI widget for selecting the current UI style
    */
-  QComboBox* style_;
-
-  /**
-   * @brief List of internal styles
-   */
-  QList<StyleDescriptor> style_list_;
-
-  QString custom_style_path_;
+  QComboBox* style_combobox_;
 
   QList<QColor> colors_;
 
diff --git a/app/ui/style/style.cpp b/app/ui/style/style.cpp
index 06753432e..9de184cb1 100644
--- a/app/ui/style/style.cpp
+++ b/app/ui/style/style.cpp
@@ -33,17 +33,9 @@
 
 OLIVE_NAMESPACE_ENTER
 
+const char* StyleManager::kDefaultStyle = "olive-dark";
 QString StyleManager::current_style_;
-
-QList<StyleDescriptor> StyleManager::ListInternal()
-{
-  QList<StyleDescriptor> style_list;
-
-  style_list.append(StyleDescriptor(tr("Olive Dark"), ":/style/olive-dark"));
-  style_list.append(StyleDescriptor(tr("Olive Light"), ":/style/olive-light"));
-
-  return style_list;
-}
+QMap<QString, QString> StyleManager::available_themes_;
 
 void StyleManager::UseOSNativeStyling(QWidget *widget)
 {
@@ -145,9 +137,20 @@ void StyleManager::ParsePaletteColor(QSettings *ini, QPalette *palette, QPalette
   palette->setColor(group, role, QColor(ini->value(role_name).toString()));
 }
 
-StyleDescriptor StyleManager::DefaultStyle()
+void StyleManager::Init()
 {
-  return ListInternal().first();
+  qApp->setStyle(QStyleFactory::create("Fusion"));
+
+  available_themes_.insert(QStringLiteral("olive-dark"), QStringLiteral("Olive Dark"));
+  available_themes_.insert(QStringLiteral("olive-light"), QStringLiteral("Olive Light"));
+
+  QString config_style = Config::Current()["Style"].toString();
+
+  if (config_style.isEmpty() || !available_themes_.contains(config_style)) {
+    SetStyle(kDefaultStyle);
+  } else {
+    SetStyle(config_style);
+  }
 }
 
 const QString &StyleManager::GetStyle()
@@ -155,31 +158,17 @@ const QString &StyleManager::GetStyle()
   return current_style_;
 }
 
-void StyleManager::SetStyleFromConfig()
-{
-  QString config_style = Config::Current()["Style"].toString();
-
-  if (config_style.isEmpty()) {
-    SetStyle(DefaultStyle());
-  } else {
-    SetStyle(config_style);
-  }
-}
-
-void StyleManager::SetStyle(const StyleDescriptor &style)
-{
-  SetStyle(style.path());
-}
-
 void StyleManager::SetStyle(const QString &style_path)
 {
   current_style_ = style_path;
 
+  QString abs_style_path = QStringLiteral(":/style/%1").arg(style_path);
+
   // Load all icons for this style (icons must be loaded first because the style change below triggers the icon change)
-  icon::LoadAll(style_path);
+  icon::LoadAll(abs_style_path);
 
   // Set palette for this
-  QString palette_file = QStringLiteral("%1/palette.ini").arg(style_path);
+  QString palette_file = QStringLiteral("%1/palette.ini").arg(abs_style_path);
   if (QFileInfo::exists(palette_file)) {
     qApp->setPalette(ParsePalette(palette_file));
   } else {
@@ -187,7 +176,7 @@ void StyleManager::SetStyle(const QString &style_path)
   }
 
   // Set CSS style for this
-  QFile css_file(QStringLiteral("%1/style.css").arg(style_path));
+  QFile css_file(QStringLiteral("%1/style.css").arg(abs_style_path));
 
   if (css_file.exists() && css_file.open(QFile::ReadOnly | QFile::Text)) {
     // Read in entire CSS from file and set as the application stylesheet
@@ -201,20 +190,4 @@ void StyleManager::SetStyle(const QString &style_path)
   }
 }
 
-StyleDescriptor::StyleDescriptor(const QString &name, const QString &path) :
-  name_(name),
-  path_(path)
-{
-}
-
-const QString &StyleDescriptor::name() const
-{
-  return name_;
-}
-
-const QString &StyleDescriptor::path() const
-{
-  return path_;
-}
-
 OLIVE_NAMESPACE_EXIT
diff --git a/app/ui/style/style.h b/app/ui/style/style.h
index 23dbc4e9c..dbf385db0 100644
--- a/app/ui/style/style.h
+++ b/app/ui/style/style.h
@@ -28,34 +28,23 @@
 
 OLIVE_NAMESPACE_ENTER
 
-class StyleDescriptor {
-public:
-  StyleDescriptor(const QString& name, const QString& path);
-
-  const QString& name() const;
-  const QString& path() const;
-
-private:
-  QString name_;
-  QString path_;
-};
-
 class StyleManager : public QObject {
 public:
-  static StyleDescriptor DefaultStyle();
+  static void Init();
 
   static const QString& GetStyle();
 
-  static void SetStyleFromConfig();
-
-  static void SetStyle(const StyleDescriptor& style);
-
   static void SetStyle(const QString& style_path);
 
-  static QList<StyleDescriptor> ListInternal();
-
   static void UseOSNativeStyling(QWidget* widget);
 
+  static const char* kDefaultStyle;
+
+  static const QMap<QString, QString>& available_themes()
+  {
+    return available_themes_;
+  }
+
 private:
   static QPalette ParsePalette(const QString& ini_path);
 
@@ -65,6 +54,8 @@ private:
 
   static QString current_style_;
 
+  static QMap<QString, QString> available_themes_;
+
 };
 
 OLIVE_NAMESPACE_EXIT

From be4a969666f8ab1cd85d7561362942c6d4f330be Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 21:37:17 +1000
Subject: [PATCH 121/138] config: default to system locale rather than en_US

---
 app/config/config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/config/config.cpp b/app/config/config.cpp
index dce3449e2..4cf0aa63c 100644
--- a/app/config/config.cpp
+++ b/app/config/config.cpp
@@ -67,7 +67,7 @@ void Config::SetDefaults()
   SetEntryInternal(QStringLiteral("HoverFocus"), NodeParam::kBoolean, false);
   SetEntryInternal(QStringLiteral("AudioScrubbing"), NodeParam::kBoolean, true);
   SetEntryInternal(QStringLiteral("AutorecoveryInterval"), NodeParam::kInt, 1);
-  SetEntryInternal(QStringLiteral("Language"), NodeParam::kString, "en_US");
+  SetEntryInternal(QStringLiteral("Language"), NodeParam::kString, QLocale::system().name());
   SetEntryInternal(QStringLiteral("ScrollZooms"), NodeParam::kBoolean, false);
   SetEntryInternal(QStringLiteral("EnableSeekToImport"), NodeParam::kBoolean, false);
   SetEntryInternal(QStringLiteral("EditToolAlsoSeeks"), NodeParam::kBoolean, false);

From 1b7badb85b86dbf70664fd160576a00bc86b8922 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 10 Aug 2020 23:17:51 +1000
Subject: [PATCH 122/138] fixed shadowed variable issue

---
 .../preferences/tabs/preferencesappearancetab.cpp  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/dialog/preferences/tabs/preferencesappearancetab.cpp b/app/dialog/preferences/tabs/preferencesappearancetab.cpp
index 1326edcd3..737821e48 100644
--- a/app/dialog/preferences/tabs/preferencesappearancetab.cpp
+++ b/app/dialog/preferences/tabs/preferencesappearancetab.cpp
@@ -46,13 +46,15 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
 
   style_combobox_ = new QComboBox();
 
-  const QMap<QString, QString>& themes = StyleManager::available_themes();
-  QMap<QString, QString>::const_iterator i;
-  for (i=themes.cbegin(); i!=themes.cend(); i++) {
-    style_combobox_->addItem(i.value(), i.key());
+  {
+    const QMap<QString, QString>& themes = StyleManager::available_themes();
+    QMap<QString, QString>::const_iterator i;
+    for (i=themes.cbegin(); i!=themes.cend(); i++) {
+      style_combobox_->addItem(i.value(), i.key());
 
-    if (StyleManager::GetStyle() == i.key()) {
-      style_combobox_->setCurrentIndex(style_combobox_->count()-1);
+      if (StyleManager::GetStyle() == i.key()) {
+        style_combobox_->setCurrentIndex(style_combobox_->count()-1);
+      }
     }
   }
 

From 43ad1d4368718f2b4edc9fdd41fa2d506c26ab19 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 11 Aug 2020 00:49:56 +1000
Subject: [PATCH 123/138] cmake: find openexr release/debug separately and
 define them as such

Minor CMake improvement that becomes a major improvement on Windows,
because for some reason OpenEXR on Windows always crashes if you mix
release/debug builds (e.g. release OpenEXR + debug Olive and vice versa).
This ensures that as long as you have both release and debug (which you
will if you installed from vcpkg), CMake will link the correct lib and
prevent crashes.
---
 cmake/FindOpenEXR.cmake | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
index 86f1cd472..e70359b75 100644
--- a/cmake/FindOpenEXR.cmake
+++ b/cmake/FindOpenEXR.cmake
@@ -118,13 +118,21 @@ set (_openexr_components IlmThread IlmImf Imath Iex Half)
 foreach (COMPONENT ${_openexr_components})
     string (TOUPPER ${COMPONENT} UPPERCOMPONENT)
     # First try with the version embedded
-    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY
+    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY_RELEASE
                   NAMES ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}
                         ${COMPONENT}
-                        ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d
+                  HINTS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
+                        ${GENERIC_LIBRARY_PATHS} )
+
+    find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY_DEBUG
+                  NAMES ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_d
                         ${COMPONENT}_d
                   HINTS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
                         ${GENERIC_LIBRARY_PATHS} )
+
+    set(OPENEXR_${UPPERCOMPONENT}_LIBRARY
+      optimized ${OPENEXR_${UPPERCOMPONENT}_LIBRARY_RELEASE}
+      debug ${OPENEXR_${UPPERCOMPONENT}_LIBRARY_DEBUG})
 endforeach ()
 
 find_package_handle_standard_args (OpenEXR

From 75b4bfe57ee26d88de97bf3d3a8c1cf5fd80c213 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 11 Aug 2020 01:02:14 +1000
Subject: [PATCH 124/138] viewer: clear current render queue before creating
 next queue

Hilariously, the queue was being cleared right after it was being set
thus cancelling the whole operation out. This has now been fixed.
---
 app/widget/viewer/viewer.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index b6777049f..62d42aed4 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -435,6 +435,13 @@ void ViewerWidget::PlayInternal(int speed, bool in_to_out_only)
     return;
   }
 
+  // Kindly tell all viewers to stop caching
+  if (pause_autocache_during_playback_) {
+    foreach (ViewerWidget* viewer, instances_) {
+      viewer->renderer_->ClearVideoQueue();
+    }
+  }
+
   // If the playhead is beyond the end, restart at 0
   if (!in_to_out_only && GetTime() >= GetConnectedNode()->GetLength()) {
     if (speed > 0) {
@@ -464,13 +471,6 @@ void ViewerWidget::PlayInternal(int speed, bool in_to_out_only)
     }
   }
 
-  // Kindly tell all viewers to stop caching
-  if (pause_autocache_during_playback_) {
-    foreach (ViewerWidget* viewer, instances_) {
-      viewer->renderer_->ClearVideoQueue();
-    }
-  }
-
   if (!prequeuing_) {
     FinishPlayPreprocess();
   }

From ec8b046f02586653083050da5bdb09b88db133e0 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 11 Aug 2020 02:02:50 +1000
Subject: [PATCH 125/138] viewer: implemented basic deinterlace

Implements a very basic GLSL deinterlace that simply halves the vertical
resolution and then interpolates between the fields. This can be toggled
on or off.

The reasons for being so basic is:
- Speed, very quick code running in OpenGL
- It would seem the highest quality deinterlacers are temporally based
  which doesn't make much sense for the viewer, particularly since we can't
  double the frame rate since our timecode is fixed to the frames.

Higher quality interlacing/deinterlacing will be present in the actual
renderer.
---
 app/node/output/viewer/viewer.cpp          |  5 ++
 app/node/output/viewer/viewer.h            |  2 +
 app/render/backend/opengl/openglshader.cpp | 54 +++++++++++-----------
 app/render/backend/opengl/openglshader.h   |  2 +-
 app/widget/viewer/viewer.cpp               | 22 +++++++++
 app/widget/viewer/viewer.h                 |  2 +
 app/widget/viewer/viewerdisplay.cpp        | 15 +++++-
 app/widget/viewer/viewerdisplay.h          | 12 +++++
 8 files changed, 85 insertions(+), 29 deletions(-)

diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp
index c682fb8a6..577c7d15d 100644
--- a/app/node/output/viewer/viewer.cpp
+++ b/app/node/output/viewer/viewer.cpp
@@ -137,6 +137,7 @@ void ViewerOutput::set_video_params(const VideoParams &video)
   bool size_changed = video_params_.width() != video.width() || video_params_.height() != video.height();
   bool timebase_changed = video_params_.time_base() != video.time_base();
   bool pixel_aspect_changed = video_params_.pixel_aspect_ratio() != video.pixel_aspect_ratio();
+  bool interlacing_changed = video_params_.interlacing() != video.interlacing();
 
   video_params_ = video;
 
@@ -148,6 +149,10 @@ void ViewerOutput::set_video_params(const VideoParams &video)
     emit PixelAspectChanged(video_params_.pixel_aspect_ratio());
   }
 
+  if (interlacing_changed) {
+    emit InterlacingChanged(video_params_.interlacing());
+  }
+
   if (timebase_changed) {
     video_frame_cache_.SetTimebase(video_params_.time_base());
     emit TimebaseChanged(video_params_.time_base());
diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h
index 2d67c9800..96c30cdf9 100644
--- a/app/node/output/viewer/viewer.h
+++ b/app/node/output/viewer/viewer.h
@@ -133,6 +133,8 @@ signals:
 
   void PixelAspectChanged(const rational& pixel_aspect);
 
+  void InterlacingChanged(VideoParams::Interlacing mode);
+
   void VideoParamsChanged();
   void AudioParamsChanged();
 
diff --git a/app/render/backend/opengl/openglshader.cpp b/app/render/backend/opengl/openglshader.cpp
index ff75ad189..7e76f619a 100644
--- a/app/render/backend/opengl/openglshader.cpp
+++ b/app/render/backend/opengl/openglshader.cpp
@@ -146,8 +146,9 @@ OpenGLShaderPtr OpenGLShader::CreateOCIO(QOpenGLContext* ctx,
   return shader;
 }
 
-QString OpenGLShader::CodeDefaultFragment(const QString &function_name, const QString &shader_code)
+QString OpenGLShader::CodeDefaultFragment(QString function_name, const QString &shader_code)
 {
+  // Create shader header
   QString frag_code = QStringLiteral("#version 150\n"
                                      "\n"
                                      "#ifdef GL_ES\n"
@@ -156,48 +157,47 @@ QString OpenGLShader::CodeDefaultFragment(const QString &function_name, const QS
                                      "#endif\n"
                                      "\n"
                                      "uniform sampler2D ove_maintex;\n"
-                                     "uniform bool color_only;\n"
-                                     "uniform vec4 color_only_color;\n"
+                                     "uniform vec2 ove_resolution;\n"
+                                     "uniform bool ove_deinterlace;\n"
                                      "\n"
                                      "in vec2 ove_texcoord;\n"
                                      "\n"
                                      "out vec4 fragColor;\n"
                                      "\n");
 
-  // Finish the function with the main function
-
   // Check if additional code was passed to this function, add it here
-  if (shader_code.isEmpty()) {
-
-    // If not, just add a pure main() function
-
-    frag_code.append(QStringLiteral("\n"
-                                    "void main() {\n"
-                                    "    if (color_only) {\n"
-                                    "        fragColor = color_only_color;"
-                                    "    } else {\n"
-                                    "        vec4 color = texture(ove_maintex, ove_texcoord);\n"
-                                    "        fragColor = color;\n"
-                                    "    }\n"
-                                    "}\n"));
-
-  } else {
+  if (!function_name.isEmpty() && !shader_code.isEmpty()) {
 
     // If additional code was passed, add it and reference it in main().
     //
-    // The function in the additional code is expected to be `vec4 function_name(vec4 color)`. The texture coordinate
-    // can be acquired through `ove_texcoord`.
+    // The function in the additional code is expected to be `vec4 function_name(vec4 color)`.
+    // The texture coordinate can be acquired through `ove_texcoord`.
 
     frag_code.append(shader_code);
 
-    frag_code.append(QStringLiteral("\n"
-                                    "void main() {\n"
-                                    "    vec4 color = %1(texture(ove_maintex, ove_texcoord));\n"
-                                    "    fragColor = color;\n"
-                                    "}\n").arg(function_name));
+  } else {
+
+    // No function to call
+    function_name = QString();
 
   }
 
+  // Our function_name arg will either resolve to the function added to this or to nothing, in
+  // which case they'll just be benign brackets.
+  frag_code.append(QStringLiteral("\n"
+                                  "void main() {\n"
+                                  "    vec2 using_texcoord = ove_texcoord;\n"
+                                  "    if (ove_deinterlace) {\n"
+                                  "        // A very basic deinterlace that halves the vertical\n"
+                                  "        // resolution and linearly interpolates the two fields\n"
+                                  "        // by reading the texture coord between them.\n"
+                                  "        float half_vert = round(ove_resolution.y / 2.0);\n"
+                                  "        using_texcoord.y = (round(using_texcoord.y * half_vert) + 0.25) / half_vert;\n"
+                                  "    }\n"
+                                  "    vec4 color = %1(texture(ove_maintex, using_texcoord));\n"
+                                  "    fragColor = color;\n"
+                                  "}\n").arg(function_name));
+
   return frag_code;
 }
 
diff --git a/app/render/backend/opengl/openglshader.h b/app/render/backend/opengl/openglshader.h
index 3adab00d4..452dc3c3d 100644
--- a/app/render/backend/opengl/openglshader.h
+++ b/app/render/backend/opengl/openglshader.h
@@ -51,7 +51,7 @@ public:
                                     OCIO::ConstProcessorRcPtr processor,
                                     bool alpha_is_associated);
 
-  static QString CodeDefaultFragment(const QString &function_name = QString(),
+  static QString CodeDefaultFragment(QString function_name = QString(),
                                      const QString &shader_code = QString());
   static QString CodeDefaultVertex();
   static QString CodeAlphaDisassociate(const QString& function_name);
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 62d42aed4..f6a71f333 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -167,12 +167,15 @@ void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
   connect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SetViewerResolution);
   connect(n, &ViewerOutput::PixelAspectChanged, this, &ViewerWidget::SetViewerPixelAspect);
   connect(n, &ViewerOutput::LengthChanged, this, &ViewerWidget::LengthChangedSlot);
+  connect(n, &ViewerOutput::InterlacingChanged, this, &ViewerWidget::InterlacingChangedSlot);
   connect(n, &ViewerOutput::VideoParamsChanged, this, &ViewerWidget::UpdateRendererVideoParameters);
   connect(n, &ViewerOutput::AudioParamsChanged, this, &ViewerWidget::UpdateRendererAudioParameters);
   connect(n->video_frame_cache(), &FrameHashCache::Invalidated, this, &ViewerWidget::ViewerInvalidatedVideoRange);
   connect(n->video_frame_cache(), &FrameHashCache::Shifted, this, &ViewerWidget::ViewerShiftedRange);
   connect(n, &ViewerOutput::GraphChangedFrom, this, &ViewerWidget::UpdateStack);
 
+  InterlacingChangedSlot(n->video_params().interlacing());
+
   ruler()->SetPlaybackCache(n->video_frame_cache());
 
   n->audio_playback_cache()->SetParameters(n->audio_params());
@@ -218,6 +221,7 @@ void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
   disconnect(n, &ViewerOutput::SizeChanged, this, &ViewerWidget::SetViewerResolution);
   disconnect(n, &ViewerOutput::PixelAspectChanged, this, &ViewerWidget::SetViewerPixelAspect);
   disconnect(n, &ViewerOutput::LengthChanged, this, &ViewerWidget::LengthChangedSlot);
+  disconnect(n, &ViewerOutput::InterlacingChanged, this, &ViewerWidget::InterlacingChangedSlot);
   disconnect(n, &ViewerOutput::VideoParamsChanged, this, &ViewerWidget::UpdateRendererVideoParameters);
   disconnect(n, &ViewerOutput::AudioParamsChanged, this, &ViewerWidget::UpdateRendererAudioParameters);
   disconnect(n->video_frame_cache(), &FrameHashCache::Invalidated, this, &ViewerWidget::ViewerInvalidatedVideoRange);
@@ -824,6 +828,16 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
     connect(full_screen_menu, &QMenu::triggered, this, &ViewerWidget::ContextMenuSetFullScreen);
   }
 
+  {
+    // Deinterlace Option
+    if (GetConnectedNode()->video_params().interlacing() != VideoParams::kInterlaceNone) {
+      QAction* deinterlace_action = menu.addAction(tr("Deinterlace"));
+      deinterlace_action->setCheckable(true);
+      deinterlace_action->setChecked(display_widget_->IsDeinterlacing());
+      connect(deinterlace_action, &QAction::triggered, display_widget_, &ViewerDisplayWidget::SetDeinterlacing);
+    }
+  }
+
   menu.addSeparator();
 
   {
@@ -1089,6 +1103,14 @@ void ViewerWidget::LengthChangedSlot(const rational &length)
   }
 }
 
+void ViewerWidget::InterlacingChangedSlot(VideoParams::Interlacing interlacing)
+{
+  // Automatically set a "sane" deinterlacing option
+  display_widget_->SetDeinterlacing(interlacing != VideoParams::kInterlaceNone);
+
+  // FIXME: Set windows too
+}
+
 void ViewerWidget::UpdateRendererVideoParameters()
 {
   renderer_->ClearVideoQueue();
diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h
index 419aa8c65..5edc2821f 100644
--- a/app/widget/viewer/viewer.h
+++ b/app/widget/viewer/viewer.h
@@ -261,6 +261,8 @@ private slots:
 
   void LengthChangedSlot(const rational& length);
 
+  void InterlacingChangedSlot(VideoParams::Interlacing interlacing);
+
   void UpdateRendererVideoParameters();
 
   void UpdateRendererAudioParameters();
diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp
index 943314ef7..7aa6db6fe 100644
--- a/app/widget/viewer/viewerdisplay.cpp
+++ b/app/widget/viewer/viewerdisplay.cpp
@@ -43,7 +43,8 @@ ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) :
   signal_cursor_color_(false),
   gizmos_(nullptr),
   gizmo_click_(false),
-  last_loaded_buffer_(nullptr)
+  last_loaded_buffer_(nullptr),
+  deinterlace_(false)
 {
 }
 
@@ -86,6 +87,12 @@ void ViewerDisplayWidget::SetImage(FramePtr in_buffer)
   update();
 }
 
+void ViewerDisplayWidget::SetDeinterlacing(bool e)
+{
+  deinterlace_ = e;
+  update();
+}
+
 const ViewerSafeMarginInfo &ViewerDisplayWidget::GetSafeMargin() const
 {
   return safe_margin_;
@@ -212,6 +219,12 @@ void ViewerDisplayWidget::paintGL()
     // Bind retrieved texture
     f->glBindTexture(GL_TEXTURE_2D, texture_.texture());
 
+    // Set some parameters
+    color_service()->pipeline()->bind();
+    color_service()->pipeline()->setUniformValue("ove_resolution", texture_.width(), texture_.height());
+    color_service()->pipeline()->setUniformValue("ove_deinterlace", deinterlace_);
+    color_service()->pipeline()->release();
+
     // Blit using the color service
     color_service()->ProcessOpenGL(true, matrix_);
 
diff --git a/app/widget/viewer/viewerdisplay.h b/app/widget/viewer/viewerdisplay.h
index f8db608ef..7a240beff 100644
--- a/app/widget/viewer/viewerdisplay.h
+++ b/app/widget/viewer/viewerdisplay.h
@@ -77,6 +77,11 @@ public:
 
   FramePtr last_loaded_buffer() const;
 
+  bool IsDeinterlacing() const
+  {
+    return deinterlace_;
+  }
+
 public slots:
   /**
    * @brief Set the transformation matrix to draw with
@@ -102,6 +107,11 @@ public slots:
    */
   void SetImage(FramePtr in_buffer);
 
+  /**
+   * @brief Enables/disables a basic deinterlace on the viewer
+   */
+  void SetDeinterlacing(bool e);
+
 signals:
   /**
    * @brief Signal emitted when the user starts dragging from the viewer
@@ -174,6 +184,8 @@ private:
 
   FramePtr last_loaded_buffer_;
 
+  bool deinterlace_;
+
 private slots:
   /**
    * @brief Slot to connect just before the OpenGL context is destroyed to clean up resources

From 3ae3079a7a7c234faa1bd165a4104625030075dc Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 11 Aug 2020 12:13:16 +1000
Subject: [PATCH 126/138] cmake: fallback if both openexr build types are not
 available

---
 cmake/FindOpenEXR.cmake | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
index e70359b75..bd9db9ed0 100644
--- a/cmake/FindOpenEXR.cmake
+++ b/cmake/FindOpenEXR.cmake
@@ -130,9 +130,18 @@ foreach (COMPONENT ${_openexr_components})
                   HINTS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
                         ${GENERIC_LIBRARY_PATHS} )
 
-    set(OPENEXR_${UPPERCOMPONENT}_LIBRARY
-      optimized ${OPENEXR_${UPPERCOMPONENT}_LIBRARY_RELEASE}
-      debug ${OPENEXR_${UPPERCOMPONENT}_LIBRARY_DEBUG})
+    if (OPENEXR_${UPPERCOMPONENT}_LIBRARY_RELEASE AND OPENEXR_${UPPERCOMPONENT}_LIBRARY_DEBUG)
+      set(OPENEXR_${UPPERCOMPONENT}_LIBRARY
+        optimized ${OPENEXR_${UPPERCOMPONENT}_LIBRARY_RELEASE}
+        debug ${OPENEXR_${UPPERCOMPONENT}_LIBRARY_DEBUG})
+    elseif(OPENEXR_${UPPERCOMPONENT}_LIBRARY_RELEASE)
+      set(OPENEXR_${UPPERCOMPONENT}_LIBRARY
+        ${OPENEXR_${UPPERCOMPONENT}_LIBRARY_RELEASE})
+    else()
+      set(OPENEXR_${UPPERCOMPONENT}_LIBRARY
+        ${OPENEXR_${UPPERCOMPONENT}_LIBRARY_DEBUG})
+    endif()
+
 endforeach ()
 
 find_package_handle_standard_args (OpenEXR

From 857531b0119e8f7706a73181937c139af1100d2b Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 13 Aug 2020 15:41:28 +1000
Subject: [PATCH 127/138] core: don't start if help or version args are used

---
 app/core.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/core.cpp b/app/core.cpp
index 945bd3f2b..4ab066d1c 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -84,16 +84,13 @@ int Core::execute(QCoreApplication* a)
 {
   int exit_code = 1;
 
-  // Start core
-  OLIVE_NAMESPACE::Core::instance()->Start();
-
   //
   // Parse command line arguments
   //
 
   QCommandLineParser parser;
-  parser.addHelpOption();
-  parser.addVersionOption();
+  QCommandLineOption help_option = parser.addHelpOption();
+  QCommandLineOption version_option = parser.addVersionOption();
 
   // Project from command line option
   // FIXME: What's the correct way to make a visually "optional" positional argument, or is manually adding square
@@ -111,6 +108,14 @@ int Core::execute(QCoreApplication* a)
   // Parse options
   parser.process(*a);
 
+  if (parser.isSet(help_option) || parser.isSet(version_option)) {
+    // These options don't launch any of the application proper
+    return a->exec();
+  }
+
+  // Start core
+  OLIVE_NAMESPACE::Core::instance()->Start();
+
   QStringList args = parser.positionalArguments();
 
   // Detect project to load on startup
@@ -142,8 +147,6 @@ int Core::execute(QCoreApplication* a)
 
   }
 
-
-
   // Clear core memory
   OLIVE_NAMESPACE::Core::instance()->Stop();
 

From 10709880fca4e8b6f6ffb6ecae0e34a1bc2e0bcc Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 14 Aug 2020 18:25:12 +1000
Subject: [PATCH 128/138] preliminary google crashpad integration

First attempt at automated out-of-process crash reporting. Have only
updated AppVeyor script so far, so if this works (which it won't), it'll
only work on Windows.
---
 .appveyor/build.bat              | 22 +++++++--
 CMakeLists.txt                   |  6 +++
 app/CMakeLists.txt               | 23 +++++++--
 app/common/CMakeLists.txt        |  2 +
 app/common/crashpadinterface.cpp | 82 ++++++++++++++++++++++++++++++++
 app/common/crashpadinterface.h   | 34 +++++++++++++
 app/main.cpp                     | 16 +++++--
 cmake/FindGoogleCrashpad.cmake   | 82 ++++++++++++++++++++++++++++++++
 8 files changed, 255 insertions(+), 12 deletions(-)
 create mode 100644 app/common/crashpadinterface.cpp
 create mode 100644 app/common/crashpadinterface.h
 create mode 100644 cmake/FindGoogleCrashpad.cmake

diff --git a/.appveyor/build.bat b/.appveyor/build.bat
index e2c6b553f..51211c585 100644
--- a/.appveyor/build.bat
+++ b/.appveyor/build.bat
@@ -30,8 +30,17 @@ curl https://ffmpeg.zeranoe.com/builds/win64/shared/%FFMPEG_VER%-shared.zip > %F
 7z x %FFMPEG_VER%-dev.zip
 7z x %FFMPEG_VER%-shared.zip
 
-REM Add Qt and FFmpeg directory to path
-set PATH=%PATH%;C:\Qt\5.13.2\msvc2017_64\bin;%APPVEYOR_BUILD_FOLDER%\%FFMPEG_VER%-dev
+REM Acquire Google Crashpad
+git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
+set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\depot_tools
+fetch crashpad
+cd crashpad
+gn gen out/Default
+ninja -C out/Default
+cd ..
+
+REM Add Qt, FFmpeg, and Crashpad to path
+set PATH=%PATH%;C:\Qt\5.13.2\msvc2017_64\bin;%APPVEYOR_BUILD_FOLDER%\%FFMPEG_VER%-dev;%APPVEYOR_BUILD_FOLDER%\crashpad;%APPVEYOR_BUILD_FOLDER%\crashpad\out\Default
 
 REM Run cmake
 cmake -G "Ninja" . -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
@@ -42,12 +51,18 @@ ninja.exe || exit /B 1
 REM If this is a pull request, no further packaging/deploying needs to be done
 if NOT "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" goto end
 
+REM Create Crashpad symbol file and upload it
+wget https://github.com/google/breakpad/blob/master/src/tools/windows/binaries/dump_syms.exe?raw=true -O dump_syms.exe
+dump_syms app\olive-editor.pdb > olive-editor.sym
+curl -F symfile=@olive-editor.sym https://olivevideoeditor.org/crashpad/symbols.php
+
 REM Start building package
 mkdir olive-editor
 cd olive-editor
 copy ..\app\olive-editor.exe .
 copy ..\app\olive-editor.pdb .
 copy ..\app\crashhandler.exe .
+copy ..\crashpad\out\Default\crashpad_handler.exe .
 windeployqt olive-editor.exe
 copy ..\%FFMPEG_VER%-shared\bin\*.dll .
 copy C:\Tools\vcpkg\installed\x64-windows\bin\OpenColorIO.dll .
@@ -85,9 +100,6 @@ REM Create portable
 copy nul olive-editor\portable
 7z a %PKGNAME%.zip olive-editor
 
-REM We're ready to upload, but we only upload *sometimes*
-REM set PATH=%PATH%;C:\msys64\usr\bin
-
 REM If this was a tagged build, upload
 if "%APPVEYOR_REPO_TAG%"=="true" GOTO upload
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95a3ef62d..3c0f423c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,12 @@ find_package(FFMPEG 3.0 REQUIRED
   swresample
 )
 
+find_package(GoogleCrashpad)
+
+if (NOT GoogleCrashpad_FOUND)
+  message("   Automatic crash reporting will be disabled.")
+endif()
+
 if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
   find_package(Git)
   if(GIT_FOUND)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 931702964..714a5e01d 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -79,9 +79,6 @@ if(APPLE)
   set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
 endif()
 
-# Set compiler definitions
-target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS})
-
 # Set compiler options
 if(MSVC)
   target_compile_options(
@@ -171,6 +168,26 @@ elseif (APPLE)
   )
 endif()
 
+# Enable Crashpad if found
+if (GoogleCrashpad_FOUND)
+  set(OLIVE_DEFINITIONS ${OLIVE_DEFINITIONS} USE_CRASHPAD)
+
+  target_include_directories(
+    ${OLIVE_TARGET}
+    PRIVATE
+    ${CRASHPAD_INCLUDE_DIRS}
+    )
+
+  target_link_libraries(
+    ${OLIVE_TARGET}
+    PRIVATE
+    ${CRASHPAD_LIBRARIES}
+    )
+endif()
+
+# Set compiler definitions
+target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS})
+
 set(OLIVE_TS_FILES
   # FIXME: Empty variable
 )
diff --git a/app/common/CMakeLists.txt b/app/common/CMakeLists.txt
index 295027196..0ee6714aa 100644
--- a/app/common/CMakeLists.txt
+++ b/app/common/CMakeLists.txt
@@ -23,6 +23,8 @@ set(OLIVE_SOURCES
   common/clamp.h
   common/crashhandler.h
   common/crashhandler.cpp
+  common/crashpadinterface.cpp
+  common/crashpadinterface.h
   common/debug.h
   common/debug.cpp
   common/define.h
diff --git a/app/common/crashpadinterface.cpp b/app/common/crashpadinterface.cpp
new file mode 100644
index 000000000..85cf37fad
--- /dev/null
+++ b/app/common/crashpadinterface.cpp
@@ -0,0 +1,82 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "crashpadinterface.h"
+
+#ifdef USE_CRASHPAD
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QDir>
+
+#include "filefunctions.h"
+
+// Copied from base::FilePath to match its macro
+#if defined(OS_POSIX)
+  // On most platforms, native pathnames are char arrays, and the encoding
+  // may or may not be specified.  On Mac OS X, native pathnames are encoded
+  // in UTF-8.
+  #define TO_BASE_STRING_TYPE(x) x.toStdString()
+#elif defined(OS_WIN)
+  // On Windows, for Unicode-aware applications, native pathnames are wchar_t
+  // arrays encoded in UTF-16.
+  #define TO_BASE_STRING_TYPE(x) x.toStdWString()
+#endif  // OS_WIN
+
+bool InitializeCrashpad()
+{
+  QString exe_dir = QCoreApplication::applicationDirPath();
+
+  // FIXME: On Linux, probably should put this in a subdir so that it doesn't conflict with
+  //        anything else in /usr/bin
+
+  base::FilePath handler(TO_BASE_STRING_TYPE(QDir(exe_dir).filePath(QStringLiteral("crashpad_handler.exe"))));
+
+  base::FilePath reports_dir(TO_BASE_STRING_TYPE(QDir(OLIVE_NAMESPACE::FileFunctions::GetTempFilePath()).filePath("reports")));
+
+  base::FilePath metrics_dir(TO_BASE_STRING_TYPE(QDir(OLIVE_NAMESPACE::FileFunctions::GetTempFilePath()).filePath("metrics")));
+
+  std::string url = "https://olivevideoeditor.org/crashpad/report.php";
+
+  // Metadata that will be posted to the server with the crash report map
+  std::map<std::string, std::string> annotations;
+
+  // Disable crashpad rate limiting so that all crashes have dmp files
+  std::vector<std::string> arguments;
+  arguments.push_back("--no-rate-limit");
+  arguments.push_back("--no-upload-gzip");
+
+  // Initialize Crashpad database
+  std::unique_ptr<crashpad::CrashReportDatabase> database = crashpad::CrashReportDatabase::Initialize(reports_dir);
+  if (database == NULL) return false;
+
+  // Enable automated crash uploads
+  crashpad::Settings *settings = database->GetSettings();
+  if (settings == NULL) return false;
+  settings->SetUploadsEnabled(true);
+
+  // Start crash handler
+  crashpad::CrashpadClient *client = new crashpad::CrashpadClient();
+  bool status = client->StartHandler(handler, reports_dir, metrics_dir,
+                                     url, annotations, arguments, true, true);
+  return status;
+}
+
+#endif // USE_CRASHPAD
diff --git a/app/common/crashpadinterface.h b/app/common/crashpadinterface.h
new file mode 100644
index 000000000..26bd17b65
--- /dev/null
+++ b/app/common/crashpadinterface.h
@@ -0,0 +1,34 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef CRASHPAD_INTERFACE_H
+#define CRASHPAD_INTERFACE_H
+
+#ifdef USE_CRASHPAD
+
+#include <client/crashpad_client.h>
+#include <client/crash_report_database.h>
+#include <client/settings.h>
+
+bool InitializeCrashpad();
+
+#endif // USE_CRASHPAD
+
+#endif // CRASHPAD_INTERFACE_H
diff --git a/app/main.cpp b/app/main.cpp
index 0026395f0..d58b65ebf 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -32,17 +32,18 @@ extern "C" {
 }
 
 #include <csignal>
+
 #include <QApplication>
 #include <QSurfaceFormat>
 
 #include "core.h"
-#include "common/crashhandler.h"
 #include "common/debug.h"
 
-int main(int argc, char *argv[]) {
-  signal(SIGSEGV, OLIVE_NAMESPACE::crash_handler);
-  signal(SIGABRT, OLIVE_NAMESPACE::crash_handler);
+#ifdef USE_CRASHPAD
+#include "common/crashpadinterface.h"
+#endif // USE_CRASHPAD
 
+int main(int argc, char *argv[]) {
   // Set OpenGL display profile (3.2 Core)
   QSurfaceFormat format;
   format.setVersion(3, 2);
@@ -86,5 +87,12 @@ int main(int argc, char *argv[]) {
   avfilter_register_all();
 #endif
 
+  // Enable Google Crashpad if compiled with it
+#ifdef USE_CRASHPAD
+  if (!InitializeCrashpad()) {
+    qWarning() << "Failed to initialize Crashpad handler";
+  }
+#endif // USE_CRASHPAD
+
   return OLIVE_NAMESPACE::Core::instance()->execute(&a);
 }
diff --git a/cmake/FindGoogleCrashpad.cmake b/cmake/FindGoogleCrashpad.cmake
new file mode 100644
index 000000000..4a5f2f2a9
--- /dev/null
+++ b/cmake/FindGoogleCrashpad.cmake
@@ -0,0 +1,82 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2019 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+include(FindPackageHandleStandardArgs)
+
+# Try to find include files
+find_path(CRASHPAD_CLIENT_INCLUDE_DIR
+        client/crashpad_client.h
+    HINTS
+        "${CRASHPAD_LOCATION}"
+        "$ENV{CRASHPAD_LOCATION}"
+        "${CRASHPAD_BASE_DIR}"
+)
+list(APPEND CRASHPAD_INCLUDE_DIRS ${CRASHPAD_CLIENT_INCLUDE_DIR})
+
+find_path(CRASHPAD_BASE_INCLUDE_DIR
+        base/files/file_path.h
+    HINTS
+        "${CRASHPAD_LOCATION}"
+        "$ENV{CRASHPAD_LOCATION}"
+        "${CRASHPAD_BASE_DIR}"
+    PATH_SUFFIXES
+        "third_party/mini_chromium/mini_chromium"
+)
+list(APPEND CRASHPAD_INCLUDE_DIRS ${CRASHPAD_BASE_INCLUDE_DIR})
+
+# Try to find build files
+if (WIN32)
+  find_path(CRASHPAD_LIBRARY_DIRS
+          obj/client/client.lib
+      HINTS
+          "${CRASHPAD_LOCATION}"
+          "$ENV{CRASHPAD_LOCATION}"
+          "${CRASHPAD_BASE_DIR}"
+  )
+elseif(UNIX)
+  # Assuming macOS works this way, don't actually know
+  find_path(CRASHPAD_LIBRARY_DIRS
+          obj/client/libclient.a
+      HINTS
+          "${CRASHPAD_LOCATION}"
+          "$ENV{CRASHPAD_LOCATION}"
+          "${CRASHPAD_BASE_DIR}"
+  )
+endif()
+
+# Find the libraries we need
+set (_crashpad_components
+  client/client
+  util/util
+  third_party/mini_chromium/mini_chromium/base/base)
+foreach (COMPONENT ${_crashpad_components})
+  string(REGEX MATCH "^(.*[\\\/])" SUBDIR ${COMPONENT})
+  string(REGEX MATCH "([^\/]+$)" SHORT_COMPONENT ${COMPONENT})
+  string(TOUPPER ${SHORT_COMPONENT} UPPERCOMPONENT)
+
+  find_library(CRASHPAD_${UPPERCOMPONENT}_LIB
+                ${SHORT_COMPONENT}
+                HINTS "${CRASHPAD_LIBRARY_DIRS}/obj/${SUBDIR}"
+  )
+
+  list(APPEND CRASHPAD_LIBRARIES ${CRASHPAD_${UPPERCOMPONENT}_LIB})
+endforeach()
+
+find_package_handle_standard_args(GoogleCrashpad
+    REQUIRED_VARS
+        CRASHPAD_LIBRARIES
+        CRASHPAD_INCLUDE_DIRS
+)

From 6251113ce9164e7dc871e42337566dc30de2d1ac Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 14 Aug 2020 18:43:07 +1000
Subject: [PATCH 129/138] ci: debugging appveyor

Don't mind me, just need to figure out what this script is doing.
---
 .appveyor/build.bat | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.appveyor/build.bat b/.appveyor/build.bat
index 51211c585..f1d568c78 100644
--- a/.appveyor/build.bat
+++ b/.appveyor/build.bat
@@ -24,19 +24,21 @@ vcpkg integrate install
 cd %APPVEYOR_BUILD_FOLDER%
 
 REM Acquire FFmpeg
-set FFMPEG_VER=ffmpeg-4.2.1-win64
+set FFMPEG_VER=ffmpeg-4.2.3-win64
 curl https://ffmpeg.zeranoe.com/builds/win64/dev/%FFMPEG_VER%-dev.zip > %FFMPEG_VER%-dev.zip
 curl https://ffmpeg.zeranoe.com/builds/win64/shared/%FFMPEG_VER%-shared.zip > %FFMPEG_VER%-shared.zip
 7z x %FFMPEG_VER%-dev.zip
 7z x %FFMPEG_VER%-shared.zip
 
+goto end
+
 REM Acquire Google Crashpad
 git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\depot_tools
 fetch crashpad
 cd crashpad
 gn gen out/Default
-ninja -C out/Default
+ninja.exe -C out/Default
 cd ..
 
 REM Add Qt, FFmpeg, and Crashpad to path

From 3588cc02413012895802547025d2266d094f1d59 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 14 Aug 2020 19:00:43 +1000
Subject: [PATCH 130/138] appveyor: call fetch in another cmd instance

---
 .appveyor/build.bat | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.appveyor/build.bat b/.appveyor/build.bat
index f1d568c78..179d88402 100644
--- a/.appveyor/build.bat
+++ b/.appveyor/build.bat
@@ -35,7 +35,9 @@ goto end
 REM Acquire Google Crashpad
 git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\depot_tools
-fetch crashpad
+
+REM Run `fetch` through cmd /c since fetch is a batch file that seems to call exit 
+cmd /c fetch crashpad
 cd crashpad
 gn gen out/Default
 ninja.exe -C out/Default
@@ -54,7 +56,7 @@ REM If this is a pull request, no further packaging/deploying needs to be done
 if NOT "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" goto end
 
 REM Create Crashpad symbol file and upload it
-wget https://github.com/google/breakpad/blob/master/src/tools/windows/binaries/dump_syms.exe?raw=true -O dump_syms.exe
+C:\msys64\usr\bin\wget.exe https://github.com/google/breakpad/blob/master/src/tools/windows/binaries/dump_syms.exe?raw=true -O dump_syms.exe
 dump_syms app\olive-editor.pdb > olive-editor.sym
 curl -F symfile=@olive-editor.sym https://olivevideoeditor.org/crashpad/symbols.php
 

From 34d1b141e5e2e0a57783e5dd537dcc674558902b Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 14 Aug 2020 19:05:29 +1000
Subject: [PATCH 131/138] appveyor: remove goto end for debugging

oh god I can't believe I forgot to remove this
---
 .appveyor/build.bat | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.appveyor/build.bat b/.appveyor/build.bat
index 179d88402..bda82984b 100644
--- a/.appveyor/build.bat
+++ b/.appveyor/build.bat
@@ -30,8 +30,6 @@ curl https://ffmpeg.zeranoe.com/builds/win64/shared/%FFMPEG_VER%-shared.zip > %F
 7z x %FFMPEG_VER%-dev.zip
 7z x %FFMPEG_VER%-shared.zip
 
-goto end
-
 REM Acquire Google Crashpad
 git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\depot_tools

From 20ccd2c254a36ee2a1147c564d9f1d3143fd8840 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 14 Aug 2020 19:14:34 +1000
Subject: [PATCH 132/138] appveyor: run gn as a cmd /c process as well

---
 .appveyor/build.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor/build.bat b/.appveyor/build.bat
index bda82984b..3a18cea65 100644
--- a/.appveyor/build.bat
+++ b/.appveyor/build.bat
@@ -37,7 +37,7 @@ set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\depot_tools
 REM Run `fetch` through cmd /c since fetch is a batch file that seems to call exit 
 cmd /c fetch crashpad
 cd crashpad
-gn gen out/Default
+cmd /c gn gen out/Default
 ninja.exe -C out/Default
 cd ..
 

From 99b826aef5153d4ac9f5dde4a1070b52865ff879 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 14 Aug 2020 20:00:43 +1000
Subject: [PATCH 133/138] appveyor: build crashpad as dynamic release instead
 of static

---
 .appveyor/build.bat | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/.appveyor/build.bat b/.appveyor/build.bat
index 3a18cea65..fa4e48ecc 100644
--- a/.appveyor/build.bat
+++ b/.appveyor/build.bat
@@ -38,6 +38,12 @@ REM Run `fetch` through cmd /c since fetch is a batch file that seems to call ex
 cmd /c fetch crashpad
 cd crashpad
 cmd /c gn gen out/Default
+
+REM Patch to build a dynamic release instead of a static release
+ren out\Default\toolchain.ninja toolchain.ninja.old
+sed "s/${cflags_c}/${cflags_c} \/MD/g" out\Default\toolchain.ninja.old > out\Default\toolchain.ninja
+
+REM Build Crashpad
 ninja.exe -C out/Default
 cd ..
 
@@ -67,28 +73,7 @@ copy ..\app\crashhandler.exe .
 copy ..\crashpad\out\Default\crashpad_handler.exe .
 windeployqt olive-editor.exe
 copy ..\%FFMPEG_VER%-shared\bin\*.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\OpenColorIO.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\OpenImageIO.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\yaml-cpp.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\Half-2_3.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\Iex-2_3.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\IexMath-2_3.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\IlmImf-2_3.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\IlmImfUtil-2_3.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\IlmThread-2_3.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\Imath-2_3.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\*.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\*.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\*.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\*.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\libpng16.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\jpeg62.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\tiff.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\zlib1.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\lzma.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\boost_date_time-vc141-mt-x64-1_72.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\boost_filesystem-vc141-mt-x64-1_72.dll .
-copy C:\Tools\vcpkg\installed\x64-windows\bin\boost_thread-vc141-mt-x64-1_72.dll .
+copy ..\app\*.dll .
 
 REM Package done, begin deployment
 cd ..

From b3e30b8dafb140d483e7456ecf82717afc6f6f14 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 16 Aug 2020 16:50:23 +1000
Subject: [PATCH 134/138] renderer: clear auto-cache tasks when disconnecting
 viewer node

Fixes segfault that could occur when switching sequences.
---
 app/render/backend/renderbackend.cpp | 38 +++++++++++++++++++++++++---
 app/render/backend/renderbackend.h   |  2 +-
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp
index bcca87a21..01d97451d 100644
--- a/app/render/backend/renderbackend.cpp
+++ b/app/render/backend/renderbackend.cpp
@@ -81,6 +81,38 @@ void RenderBackend::SetViewerNode(ViewerOutput *viewer_node)
       ticket->WaitForFinished();
     }
 
+    // Clear autocache lists
+    {
+      // This can be cleared normally (hashes will be discarded and need to be calculated again)
+      autocache_hash_tasks_.clear();
+
+      // We need to wait for these since they work directly on the FrameHashCache. Most of the time
+      // this is fine, but not if the FrameHashCache gets deleted after this function.
+      foreach (QFutureWatcher<void>* watcher, autocache_hash_process_tasks_) {
+        watcher->waitForFinished();
+      }
+      autocache_hash_process_tasks_.clear();
+
+      // This can be cleared normally (frames will be discarded and need to be rendered again)
+      autocache_video_tasks_.clear();
+
+      // This can be cleared normally (PCM data will be discarded and need to be rendered again)
+      autocache_audio_tasks_.clear();
+
+      // We'll need to wait for these since they work directly on the FrameHashCache. Frames will
+      // be in the cache for later use.
+      {
+        QMap<QFutureWatcher<bool>*, QByteArray>::const_iterator i;
+        for (i=autocache_video_download_tasks_.constBegin(); i!=autocache_video_download_tasks_.constEnd(); i++) {
+          i.key()->waitForFinished();
+        }
+        autocache_video_download_tasks_.clear();
+      }
+
+      // No longer caching any hashes
+      autocache_currently_caching_hashes_.clear();
+    }
+
     // Delete all of our copied nodes
     foreach (Node* c, copy_map_) {
       c->deleteLater();
@@ -433,7 +465,7 @@ void RenderBackend::RunNextJob()
 
         QByteArray frame_hash = ticket->property("hash").toByteArray();
         if (!frame_hash.isEmpty()) {
-          currently_caching_hashes_.append(frame_hash);
+          autocache_currently_caching_hashes_.append(frame_hash);
         }
         break;
       }
@@ -618,7 +650,7 @@ void RenderBackend::AutoCacheVideoDownloaded()
       if (watcher->result()) {
         const QByteArray& hash = autocache_video_download_tasks_.value(watcher);
 
-        currently_caching_hashes_.removeOne(hash);
+        autocache_currently_caching_hashes_.removeOne(hash);
 
         viewer_node_->video_frame_cache()->ValidateFramesWithHash(hash);
       } else {
@@ -812,7 +844,7 @@ void RenderBackend::AutoCacheRequeueFrames()
       if (t >= using_range.in()
           && t < using_range.out()
           && !queued_hashes.contains(hash)
-          && !currently_caching_hashes_.contains(hash)) {
+          && !autocache_currently_caching_hashes_.contains(hash)) {
         // Don't render any hash more than once
         queued_hashes.append(hash);
 
diff --git a/app/render/backend/renderbackend.h b/app/render/backend/renderbackend.h
index aaaeab98f..3ec853bbc 100644
--- a/app/render/backend/renderbackend.h
+++ b/app/render/backend/renderbackend.h
@@ -212,7 +212,7 @@ private:
 
   QMap<QFutureWatcher<bool>*, QByteArray> autocache_video_download_tasks_;
 
-  QVector<QByteArray> currently_caching_hashes_;
+  QVector<QByteArray> autocache_currently_caching_hashes_;
 
 private slots:
   void WorkerFinished();

From 0f3a60aa49e9a19f28d8c0f510cbbc5bee085d52 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 16 Aug 2020 17:08:04 +1000
Subject: [PATCH 135/138] cache: save disk cache index on a regular interval in
 case of crashing

DiskManager tries to keep track of all files made across sessions in an
index, but the index was only saved on close. This meant if the program
crashed (not an uncommon occurrence at the moment), it would "forget" about
any files it had made that session.
---
 app/config/config.cpp      | 1 +
 app/render/diskmanager.cpp | 9 +++++++++
 app/render/diskmanager.h   | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/app/config/config.cpp b/app/config/config.cpp
index 4cf0aa63c..4bf04fc9b 100644
--- a/app/config/config.cpp
+++ b/app/config/config.cpp
@@ -67,6 +67,7 @@ void Config::SetDefaults()
   SetEntryInternal(QStringLiteral("HoverFocus"), NodeParam::kBoolean, false);
   SetEntryInternal(QStringLiteral("AudioScrubbing"), NodeParam::kBoolean, true);
   SetEntryInternal(QStringLiteral("AutorecoveryInterval"), NodeParam::kInt, 1);
+  SetEntryInternal(QStringLiteral("DiskCacheSaveInterval"), NodeParam::kInt, 10000);
   SetEntryInternal(QStringLiteral("Language"), NodeParam::kString, QLocale::system().name());
   SetEntryInternal(QStringLiteral("ScrollZooms"), NodeParam::kBoolean, false);
   SetEntryInternal(QStringLiteral("EnableSeekToImport"), NodeParam::kBoolean, false);
diff --git a/app/render/diskmanager.cpp b/app/render/diskmanager.cpp
index 2cdbf2024..bd75bf077 100644
--- a/app/render/diskmanager.cpp
+++ b/app/render/diskmanager.cpp
@@ -189,6 +189,10 @@ DiskCacheFolder::DiskCacheFolder(const QString &path, QObject *parent) :
   QObject(parent)
 {
   SetPath(path);
+
+  save_timer_.setInterval(Config::Current()[QStringLiteral("DiskCacheSaveInterval")].toInt());
+  connect(&save_timer_, &QTimer::timeout, this, &DiskCacheFolder::SaveDiskCacheIndex);
+  save_timer_.start();
 }
 
 DiskCacheFolder::~DiskCacheFolder()
@@ -335,6 +339,11 @@ void DiskCacheFolder::CloseCacheFolder()
   }
 
   // Save current cache index
+  SaveDiskCacheIndex();
+}
+
+void DiskCacheFolder::SaveDiskCacheIndex()
+{
   QFile cache_index_file(index_path_);
 
   if (cache_index_file.open(QFile::WriteOnly)) {
diff --git a/app/render/diskmanager.h b/app/render/diskmanager.h
index 71ff30bac..9064a0d33 100644
--- a/app/render/diskmanager.h
+++ b/app/render/diskmanager.h
@@ -24,6 +24,7 @@
 #include <QMap>
 #include <QMutex>
 #include <QObject>
+#include <QTimer>
 
 #include "common/define.h"
 #include "project/project.h"
@@ -97,6 +98,11 @@ private:
 
   bool clear_on_close_;
 
+  QTimer save_timer_;
+
+private slots:
+  void SaveDiskCacheIndex();
+
 };
 
 class DiskManager : public QObject

From 383c0b6620b7ae726d8f5f7d04b3f50630629d53 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 16 Aug 2020 17:31:56 +1000
Subject: [PATCH 136/138] node: hash based on stream timebase units

---
 app/node/node.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/node/node.cpp b/app/node/node.cpp
index ec38c7fdb..f54822bfb 100644
--- a/app/node/node.cpp
+++ b/app/node/node.cpp
@@ -24,6 +24,7 @@
 #include <QDebug>
 #include <QFile>
 
+#include "common/timecodefunctions.h"
 #include "common/xmlutils.h"
 #include "project/project.h"
 #include "project/item/footage/footage.h"
@@ -378,11 +379,15 @@ void Node::Hash(QCryptographicHash &hash, const rational& time) const
 
         // Footage timestamp
         if (stream->type() == Stream::kVideo) {
-          hash.addData(QStringLiteral("%1/%2").arg(QString::number(input_time.numerator()),
-                                                   QString::number(input_time.denominator())).toUtf8());
+          VideoStreamPtr video_stream = std::static_pointer_cast<VideoStream>(stream);
 
-          hash.addData(QString::number(static_cast<VideoStream*>(stream.get())->start_time()).toUtf8());
+          int64_t video_ts = Timecode::time_to_timestamp(input_time, video_stream->timebase());
 
+          // Add timestamp in units of the video stream's timebase
+          hash.addData(reinterpret_cast<const char*>(&video_ts), sizeof(int64_t));
+
+          // Add start time - used for both image sequences and video streams
+          hash.addData(QString::number(video_stream->start_time()).toUtf8());
         }
       }
     }

From e0439761894d6856595318782271a84ebcf77e3c Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sun, 16 Aug 2020 17:32:20 +1000
Subject: [PATCH 137/138] footage: allow changing an image sequence's frame
 rate

---
 .../videostreamproperties.cpp                 | 23 ++++++++++++++++---
 .../streamproperties/videostreamproperties.h  |  9 ++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
index 17f4e83eb..f42da0d1a 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
@@ -110,6 +110,14 @@ VideoStreamProperties::VideoStreamProperties(ImageStreamPtr stream) :
     imgseq_end_time_->SetValue(video_stream->start_time() + video_stream->duration() - 1);
     imgseq_layout->addWidget(imgseq_end_time_, imgseq_row, 1);
 
+    imgseq_row++;
+
+    imgseq_layout->addWidget(new QLabel(tr("Frame Rate:")), imgseq_row, 0);
+
+    imgseq_frame_rate_ = new FrameRateComboBox();
+    imgseq_frame_rate_->SetFrameRate(video_stream->frame_rate());
+    imgseq_layout->addWidget(imgseq_frame_rate_, imgseq_row, 1);
+
     video_layout->addWidget(imgseq_group, row, 0, 1, 2);
   }
 }
@@ -141,10 +149,12 @@ void VideoStreamProperties::Accept(QUndoCommand *parent)
     int64_t new_dur = imgseq_end_time_->GetValue() - imgseq_start_time_->GetValue() + 1;
 
     if (video_stream->start_time() != imgseq_start_time_->GetValue()
-        || video_stream->duration() != new_dur) {
+        || video_stream->duration() != new_dur
+        || video_stream->frame_rate() != imgseq_frame_rate_->GetFrameRate()) {
       new ImageSequenceChangeCommand(video_stream,
                                      imgseq_start_time_->GetValue(),
                                      new_dur,
+                                     imgseq_frame_rate_->GetFrameRate(),
                                      parent);
     }
   }
@@ -211,11 +221,12 @@ void VideoStreamProperties::VideoStreamChangeCommand::undo_internal()
   stream_->set_pixel_aspect_ratio(old_pixel_ar_);
 }
 
-VideoStreamProperties::ImageSequenceChangeCommand::ImageSequenceChangeCommand(VideoStreamPtr video_stream, int64_t start_index, int64_t duration, QUndoCommand *parent) :
+VideoStreamProperties::ImageSequenceChangeCommand::ImageSequenceChangeCommand(VideoStreamPtr video_stream, int64_t start_index, int64_t duration, const rational &frame_rate, QUndoCommand *parent) :
   UndoCommand(parent),
   video_stream_(video_stream),
   new_start_index_(start_index),
-  new_duration_(duration)
+  new_duration_(duration),
+  new_frame_rate_(frame_rate)
 {
 }
 
@@ -231,12 +242,18 @@ void VideoStreamProperties::ImageSequenceChangeCommand::redo_internal()
 
   old_duration_ = video_stream_->duration();
   video_stream_->set_duration(new_duration_);
+
+  old_frame_rate_ = video_stream_->frame_rate();
+  video_stream_->set_frame_rate(new_frame_rate_);
+  video_stream_->set_timebase(new_frame_rate_.flipped());
 }
 
 void VideoStreamProperties::ImageSequenceChangeCommand::undo_internal()
 {
   video_stream_->set_start_time(old_start_index_);
   video_stream_->set_duration(old_duration_);
+  video_stream_->set_frame_rate(old_frame_rate_);
+  video_stream_->set_timebase(old_frame_rate_.flipped());
 }
 
 OLIVE_NAMESPACE_EXIT
diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.h b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
index 5926fb77b..e26a2e5bb 100644
--- a/app/dialog/footageproperties/streamproperties/videostreamproperties.h
+++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.h
@@ -74,6 +74,11 @@ private:
    */
   IntegerSlider* imgseq_end_time_;
 
+  /**
+   * @brief Sets the frame rate for image sequences
+   */
+  FrameRateComboBox* imgseq_frame_rate_;
+
   /**
    * @brief Sets the pixel aspect ratio of the stream
    */
@@ -114,6 +119,7 @@ private:
     ImageSequenceChangeCommand(VideoStreamPtr video_stream,
                                int64_t start_index,
                                int64_t duration,
+                               const rational& frame_rate,
                                QUndoCommand* parent = nullptr);
 
     virtual Project* GetRelevantProject() const override;
@@ -131,6 +137,9 @@ private:
     int64_t new_duration_;
     int64_t old_duration_;
 
+    rational new_frame_rate_;
+    rational old_frame_rate_;
+
   };
 
 };

From 078c54e58bded6ab6227a01f55a77e43b4eedafa Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 17 Aug 2020 00:00:51 +1000
Subject: [PATCH 138/138] projectloadtask: move the project to the main thread,
 not the task

How did this get overlooked for so damn long holy shit dude
---
 app/task/project/load/load.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/task/project/load/load.cpp b/app/task/project/load/load.cpp
index 27dff9e11..3d945023a 100644
--- a/app/task/project/load/load.cpp
+++ b/app/task/project/load/load.cpp
@@ -56,7 +56,7 @@ bool ProjectLoadTask::Run()
             project->Load(&reader, &layout, &IsCancelled());
 
             // Ensure project is in main thread
-            moveToThread(qApp->thread());
+            project->moveToThread(qApp->thread());
 
             if (!IsCancelled()) {
               projects_.append(project);