commit bc6df44c7511bcc535ae0a212169fd82846718de
parent bb7a046f8056de15265675b666a43b96f9ad7d85
Author: Matt Demanett <matt@demanett.net>
Date: Thu, 11 Jan 2018 01:16:28 -0500
Straighten out dsp headers.
Diffstat:
20 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ FLAGS += -DEXPERIMENTAL=1
endif
SOURCES = $(wildcard src/*.cpp src/dsp/*cpp)
-CXXFLAGS += -Isrc/dsp
+CXXFLAGS += -Isrc -Isrc/dsp
include ../../plugin.mk
@@ -19,7 +19,7 @@ BENCHMARK_DEPS = $(patsubst %, build/%.d, $(BENCHMARK_SOURCES))
benchmark: $(BENCHMARK_OBJECTS)
$(CXX) -o $@ $^ ../../build/src/util.cpp.o -lbenchmark -lpthread
benchmark_clean:
- rm -f benchmark
+ rm -f benchmark $(BENCHMARK_OBJECTS)
clean: benchmark_clean
distprep:
diff --git a/benchmarks/analyzer.cpp b/benchmarks/analyzer.cpp
@@ -1,7 +1,7 @@
#include <benchmark/benchmark.h>
-#include <dsp.hpp>
+#include "dsp/analyzer.hpp"
using namespace bogaudio::dsp;
diff --git a/benchmarks/buffer.cpp b/benchmarks/buffer.cpp
@@ -1,7 +1,7 @@
#include <benchmark/benchmark.h>
-#include <dsp.hpp>
+#include "dsp/buffer.hpp"
using namespace bogaudio::dsp;
diff --git a/benchmarks/noise.cpp b/benchmarks/noise.cpp
@@ -1,7 +1,7 @@
#include <benchmark/benchmark.h>
-#include <dsp.hpp>
+#include "dsp/noise.hpp"
using namespace bogaudio::dsp;
diff --git a/benchmarks/oscillator.cpp b/benchmarks/oscillator.cpp
@@ -1,7 +1,7 @@
#include <benchmark/benchmark.h>
-#include <dsp.hpp>
+#include "dsp/oscillator.hpp"
using namespace bogaudio::dsp;
diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp
@@ -1,6 +1,6 @@
#include "bogaudio.hpp"
-#include "dsp/dsp.hpp"
+#include "dsp/analyzer.hpp"
using namespace bogaudio::dsp;
diff --git a/src/Noise.cpp b/src/Noise.cpp
@@ -1,6 +1,6 @@
#include "bogaudio.hpp"
-#include "dsp/dsp.hpp"
+#include "dsp/noise.hpp"
using namespace bogaudio::dsp;
diff --git a/src/Reftone.cpp b/src/Reftone.cpp
@@ -1,6 +1,6 @@
#include "bogaudio.hpp"
-#include "dsp/dsp.hpp"
+#include "dsp/oscillator.hpp"
using namespace bogaudio::dsp;
diff --git a/src/SampleHold.cpp b/src/SampleHold.cpp
@@ -1,6 +1,6 @@
#include "bogaudio.hpp"
-#include "dsp/dsp.hpp"
+#include "dsp/noise.hpp"
using namespace bogaudio::dsp;
diff --git a/src/Test.cpp b/src/Test.cpp
@@ -1,6 +1,6 @@
#include "bogaudio.hpp"
-#include "dsp/dsp.hpp"
+#include "dsp/filter.hpp"
using namespace bogaudio::dsp;
diff --git a/src/dsp/analyzer.hpp b/src/dsp/analyzer.hpp
@@ -1,8 +1,12 @@
+#pragma once
+#include "assert.h"
#include <math.h>
#include "ffft/FFTReal.h"
+#include "buffer.hpp"
+
namespace bogaudio {
namespace dsp {
diff --git a/src/dsp/base.hpp b/src/dsp/base.hpp
@@ -1,3 +1,4 @@
+#pragma once
namespace bogaudio {
namespace dsp {
diff --git a/src/dsp/buffer.hpp b/src/dsp/buffer.hpp
@@ -1,4 +1,7 @@
+#pragma once
+#include "assert.h"
+#include "math.h"
#include <algorithm>
namespace bogaudio {
diff --git a/src/dsp/dsp.hpp b/src/dsp/dsp.hpp
@@ -1,10 +0,0 @@
-
-#include "rack.hpp"
-
-#include "base.hpp"
-#include "buffer.hpp"
-
-#include "analyzer.hpp"
-#include "filter.hpp"
-#include "oscillator.hpp"
-#include "noise.hpp"
diff --git a/src/dsp/filter.cpp b/src/dsp/filter.cpp
@@ -1,7 +1,7 @@
#include <math.h>
-#include "dsp.hpp"
+#include "filter.hpp"
using namespace bogaudio::dsp;
diff --git a/src/dsp/filter.hpp b/src/dsp/filter.hpp
@@ -1,3 +1,4 @@
+#pragma once
namespace bogaudio {
namespace dsp {
diff --git a/src/dsp/noise.cpp b/src/dsp/noise.cpp
@@ -1,5 +1,5 @@
-#include "dsp.hpp"
+#include "noise.hpp"
using namespace bogaudio::dsp;
diff --git a/src/dsp/noise.hpp b/src/dsp/noise.hpp
@@ -1,6 +1,9 @@
+#pragma once
#include <random>
+#include "base.hpp"
+
namespace bogaudio {
namespace dsp {
diff --git a/src/dsp/oscillator.cpp b/src/dsp/oscillator.cpp
@@ -1,6 +1,6 @@
#include <math.h>
-#include "dsp.hpp"
+#include "oscillator.hpp"
using namespace bogaudio::dsp;
diff --git a/src/dsp/oscillator.hpp b/src/dsp/oscillator.hpp
@@ -1,3 +1,6 @@
+#pragma once
+
+#include "base.hpp"
namespace bogaudio {
namespace dsp {
