finished upgrade to ocio v2

app/widget/manageddisplay/manageddisplay.cpp

@@ -23,7 +23,7 @@
 #include <QHBoxLayout>
 #include <QMessageBox>
 
-#include "render/backend/opengl/openglrenderer.h"
+#include "render/opengl/openglrenderer.h"
 #include "render/rendermanager.h"
 
 OLIVE_NAMESPACE_ENTER

app/widget/manageddisplay/manageddisplay.h

@@ -23,8 +23,8 @@
 
 #include <QOpenGLWidget>
 
-#include "render/backend/renderer.h"
 #include "render/colormanager.h"
+#include "render/renderer.h"
 #include "widget/menu/menu.h"
 
 OLIVE_NAMESPACE_ENTER

app/widget/scope/histogram/histogram.cpp

@@ -62,7 +62,7 @@ ShaderCode HistogramScope::GenerateShaderCode()
                     FileFunctions::ReadFileAsString(":/shaders/default.vert"));
 }
 
-void HistogramScope::DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline)
+void HistogramScope::DrawScope(TexturePtr managed_tex, QVariant pipeline)
 {
   float histogram_scale = 0.80f;
   // This value is eyeballed for usefulness. Until we have a geometry

app/widget/scope/histogram/histogram.h

@@ -42,11 +42,11 @@ protected:
   virtual ShaderCode GenerateShaderCode() override;
   QVariant CreateSecondaryShader();
 
-  virtual void DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline) override;
+  virtual void DrawScope(TexturePtr managed_tex, QVariant pipeline) override;
 
 private:
   QVariant pipeline_secondary_;
-  Renderer::TexturePtr texture_row_sums_;
+  TexturePtr texture_row_sums_;
 
 };
 

app/widget/scope/scopebase/scopebase.cpp

@@ -48,7 +48,7 @@ void ScopeBase::showEvent(QShowEvent* e)
   UploadTextureFromBuffer();
 }
 
-void ScopeBase::DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline)
+void ScopeBase::DrawScope(TexturePtr managed_tex, QVariant pipeline)
 {
   ShaderJob job;
 

app/widget/scope/scopebase/scopebase.h

@@ -54,16 +54,16 @@ protected:
    *
    * Override this if your sub-class scope needs extra drawing.
    */
-  virtual void DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline);
+  virtual void DrawScope(TexturePtr managed_tex, QVariant pipeline);
 
 private:
   void UploadTextureFromBuffer();
 
   QVariant pipeline_;
 
-  Renderer::TexturePtr texture_;
+  TexturePtr texture_;
 
-  Renderer::TexturePtr managed_tex_;
+  TexturePtr managed_tex_;
 
   Frame* buffer_;
 

app/widget/scope/waveform/waveform.cpp

@@ -48,7 +48,7 @@ ShaderCode WaveformScope::GenerateShaderCode()
                     FileFunctions::ReadFileAsString(":/shaders/rgbwaveform.vert"));
 }
 
-void WaveformScope::DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline)
+void WaveformScope::DrawScope(TexturePtr managed_tex, QVariant pipeline)
 {
   float waveform_scale = 0.80f;
 

app/widget/scope/waveform/waveform.h

@@ -36,7 +36,7 @@ public:
 protected:
   virtual ShaderCode GenerateShaderCode() override;
 
-  virtual void DrawScope(Renderer::TexturePtr managed_tex, QVariant pipeline) override;
+  virtual void DrawScope(TexturePtr managed_tex, QVariant pipeline) override;
 
 };
 

app/widget/viewer/viewerdisplay.h

@@ -211,7 +211,7 @@ private:
   /**
    * @brief Internal reference to the OpenGL texture to draw. Set in SetTexture() and used in paintGL().
    */
-  Renderer::TexturePtr texture_;
+  TexturePtr texture_;
 
   /**
    * @brief Translation only matrix (defaults to identity).