kfr

commit 2a12c79d7d3b51f9cb730538f255189c1ed5d7e2
parent aeb509db3e72d19ead122b6034f44df44369c1dc
Author: [email protected] <[email protected]>
Date:   Mon, 26 Aug 2019 07:09:07 +0000

move enum out of arch namespace

Diffstat:
M
include/kfr/base/conversion.hpp
 | 
6
++++--
M
include/kfr/dsp/biquad.hpp
 | 
5
+++--
M
include/kfr/dsp/sample_rate_conversion.hpp
 | 
5
+++--
M
include/kfr/dsp/speaker.hpp
 | 
4
+---
M
include/kfr/dsp/window.hpp
 | 
5
+++--

5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/include/kfr/base/conversion.hpp b/include/kfr/base/conversion.hpp
@@ -32,8 +32,6 @@
 
 namespace kfr
 {
-inline namespace CMT_ARCH_NAME
-{
 
 enum class audio_sample_type
 {
@@ -49,6 +47,7 @@ enum class audio_sample_type
     first_float = f32
 };
 
+
 inline constexpr size_t audio_sample_sizeof(audio_sample_type type)
 {
     switch (type)
@@ -75,6 +74,9 @@ inline constexpr size_t audio_sample_bit_depth(audio_sample_type type)
     return audio_sample_sizeof(type) * 8;
 }
 
+inline namespace CMT_ARCH_NAME
+{
+
 using audio_sample_type_clist =
     cvals_t<audio_sample_type, audio_sample_type::i8, audio_sample_type::i16, audio_sample_type::i24,
             audio_sample_type::i32, audio_sample_type::i64, audio_sample_type::f32, audio_sample_type::f64>;
diff --git a/include/kfr/dsp/biquad.hpp b/include/kfr/dsp/biquad.hpp
@@ -34,8 +34,6 @@
 
 namespace kfr
 {
-inline namespace CMT_ARCH_NAME
-{
 
 enum class biquad_type
 {
@@ -49,6 +47,9 @@ enum class biquad_type
     highshelf
 };
 
+inline namespace CMT_ARCH_NAME
+{
+
 /**
  * @brief Structure for holding biquad filter coefficients.
  */
diff --git a/include/kfr/dsp/sample_rate_conversion.hpp b/include/kfr/dsp/sample_rate_conversion.hpp
@@ -33,8 +33,6 @@
 
 namespace kfr
 {
-inline namespace CMT_ARCH_NAME
-{
 
 enum class sample_rate_conversion_quality : int
 {
@@ -45,6 +43,9 @@ enum class sample_rate_conversion_quality : int
     perfect = 12,
 };
 
+inline namespace CMT_ARCH_NAME
+{
+
 using resample_quality = sample_rate_conversion_quality;
 
 /// @brief Sample Rate converter
diff --git a/include/kfr/dsp/speaker.hpp b/include/kfr/dsp/speaker.hpp
@@ -27,8 +27,6 @@
 
 namespace kfr
 {
-inline namespace CMT_ARCH_NAME
-{
 
 enum class Speaker : int
 {
@@ -95,5 +93,5 @@ enum class SpeakerArrangement : int
     Music81        = 27,
     Arr102         = 28
 };
-} // namespace CMT_ARCH_NAME
+
 } // namespace kfr
diff --git a/include/kfr/dsp/window.hpp b/include/kfr/dsp/window.hpp
@@ -34,8 +34,6 @@
 
 namespace kfr
 {
-inline namespace CMT_ARCH_NAME
-{
 
 enum class window_type
 {
@@ -67,6 +65,9 @@ enum class window_symmetry
     symmetric
 };
 
+inline namespace CMT_ARCH_NAME
+{
+    
 namespace internal
 {