diff --git a/clip/aw_cliponly2.h b/clip/aw_cliponly2.h index f7901b3..b656a5c 100644 --- a/clip/aw_cliponly2.h +++ b/clip/aw_cliponly2.h @@ -1,7 +1,7 @@ #pragma once #include -namespace trnr::lib::clip { +namespace trnr { // Clipper based on ClipOnly2 by Chris Johnson class aw_cliponly2 { public: diff --git a/clip/aw_clipsoftly.h b/clip/aw_clipsoftly.h index c80e7c2..5a1d7c2 100644 --- a/clip/aw_clipsoftly.h +++ b/clip/aw_clipsoftly.h @@ -2,7 +2,7 @@ #include #include -namespace trnr::lib::clip { +namespace trnr { // soft clipper based on ClipSoftly by Chris Johnson class aw_clipsoftly { public: diff --git a/clip/aw_tube2.h b/clip/aw_tube2.h index 51f4212..34810b8 100644 --- a/clip/aw_tube2.h +++ b/clip/aw_tube2.h @@ -2,7 +2,7 @@ #include #include -namespace trnr::lib::clip { +namespace trnr { // modeled tube preamp based on tube2 by Chris Johnson class aw_tube2 { public: diff --git a/companding/mulaw.h b/companding/mulaw.h index 95306b1..4fce197 100644 --- a/companding/mulaw.h +++ b/companding/mulaw.h @@ -1,7 +1,7 @@ #pragma once #include -namespace trnr::lib::companding { +namespace trnr { // mulaw companding based on code by Emilie Gillet / Mutable Instruments class mulaw { public: diff --git a/companding/ulaw.h b/companding/ulaw.h index 83ff6c3..d9d0baf 100644 --- a/companding/ulaw.h +++ b/companding/ulaw.h @@ -3,7 +3,7 @@ #include #include -namespace trnr::lib::companding { +namespace trnr { // ulaw compansion based on code by Chris Johnson class ulaw { public: diff --git a/dynamics/aw_pop2.h b/dynamics/aw_pop2.h index 8c05f60..ab4fdfb 100644 --- a/dynamics/aw_pop2.h +++ b/dynamics/aw_pop2.h @@ -2,7 +2,7 @@ #include #include -namespace trnr::lib::dynamics { +namespace trnr { // compressor based on pop2 by Chris Johnson class aw_pop2 { public: diff --git a/filter/aw_eq.h b/filter/aw_eq.h index 3212ac2..9de70a9 100644 --- a/filter/aw_eq.h +++ b/filter/aw_eq.h @@ -2,7 +2,7 @@ #include #include -namespace trnr::lib::filter { +namespace trnr { // 3 band equalizer with high/lowpass filters based on EQ by Chris Johnson. class aw_eq { public: diff --git a/filter/chebyshev.h b/filter/chebyshev.h index d18ce5a..ee17296 100644 --- a/filter/chebyshev.h +++ b/filter/chebyshev.h @@ -3,7 +3,7 @@ #include #include -namespace trnr::lib::filter { +namespace trnr { class chebyshev { public: void set_samplerate(double _samplerate) { diff --git a/filter/ybandpass.h b/filter/ybandpass.h index bcb4f51..6d8bfbe 100644 --- a/filter/ybandpass.h +++ b/filter/ybandpass.h @@ -4,7 +4,7 @@ #include #include -namespace trnr::lib::filter { +namespace trnr { // Bandpass filter based on YBandpass by Chris Johnson class ybandpass { public: diff --git a/filter/yhighpass.h b/filter/yhighpass.h index 063394e..997b136 100644 --- a/filter/yhighpass.h +++ b/filter/yhighpass.h @@ -4,7 +4,7 @@ #include #include -namespace trnr::lib::filter { +namespace trnr { // Highpass filter based on YHighpass by Chris Johnson class yhighpass { public: diff --git a/filter/ylowpass.h b/filter/ylowpass.h index 30cc750..aa80785 100644 --- a/filter/ylowpass.h +++ b/filter/ylowpass.h @@ -4,7 +4,7 @@ #include #include -namespace trnr::lib::filter { +namespace trnr { // Lowpass filter based on YLowpass by Chris Johnson class ylowpass { public: diff --git a/filter/ynotch.h b/filter/ynotch.h index 64c4a20..fefe59a 100644 --- a/filter/ynotch.h +++ b/filter/ynotch.h @@ -4,7 +4,7 @@ #include #include -namespace trnr::lib::filter { +namespace trnr { // Notch filter based on YNotch by Chris Johnson class ynotch { public: diff --git a/filter/ysvf.h b/filter/ysvf.h index 78110fe..a2e38cf 100644 --- a/filter/ysvf.h +++ b/filter/ysvf.h @@ -4,7 +4,7 @@ #include "ybandpass.h" #include "ynotch.h" -namespace trnr::lib::filter { +namespace trnr { enum filter_types { lowpass = 0, diff --git a/synth/midi_synth.h b/synth/midi_synth.h index 533c5e6..26064a4 100644 --- a/synth/midi_synth.h +++ b/synth/midi_synth.h @@ -4,7 +4,7 @@ #include "note_event.h" #include "voice_allocator.h" -namespace trnr::lib::synth { +namespace trnr { // a generic midi synth base class with sample accurate event handling. template diff --git a/synth/note_event.h b/synth/note_event.h index 5051e5c..2b90918 100644 --- a/synth/note_event.h +++ b/synth/note_event.h @@ -1,6 +1,6 @@ #pragma once -namespace trnr::lib::synth { +namespace trnr { enum note_event_type { note_on = 0, diff --git a/synth/tx_envelope.h b/synth/tx_envelope.h index 17a5952..4492be7 100644 --- a/synth/tx_envelope.h +++ b/synth/tx_envelope.h @@ -1,7 +1,7 @@ #pragma once #include -namespace trnr::lib::synth { +namespace trnr { enum env_state { idle = 0, diff --git a/synth/tx_operator.h b/synth/tx_operator.h index 0070a7d..275da33 100644 --- a/synth/tx_operator.h +++ b/synth/tx_operator.h @@ -2,7 +2,7 @@ #include "tx_sineosc.h" #include "tx_envelope.h" -namespace trnr::lib::synth { +namespace trnr { class tx_operator { public: tx_operator(double samplerate) diff --git a/synth/tx_sineosc.h b/synth/tx_sineosc.h index 3f3f640..e175d4a 100644 --- a/synth/tx_sineosc.h +++ b/synth/tx_sineosc.h @@ -1,7 +1,7 @@ #pragma once #include -namespace trnr::lib::synth { +namespace trnr { class tx_sineosc { public: diff --git a/synth/tx_voice.h b/synth/tx_voice.h index 198e7a6..214473b 100644 --- a/synth/tx_voice.h +++ b/synth/tx_voice.h @@ -4,9 +4,7 @@ #include "tx_operator.h" #include "../util/audio_math.h" -using namespace trnr::lib::util; - -namespace trnr::lib::synth { +namespace trnr { class tx_voice { public: diff --git a/synth/voice_allocator.h b/synth/voice_allocator.h index 9440d6b..c707ace 100644 --- a/synth/voice_allocator.h +++ b/synth/voice_allocator.h @@ -2,7 +2,7 @@ #include #include "note_event.h" -namespace trnr::lib::synth { +namespace trnr { template class voice_allocator { diff --git a/util/audio_math.h b/util/audio_math.h index f7ddee2..fcfb0f2 100644 --- a/util/audio_math.h +++ b/util/audio_math.h @@ -1,6 +1,6 @@ #include -namespace trnr::lib::util { +namespace trnr { static inline double lin_2_db(double lin) { return 20 * log(lin); }