From 1b0797952e86d84769f1afd45d604dbdcce6c426 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Thu, 1 Feb 2018 22:37:07 -0500 Subject: [PATCH] Rename util.hpp to common.hpp, fix include paths --- include/dsp/filter.hpp | 2 +- include/dsp/fir.hpp | 3 ++- include/dsp/vumeter.hpp | 2 +- include/engine.hpp | 2 +- include/midi.hpp | 2 +- include/rack.hpp | 5 ++--- include/util/{util.hpp => common.hpp} | 5 +++++ include/widgets.hpp | 2 +- src/asset.cpp | 3 +-- src/audio.cpp | 3 +-- src/main.cpp | 2 +- src/util/logger.cpp | 2 +- src/util/random.cpp | 2 +- src/util/request.cpp | 2 +- src/util/string.cpp | 2 +- src/util/system.cpp | 2 +- 16 files changed, 22 insertions(+), 19 deletions(-) rename include/util/{util.hpp => common.hpp} (96%) diff --git a/include/dsp/filter.hpp b/include/dsp/filter.hpp index a29785bd..f2e9eb2a 100644 --- a/include/dsp/filter.hpp +++ b/include/dsp/filter.hpp @@ -1,6 +1,6 @@ #pragma once -#include "math.hpp" +#include "util/math.hpp" namespace rack { diff --git a/include/dsp/fir.hpp b/include/dsp/fir.hpp index f82d6fdf..391658be 100644 --- a/include/dsp/fir.hpp +++ b/include/dsp/fir.hpp @@ -1,4 +1,5 @@ #pragma once +#include "dsp/functions.hpp" namespace rack { @@ -30,7 +31,7 @@ inline void blackmanHarrisWindow(float *x, int n) { inline void boxcarFIR(float *x, int n, float cutoff) { for (int i = 0; i < n; i++) { float t = (float)i / (n - 1) * 2.0 - 1.0; - x[i] = sincf(t * n * cutoff); + x[i] = sinc(t * n * cutoff); } } diff --git a/include/dsp/vumeter.hpp b/include/dsp/vumeter.hpp index 73792c81..e1278ad9 100644 --- a/include/dsp/vumeter.hpp +++ b/include/dsp/vumeter.hpp @@ -1,6 +1,6 @@ #pragma once -#include "math.hpp" +#include "util/math.hpp" namespace rack { diff --git a/include/engine.hpp b/include/engine.hpp index 0183106c..ef102e7c 100644 --- a/include/engine.hpp +++ b/include/engine.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include "util/util.hpp" +#include "util/common.hpp" #include diff --git a/include/midi.hpp b/include/midi.hpp index 4c607f97..70af314c 100644 --- a/include/midi.hpp +++ b/include/midi.hpp @@ -1,6 +1,6 @@ #pragma once -#include "util/util.hpp" +#include "util/common.hpp" #include #include #include diff --git a/include/rack.hpp b/include/rack.hpp index e7fa60bc..027e3c50 100644 --- a/include/rack.hpp +++ b/include/rack.hpp @@ -1,10 +1,10 @@ #pragma once -#include "util/util.hpp" +// Include headers that plugins will likely use, for convenience +#include "util/common.hpp" #include "asset.hpp" #include "plugin.hpp" #include "engine.hpp" -#include "gui.hpp" #include "app.hpp" #include "componentlibrary.hpp" @@ -16,7 +16,6 @@ namespace rack { // helpers //////////////////// - template Model *createModel(std::string manufacturer, std::string slug, std::string name, Tags... tags) { struct TModel : Model { diff --git a/include/util/util.hpp b/include/util/common.hpp similarity index 96% rename from include/util/util.hpp rename to include/util/common.hpp index ec2d259b..76fa42d0 100644 --- a/include/util/util.hpp +++ b/include/util/common.hpp @@ -11,6 +11,7 @@ #include #include +// Include math utilities for convenience #include "util/math.hpp" @@ -67,6 +68,7 @@ T *construct(F f, V v, Args... args) { } //////////////////// +// Random number generator // random.cpp //////////////////// @@ -80,6 +82,7 @@ float randomf(); float randomNormal(); //////////////////// +// String utilities // string.cpp //////////////////// @@ -97,6 +100,7 @@ std::string extractFilename(std::string path); std::string extractExtension(std::string path); //////////////////// +// Operating-system specific utilities // system.cpp //////////////////// @@ -107,6 +111,7 @@ May block, so open in a new thread. void openBrowser(std::string url); //////////////////// +// Debug logger // logger.cpp //////////////////// diff --git a/include/widgets.hpp b/include/widgets.hpp index 606cb649..50ea9ff5 100644 --- a/include/widgets.hpp +++ b/include/widgets.hpp @@ -6,7 +6,7 @@ #include "../ext/oui-blendish/blendish.h" #include "../ext/nanosvg/src/nanosvg.h" -#include "util/util.hpp" +#include "util/common.hpp" #include "events.hpp" diff --git a/src/asset.cpp b/src/asset.cpp index 31d9f7db..64613b35 100644 --- a/src/asset.cpp +++ b/src/asset.cpp @@ -1,6 +1,5 @@ #include "asset.hpp" -#include "util/util.hpp" -#include +#include "util/common.hpp" #include // for mkdir #include "../ext/osdialog/osdialog.h" diff --git a/src/audio.cpp b/src/audio.cpp index 75edf9d6..c572cb09 100644 --- a/src/audio.cpp +++ b/src/audio.cpp @@ -1,5 +1,4 @@ -#include "util/util.hpp" -#include "util/math.hpp" +#include "util/common.hpp" #include "audio.hpp" diff --git a/src/main.cpp b/src/main.cpp index d83a51c7..0f7c0b9c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -#include "util/util.hpp" +#include "util/common.hpp" #include "engine.hpp" #include "gui.hpp" #include "app.hpp" diff --git a/src/util/logger.cpp b/src/util/logger.cpp index c4c3b1bb..1c6d8963 100644 --- a/src/util/logger.cpp +++ b/src/util/logger.cpp @@ -1,4 +1,4 @@ -#include "util/util.hpp" +#include "util/common.hpp" #include diff --git a/src/util/random.cpp b/src/util/random.cpp index 33748634..57cd864a 100644 --- a/src/util/random.cpp +++ b/src/util/random.cpp @@ -1,4 +1,4 @@ -#include "util/util.hpp" +#include "util/common.hpp" #include #include diff --git a/src/util/request.cpp b/src/util/request.cpp index cd818999..9579aea5 100644 --- a/src/util/request.cpp +++ b/src/util/request.cpp @@ -1,4 +1,4 @@ -#include "util/util.hpp" +#include "util/common.hpp" #include "util/request.hpp" #include #include diff --git a/src/util/string.cpp b/src/util/string.cpp index a4c65c57..e2a1b77c 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -1,4 +1,4 @@ -#include "util/util.hpp" +#include "util/common.hpp" #include #include #include // for dirname and basename diff --git a/src/util/system.cpp b/src/util/system.cpp index e2239c00..dcc63774 100644 --- a/src/util/system.cpp +++ b/src/util/system.cpp @@ -1,4 +1,4 @@ -#include "util/util.hpp" +#include "util/common.hpp" #if ARCH_WIN #include