From 401de26733411c2bbae3044212ac6bada65fb5d1 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 21 Dec 2019 20:07:14 +1100 Subject: [PATCH] updated other classes for the previous commit's file moving --- app/render/backend/opengl/opengltexture.h | 3 ++- app/render/colormanager.h | 2 +- app/render/colorprocessor.h | 2 +- app/render/pixelservice.h | 2 +- app/task/probe/probe.cpp | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/render/backend/opengl/opengltexture.h b/app/render/backend/opengl/opengltexture.h index 8a1631845..c7a801729 100644 --- a/app/render/backend/opengl/opengltexture.h +++ b/app/render/backend/opengl/opengltexture.h @@ -24,8 +24,8 @@ #include #include +#include "codec/frame.h" #include "common/constructors.h" -#include "decoder/frame.h" #include "render/pixelformat.h" /** @@ -76,6 +76,7 @@ private: int height_; olive::PixelFormat format_; + }; using OpenGLTexturePtr = std::shared_ptr; diff --git a/app/render/colormanager.h b/app/render/colormanager.h index c93ac38b3..8c2270026 100644 --- a/app/render/colormanager.h +++ b/app/render/colormanager.h @@ -3,8 +3,8 @@ #include +#include "codec/frame.h" #include "colorprocessor.h" -#include "decoder/frame.h" class ColorManager : public QObject { diff --git a/app/render/colorprocessor.h b/app/render/colorprocessor.h index 54abc6613..df1d5d971 100644 --- a/app/render/colorprocessor.h +++ b/app/render/colorprocessor.h @@ -4,8 +4,8 @@ #include namespace OCIO = OCIO_NAMESPACE::v1; +#include "codec/frame.h" #include "common/constructors.h" -#include "decoder/frame.h" class ColorProcessor; diff --git a/app/render/pixelservice.h b/app/render/pixelservice.h index 2cda454eb..94c4331a3 100644 --- a/app/render/pixelservice.h +++ b/app/render/pixelservice.h @@ -25,7 +25,7 @@ #include #include -#include "decoder/frame.h" +#include "codec/frame.h" #include "pixelformat.h" /** diff --git a/app/task/probe/probe.cpp b/app/task/probe/probe.cpp index 297b16bee..388231c2c 100644 --- a/app/task/probe/probe.cpp +++ b/app/task/probe/probe.cpp @@ -22,7 +22,7 @@ #include -#include "decoder/decoder.h" +#include "codec/decoder.h" ProbeTask::ProbeTask(FootagePtr footage) : footage_(footage)