From 4476a8d858a9a5d9495a69e51d5f0e1652a50b24 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Sat, 22 Jan 2022 17:15:23 -0800 Subject: [PATCH] consolidate cpu optimizations into single header --- app/audio/audiovisualwaveform.cpp | 7 +------ app/common/cpuoptimize.h | 30 ++++++++++++++++++++++++++++++ app/node/generator/text/text.cpp | 7 +------ app/node/math/math/mathbase.cpp | 7 +------ 4 files changed, 33 insertions(+), 18 deletions(-) create mode 100644 app/common/cpuoptimize.h diff --git a/app/audio/audiovisualwaveform.cpp b/app/audio/audiovisualwaveform.cpp index 0b4ee44e6..af439bca0 100644 --- a/app/audio/audiovisualwaveform.cpp +++ b/app/audio/audiovisualwaveform.cpp @@ -23,13 +23,8 @@ #include #include -#if defined(Q_PROCESSOR_X86) -#include -#elif defined(Q_PROCESSOR_ARM) -#include -#endif - #include "config/config.h" +#include "common/cpuoptimize.h" #include "common/functiontimer.h" namespace olive { diff --git a/app/common/cpuoptimize.h b/app/common/cpuoptimize.h new file mode 100644 index 000000000..2b9d009e4 --- /dev/null +++ b/app/common/cpuoptimize.h @@ -0,0 +1,30 @@ +/*** + + Olive - Non-Linear Video Editor + Copyright (C) 2021 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 . + +***/ + +#ifndef CPUOPTIMIZE_H +#define CPUOPTIMIZE_H + +#if defined(Q_PROCESSOR_X86) +#include +#elif defined(Q_PROCESSOR_ARM) +#include +#endif + +#endif // CPUOPTIMIZE_H diff --git a/app/node/generator/text/text.cpp b/app/node/generator/text/text.cpp index 458740523..b2eb1e0a2 100644 --- a/app/node/generator/text/text.cpp +++ b/app/node/generator/text/text.cpp @@ -24,12 +24,7 @@ #include #include -#if defined(Q_PROCESSOR_X86) -#include -#elif defined(Q_PROCESSOR_ARM) -#include -#endif - +#include "common/cpuoptimize.h" #include "common/functiontimer.h" namespace olive { diff --git a/app/node/math/math/mathbase.cpp b/app/node/math/math/mathbase.cpp index c8e3880ad..7043b2f2f 100644 --- a/app/node/math/math/mathbase.cpp +++ b/app/node/math/math/mathbase.cpp @@ -23,12 +23,7 @@ #include #include -#if defined(Q_PROCESSOR_X86) -#include -#elif defined(Q_PROCESSOR_ARM) -#include -#endif - +#include "common/cpuoptimize.h" #include "common/tohex.h" #include "node/distort/transform/transformdistortnode.h" #include "render/color.h"