updated namespaces

clip/aw_cliponly2.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdlib>
 
-namespace trnr::lib::clip {
+namespace trnr {
 // Clipper based on ClipOnly2 by Chris Johnson
 class aw_cliponly2 {
 public:

clip/aw_clipsoftly.h

@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <stdint.h>
 
-namespace trnr::lib::clip {
+namespace trnr {
 // soft clipper based on ClipSoftly by Chris Johnson
 class aw_clipsoftly {
 public:

clip/aw_tube2.h

@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <stdint.h>
 
-namespace trnr::lib::clip {
+namespace trnr {
 // modeled tube preamp based on tube2 by Chris Johnson
 class aw_tube2 {
 public:

companding/mulaw.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>
 
-namespace trnr::lib::companding {
+namespace trnr {
 // mulaw companding based on code by Emilie Gillet / Mutable Instruments
 class mulaw {
 public:

companding/ulaw.h

@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <cmath>
 
-namespace trnr::lib::companding {
+namespace trnr {
 // ulaw compansion based on code by Chris Johnson
 class ulaw {
 public:

dynamics/aw_pop2.h

@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <stdint.h>
 
-namespace trnr::lib::dynamics {
+namespace trnr {
 // compressor based on pop2 by Chris Johnson
 class aw_pop2 {
 public:

filter/aw_eq.h

@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <stdint.h>
 
-namespace trnr::lib::filter {
+namespace trnr {
 // 3 band equalizer with high/lowpass filters based on EQ by Chris Johnson.
 class aw_eq {
 public:

filter/chebyshev.h

@@ -3,7 +3,7 @@
 #include <math.h>
 #include <array>
 
-namespace trnr::lib::filter {
+namespace trnr {
 class chebyshev {
 public:
     void set_samplerate(double _samplerate) {

filter/ybandpass.h

@@ -4,7 +4,7 @@
 #include <array>
 #include <vector>
 
-namespace trnr::lib::filter {
+namespace trnr {
 // Bandpass filter based on YBandpass by Chris Johnson
 class ybandpass {
 public:

filter/yhighpass.h

@@ -4,7 +4,7 @@
 #include <array>
 #include <vector>
 
-namespace trnr::lib::filter {
+namespace trnr {
 // Highpass filter based on YHighpass by Chris Johnson
 class yhighpass {
 public:

filter/ylowpass.h

@@ -4,7 +4,7 @@
 #include <array>
 #include <vector>
 
-namespace trnr::lib::filter {
+namespace trnr {
 // Lowpass filter based on YLowpass by Chris Johnson
 class ylowpass {
 public:

filter/ynotch.h

@@ -4,7 +4,7 @@
 #include <array>
 #include <vector>
 
-namespace trnr::lib::filter {
+namespace trnr {
 // Notch filter based on YNotch by Chris Johnson
 class ynotch {
 public:

filter/ysvf.h

@@ -4,7 +4,7 @@
 #include "ybandpass.h"
 #include "ynotch.h"
 
-namespace trnr::lib::filter {
+namespace trnr {
 
 enum filter_types {
     lowpass = 0,

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 <typename t_voice>

synth/note_event.h

@@ -1,6 +1,6 @@
 #pragma once
 
-namespace trnr::lib::synth {
+namespace trnr {
 
 enum note_event_type {
     note_on = 0,

synth/tx_envelope.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <array>
 
-namespace trnr::lib::synth {
+namespace trnr {
 
 enum env_state {
     idle = 0,

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)

synth/tx_sineosc.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <cmath>
 
-namespace trnr::lib::synth {
+namespace trnr {
 
 class tx_sineosc {
 public:

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:

synth/voice_allocator.h

@@ -2,7 +2,7 @@
 #include <vector>
 #include "note_event.h"
 
-namespace trnr::lib::synth {
+namespace trnr {
 
 template <typename t_voice>
 class voice_allocator {

util/audio_math.h

@@ -1,6 +1,6 @@
 #include <math.h>
 
-namespace trnr::lib::util {
+namespace trnr {
 	static inline double lin_2_db(double lin) {
 		return 20 * log(lin);
 	}