From e03e0007e40a111e3d6d0c9994003f09823cc4d5 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 31 Oct 2019 20:11:08 +1100 Subject: [PATCH] adjusted viewer widget --- app/widget/viewer/viewer.cpp | 1 - app/widget/viewer/viewer.h | 2 -- app/widget/viewer/viewerglwidget.cpp | 6 +++--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp index 78f1ab284..eccab0b0b 100644 --- a/app/widget/viewer/viewer.cpp +++ b/app/widget/viewer/viewer.cpp @@ -32,7 +32,6 @@ ViewerWidget::ViewerWidget(QWidget *parent) : QWidget(parent), - video_renderer_(nullptr), viewer_node_(nullptr), playback_speed_(0) { diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h index e02c97d8a..6ddf206c4 100644 --- a/app/widget/viewer/viewer.h +++ b/app/widget/viewer/viewer.h @@ -110,9 +110,7 @@ private: void PushScrubbedAudio(); - // FIXME: Test code only VideoRendererProcessor* video_renderer_; - // End test code ViewerSizer* sizer_; diff --git a/app/widget/viewer/viewerglwidget.cpp b/app/widget/viewer/viewerglwidget.cpp index 35b98d508..6b614cacc 100644 --- a/app/widget/viewer/viewerglwidget.cpp +++ b/app/widget/viewer/viewerglwidget.cpp @@ -88,9 +88,9 @@ void ViewerGLWidget::SetupPipeline() { // Re-retrieve pipeline pertaining to this context pipeline_ = OpenGLShader::CreateOCIO(context(), - ocio_lut_, - color_service_->GetProcessor(), - true); + ocio_lut_, + color_service_->GetProcessor(), + true); } void ViewerGLWidget::RefreshColorSettings()