Audio refactor: move some stuff to detail and combine subdirs

examples/audio.cpp

@@ -10,12 +10,12 @@
 #include <psemek/audio/effect/fade_out.hpp>
 #include <psemek/audio/effect/compressor.hpp>
 #include <psemek/audio/effect/pause.hpp>
-#include <psemek/audio/effect/loop.hpp>
+#include <psemek/audio/combine/loop.hpp>
 #include <psemek/audio/effect/pitch.hpp>
 #include <psemek/audio/effect/distortion.hpp>
-#include <psemek/audio/duplicate.hpp>
-#include <psemek/audio/stereo.hpp>
-#include <psemek/audio/mixer.hpp>
+#include <psemek/audio/combine/duplicate.hpp>
+#include <psemek/audio/combine/stereo.hpp>
+#include <psemek/audio/combine/mixer.hpp>
 #include <psemek/app/app.hpp>
 #include <psemek/app/main.hpp>
 #include <psemek/gfx/painter.hpp>

examples/gravity.cpp

@@ -9,7 +9,7 @@
 #include <psemek/util/to_string.hpp>
 #include <psemek/audio/engine.hpp>
 #include <psemek/audio/constants.hpp>
-#include <psemek/audio/oscillator.hpp>
+#include <psemek/audio/detail/oscillator.hpp>
 #include <psemek/audio/effect/compressor.hpp>
 #include <psemek/prof/profiler.hpp>
 #include <psemek/util/moving_average.hpp>

libs/audio/source/combine/concat.cpp

@@ -1,4 +1,4 @@
-#include <psemek/audio/effect/concat.hpp>
+#include <psemek/audio/combine/concat.hpp>
 
 #include <atomic>
 

libs/audio/source/combine/duplicate.cpp

@@ -1,5 +1,4 @@
-#include <psemek/audio/duplicate.hpp>
-#include <psemek/audio/recorder.hpp>
+#include <psemek/audio/combine/duplicate.hpp>
 
 #include <atomic>
 

libs/audio/source/combine/loop.cpp

@@ -1,5 +1,5 @@
-#include <psemek/audio/effect/loop.hpp>
-#include <psemek/audio/duplicate.hpp>
+#include <psemek/audio/combine/loop.hpp>
+#include <psemek/audio/combine/duplicate.hpp>
 
 namespace psemek::audio
 {

libs/audio/source/combine/mixer.cpp

@@ -1,4 +1,4 @@
-#include <psemek/audio/mixer.hpp>
+#include <psemek/audio/combine/mixer.hpp>
 
 #include <memory>
 #include <vector>

libs/audio/source/combine/stereo.cpp

@@ -1,4 +1,4 @@
-#include <psemek/audio/stereo.hpp>
+#include <psemek/audio/combine/stereo.hpp>
 
 #include <vector>
 

libs/audio/source/detail/resampler.cpp

@@ -1,5 +1,5 @@
-#include <psemek/audio/resampler.hpp>
-#include <psemek/audio/smooth.hpp>
+#include <psemek/audio/detail/resampler.hpp>
+#include <psemek/audio/detail/smooth.hpp>
 #include <psemek/geom/math.hpp>
 
 #include <psemek/log/log.hpp>

libs/audio/source/detail/white_noise.cpp

@@ -1,4 +1,4 @@
-#include <psemek/audio/white_noise.hpp>
+#include <psemek/audio/detail/white_noise.hpp>
 
 #include <psemek/random/generator.hpp>
 #include <psemek/random/uniform.hpp>

libs/audio/source/effect/compressor.cpp

@@ -1,5 +1,5 @@
 #include <psemek/audio/effect/compressor.hpp>
-#include <psemek/audio/smooth.hpp>
+#include <psemek/audio/detail/smooth.hpp>
 #include <psemek/geom/math.hpp>
 #include <psemek/geom/interval.hpp>
 #include <psemek/geom/contains.hpp>

libs/audio/source/effect/pause.cpp

@@ -1,5 +1,5 @@
 #include <psemek/audio/effect/pause.hpp>
-#include <psemek/audio/smooth.hpp>
+#include <psemek/audio/detail/smooth.hpp>
 
 #include <atomic>
 

libs/audio/source/effect/pitch.cpp

@@ -1,5 +1,5 @@
 #include <psemek/audio/effect/pitch.hpp>
-#include <psemek/audio/resampler.hpp>
+#include <psemek/audio/detail/resampler.hpp>
 
 #include <cmath>
 

libs/audio/source/effect/volume_base.cpp

@@ -1,6 +1,6 @@
 #include <psemek/audio/effect/volume_base.hpp>
 #include <psemek/audio/constants.hpp>
-#include <psemek/audio/smooth.hpp>
+#include <psemek/audio/detail/smooth.hpp>
 
 #include <psemek/log/log.hpp>
 

libs/audio/source/track_mp3.cpp

@@ -1,5 +1,5 @@
 #include <psemek/audio/track.hpp>
-#include <psemek/audio/resampler.hpp>
+#include <psemek/audio/detail/resampler.hpp>
 #include <psemek/audio/constants.hpp>
 
 #include <psemek/audio/minimp3/options.h>

libs/audio/source/track_raw.cpp

@@ -1,5 +1,5 @@
 #include <psemek/audio/track.hpp>
-#include <psemek/audio/duplicate.hpp>
+#include <psemek/audio/combine/duplicate.hpp>
 
 namespace psemek::audio
 {

libs/audio/source/track_wav.cpp

@@ -1,5 +1,5 @@
 #include <psemek/audio/track.hpp>
-#include <psemek/audio/duplicate.hpp>
+#include <psemek/audio/combine/duplicate.hpp>
 #include <psemek/audio/constants.hpp>
 #include <psemek/util/to_string.hpp>
 #include <psemek/util/at_scope_exit.hpp>

libs/audio/source/wave/karplus_strong.cpp

@@ -1,6 +1,6 @@
 #include <psemek/audio/wave/karplus_strong.hpp>
 #include <psemek/audio/constants.hpp>
-#include <psemek/audio/white_noise.hpp>
+#include <psemek/audio/detail/white_noise.hpp>
 #include <psemek/random/generator.hpp>
 #include <psemek/random/uniform.hpp>
 

libs/audio/source/wave/sawtooth.cpp

@@ -1,6 +1,6 @@
 #include <psemek/audio/wave/sawtooth.hpp>
 #include <psemek/audio/wave/generator.hpp>
-#include <psemek/audio/oscillator.hpp>
+#include <psemek/audio/detail/oscillator.hpp>
 #include <psemek/log/log.hpp>
 
 #include <cmath>

libs/audio/source/wave/sine.cpp

@@ -1,6 +1,6 @@
 #include <psemek/audio/wave/sine.hpp>
 #include <psemek/audio/wave/generator.hpp>
-#include <psemek/audio/oscillator.hpp>
+#include <psemek/audio/detail/oscillator.hpp>
 
 #include <cmath>
 #include <complex>

libs/audio/source/wave/square.cpp

@@ -1,6 +1,6 @@
 #include <psemek/audio/wave/square.hpp>
 #include <psemek/audio/wave/generator.hpp>
-#include <psemek/audio/oscillator.hpp>
+#include <psemek/audio/detail/oscillator.hpp>
 
 #include <cmath>
 

libs/audio/source/wave/triangle.cpp

@@ -1,6 +1,6 @@
 #include <psemek/audio/wave/triangle.hpp>
 #include <psemek/audio/wave/generator.hpp>
-#include <psemek/audio/oscillator.hpp>
+#include <psemek/audio/detail/oscillator.hpp>
 
 #include <cmath>