From 2e38e7e3fb942687c4ea3ccb8eb70e0b4544d119 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 21 Feb 2020 10:47:41 +1100 Subject: [PATCH] indexmanager: moved files --- app/codec/decoder.cpp | 2 +- app/core.cpp | 2 +- app/render/CMakeLists.txt | 2 -- app/render/backend/CMakeLists.txt | 2 ++ app/render/backend/audiorenderbackend.cpp | 2 +- app/render/{ => backend}/indexmanager.cpp | 0 app/render/{ => backend}/indexmanager.h | 0 app/render/backend/renderbackend.cpp | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename app/render/{ => backend}/indexmanager.cpp (100%) rename app/render/{ => backend}/indexmanager.h (100%) diff --git a/app/codec/decoder.cpp b/app/codec/decoder.cpp index 9c4c234b6..52a9fdbdb 100644 --- a/app/codec/decoder.cpp +++ b/app/codec/decoder.cpp @@ -29,7 +29,7 @@ #include "codec/oiio/oiiodecoder.h" #include "codec/waveinput.h" #include "codec/waveoutput.h" -#include "render/indexmanager.h" +#include "render/backend/indexmanager.h" #include "task/index/index.h" #include "task/taskmanager.h" diff --git a/app/core.cpp b/app/core.cpp index 1e330e479..ce5cdae06 100644 --- a/app/core.cpp +++ b/app/core.cpp @@ -46,10 +46,10 @@ #include "project/projectsavemanager.h" #include "project/item/footage/footage.h" #include "project/item/sequence/sequence.h" +#include "render/backend/indexmanager.h" #include "render/backend/opengl/opengltexturecache.h" #include "render/colormanager.h" #include "render/diskmanager.h" -#include "render/indexmanager.h" #include "render/pixelservice.h" #include "task/taskmanager.h" #include "ui/style/style.h" diff --git a/app/render/CMakeLists.txt b/app/render/CMakeLists.txt index 1ca468f04..99225da03 100644 --- a/app/render/CMakeLists.txt +++ b/app/render/CMakeLists.txt @@ -26,8 +26,6 @@ set(OLIVE_SOURCES render/colorprocessor.cpp render/diskmanager.h render/diskmanager.cpp - render/indexmanager.h - render/indexmanager.cpp render/pixelformat.h render/pixelformat.cpp render/pixelservice.h diff --git a/app/render/backend/CMakeLists.txt b/app/render/backend/CMakeLists.txt index 07169fe64..7309a482c 100644 --- a/app/render/backend/CMakeLists.txt +++ b/app/render/backend/CMakeLists.txt @@ -32,6 +32,8 @@ set(OLIVE_SOURCES render/backend/audiorenderbackend.cpp render/backend/audiorenderworker.h render/backend/audiorenderworker.cpp + render/backend/indexmanager.h + render/backend/indexmanager.cpp render/backend/videorenderbackend.h render/backend/videorenderbackend.cpp diff --git a/app/render/backend/audiorenderbackend.cpp b/app/render/backend/audiorenderbackend.cpp index c1f0635d6..79f7e0d8f 100644 --- a/app/render/backend/audiorenderbackend.cpp +++ b/app/render/backend/audiorenderbackend.cpp @@ -5,7 +5,7 @@ #include "audiorenderworker.h" #include "common/filefunctions.h" -#include "render/indexmanager.h" +#include "render/backend/indexmanager.h" AudioRenderBackend::AudioRenderBackend(QObject *parent) : RenderBackend(parent) diff --git a/app/render/indexmanager.cpp b/app/render/backend/indexmanager.cpp similarity index 100% rename from app/render/indexmanager.cpp rename to app/render/backend/indexmanager.cpp diff --git a/app/render/indexmanager.h b/app/render/backend/indexmanager.h similarity index 100% rename from app/render/indexmanager.h rename to app/render/backend/indexmanager.h diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp index bbdeff699..9efe7937f 100644 --- a/app/render/backend/renderbackend.cpp +++ b/app/render/backend/renderbackend.cpp @@ -4,7 +4,7 @@ #include #include "core.h" -#include "render/indexmanager.h" +#include "render/backend/indexmanager.h" #include "window/mainwindow/mainwindow.h" RenderBackend::RenderBackend(QObject *parent) :