diff options
-rw-r--r-- | src/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/atrac/at1/atrac1.cpp (renamed from src/atrac/atrac1.cpp) | 0 | ||||
-rw-r--r-- | src/atrac/at1/atrac1.h (renamed from src/atrac/atrac1.h) | 2 | ||||
-rw-r--r-- | src/atrac/at1/atrac1_bitalloc.cpp (renamed from src/atrac/atrac1_bitalloc.cpp) | 8 | ||||
-rw-r--r-- | src/atrac/at1/atrac1_bitalloc.h (renamed from src/atrac/atrac1_bitalloc.h) | 6 | ||||
-rw-r--r-- | src/atrac/at1/atrac1_dequantiser.cpp (renamed from src/atrac/atrac1_dequantiser.cpp) | 2 | ||||
-rw-r--r-- | src/atrac/at1/atrac1_dequantiser.h (renamed from src/atrac/atrac1_dequantiser.h) | 2 | ||||
-rw-r--r-- | src/atrac/at1/atrac1_qmf.h (renamed from src/atrac/atrac1_qmf.h) | 0 | ||||
-rw-r--r-- | src/atrac/at3/atrac3.cpp (renamed from src/atrac/atrac3.cpp) | 0 | ||||
-rw-r--r-- | src/atrac/at3/atrac3.h (renamed from src/atrac/atrac3.h) | 3 | ||||
-rw-r--r-- | src/atrac/at3/atrac3_bitstream.cpp (renamed from src/atrac/atrac3_bitstream.cpp) | 7 | ||||
-rw-r--r-- | src/atrac/at3/atrac3_bitstream.h (renamed from src/atrac/atrac3_bitstream.h) | 12 | ||||
-rw-r--r-- | src/atrac/at3/atrac3_qmf.h (renamed from src/atrac/atrac3_qmf.h) | 0 | ||||
-rw-r--r-- | src/atrac/atrac_psy_common.h | 1 | ||||
-rw-r--r-- | src/atrac/atrac_scale.cpp | 4 | ||||
-rw-r--r-- | src/atrac/atrac_scale.h | 3 | ||||
-rw-r--r-- | src/atrac1denc.cpp | 8 | ||||
-rw-r--r-- | src/atrac1denc.h | 4 | ||||
-rw-r--r-- | src/atrac3denc.h | 8 | ||||
-rw-r--r-- | src/main.cpp | 1 |
20 files changed, 40 insertions, 41 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0fe7935..96e5655 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -81,17 +81,17 @@ set(SOURCE_ATRACDENC_IMPL env.cpp transient_detector.cpp atrac1denc.cpp - atrac/atrac1.cpp - atrac/atrac1_dequantiser.cpp + atrac/at1/atrac1.cpp + atrac/at1/atrac1_bitalloc.cpp + atrac/at1/atrac1_dequantiser.cpp atrac/atrac_scale.cpp atrac/atrac_psy_common.cpp - atrac/atrac1_bitalloc.cpp oma.cpp rm.cpp at3.cpp atrac3denc.cpp - atrac/atrac3.cpp - atrac/atrac3_bitstream.cpp + atrac/at3/atrac3.cpp + atrac/at3/atrac3_bitstream.cpp atrac/atrac3plus_pqf/atrac3plus_pqf.c atrac/at3p/ff/atrac3plusdsp.c atrac/at3p/at3p.cpp diff --git a/src/atrac/atrac1.cpp b/src/atrac/at1/atrac1.cpp index b361ad5..b361ad5 100644 --- a/src/atrac/atrac1.cpp +++ b/src/atrac/at1/atrac1.cpp diff --git a/src/atrac/atrac1.h b/src/atrac/at1/atrac1.h index dfd0fd3..4b03e2b 100644 --- a/src/atrac/atrac1.h +++ b/src/atrac/at1/atrac1.h @@ -17,11 +17,11 @@ */ #pragma once +#include <config.h> #include <cstdint> #include <array> #include <map> #include <math.h> -#include "config.h" namespace NBitStream { class TBitStream; diff --git a/src/atrac/atrac1_bitalloc.cpp b/src/atrac/at1/atrac1_bitalloc.cpp index f40ebe2..b81557a 100644 --- a/src/atrac/atrac1_bitalloc.cpp +++ b/src/atrac/at1/atrac1_bitalloc.cpp @@ -17,13 +17,13 @@ */ #include "atrac1_bitalloc.h" -#include "atrac_psy_common.h" -#include "atrac_scale.h" #include "atrac1.h" +#include <atrac/atrac_psy_common.h> +#include <atrac/atrac_scale.h> #include <math.h> #include <cassert> -#include "bitstream/bitstream.h" -#include "../env.h" +#include <bitstream/bitstream.h> +#include <env.h> namespace NAtracDEnc { namespace NAtrac1 { diff --git a/src/atrac/atrac1_bitalloc.h b/src/atrac/at1/atrac1_bitalloc.h index a93eba3..8179908 100644 --- a/src/atrac/atrac1_bitalloc.h +++ b/src/atrac/at1/atrac1_bitalloc.h @@ -17,9 +17,9 @@ */ #pragma once -#include "atrac_scale.h" -#include "atrac/atrac1.h" -#include "../aea.h" +#include "atrac1.h" +#include <atrac/atrac_scale.h> +#include <compressed_io.h> #include <vector> #include <map> #include <cstdint> diff --git a/src/atrac/atrac1_dequantiser.cpp b/src/atrac/at1/atrac1_dequantiser.cpp index 74ccc9b..07add42 100644 --- a/src/atrac/atrac1_dequantiser.cpp +++ b/src/atrac/at1/atrac1_dequantiser.cpp @@ -17,7 +17,9 @@ */ #include "atrac1_dequantiser.h" +#include "lib/bitstream/bitstream.h" #include <string.h> + namespace NAtracDEnc { namespace NAtrac1 { diff --git a/src/atrac/atrac1_dequantiser.h b/src/atrac/at1/atrac1_dequantiser.h index 8cb58f1..2543d44 100644 --- a/src/atrac/atrac1_dequantiser.h +++ b/src/atrac/at1/atrac1_dequantiser.h @@ -18,8 +18,6 @@ #pragma once #include "atrac1.h" -#include "atrac_scale.h" - namespace NAtracDEnc { namespace NAtrac1 { diff --git a/src/atrac/atrac1_qmf.h b/src/atrac/at1/atrac1_qmf.h index 9f6d5ae..9f6d5ae 100644 --- a/src/atrac/atrac1_qmf.h +++ b/src/atrac/at1/atrac1_qmf.h diff --git a/src/atrac/atrac3.cpp b/src/atrac/at3/atrac3.cpp index 1e5b8e9..1e5b8e9 100644 --- a/src/atrac/atrac3.cpp +++ b/src/atrac/at3/atrac3.cpp diff --git a/src/atrac/atrac3.h b/src/atrac/at3/atrac3.h index ba14773..558eddc 100644 --- a/src/atrac/atrac3.h +++ b/src/atrac/at3/atrac3.h @@ -17,8 +17,9 @@ */ #pragma once -#include "../config.h" + #include <math.h> +#include <config.h> #include <cstdint> #include <vector> #include <cassert> diff --git a/src/atrac/atrac3_bitstream.cpp b/src/atrac/at3/atrac3_bitstream.cpp index 000eb92..d039dff 100644 --- a/src/atrac/atrac3_bitstream.cpp +++ b/src/atrac/at3/atrac3_bitstream.cpp @@ -17,9 +17,10 @@ */ #include "atrac3_bitstream.h" -#include "atrac_psy_common.h" -#include "bitstream/bitstream.h" -#include "../util.h" +#include <atrac/atrac_psy_common.h> +#include <bitstream/bitstream.h> +#include <util.h> +#include <env.h> #include <algorithm> #include <iostream> #include <vector> diff --git a/src/atrac/atrac3_bitstream.h b/src/atrac/at3/atrac3_bitstream.h index 34a6fc5..17a8548 100644 --- a/src/atrac/atrac3_bitstream.h +++ b/src/atrac/at3/atrac3_bitstream.h @@ -18,14 +18,14 @@ #pragma once #include "atrac3.h" -#include "atrac1.h" -#include "../aea.h" -#include "../oma.h" -#include "../atrac/atrac1.h" -#include "atrac_scale.h" +#include <compressed_io.h> +#include <atrac/atrac_scale.h> #include <vector> #include <utility> -#include "../env.h" + +namespace NBitStream { + class TBitStream; +} namespace NAtracDEnc { namespace NAtrac3 { diff --git a/src/atrac/atrac3_qmf.h b/src/atrac/at3/atrac3_qmf.h index 6c15846..6c15846 100644 --- a/src/atrac/atrac3_qmf.h +++ b/src/atrac/at3/atrac3_qmf.h diff --git a/src/atrac/atrac_psy_common.h b/src/atrac/atrac_psy_common.h index c433b90..ebeeef3 100644 --- a/src/atrac/atrac_psy_common.h +++ b/src/atrac/atrac_psy_common.h @@ -18,6 +18,7 @@ #pragma once #include "atrac_scale.h" +#include <stddef.h> namespace NAtracDEnc { diff --git a/src/atrac/atrac_scale.cpp b/src/atrac/atrac_scale.cpp index 840ab5b..348529c 100644 --- a/src/atrac/atrac_scale.cpp +++ b/src/atrac/atrac_scale.cpp @@ -17,8 +17,8 @@ */ #include "atrac_scale.h" -#include "atrac1.h" -#include "atrac3.h" +#include "at1/atrac1.h" +#include "at3/atrac3.h" #include "atrac/at3p/at3p_tables.h" #include "util.h" #include <cmath> diff --git a/src/atrac/atrac_scale.h b/src/atrac/atrac_scale.h index bca2e61..0562817 100644 --- a/src/atrac/atrac_scale.h +++ b/src/atrac/atrac_scale.h @@ -22,9 +22,6 @@ #include <map> #include <cstdint> -#include "lib/bitstream/bitstream.h" -#include "../config.h" - namespace NAtracDEnc { float QuantMantisas(const float* in, uint32_t first, uint32_t last, float mul, bool ea, int* mantisas); diff --git a/src/atrac1denc.cpp b/src/atrac1denc.cpp index 992af27..27a12f5 100644 --- a/src/atrac1denc.cpp +++ b/src/atrac1denc.cpp @@ -20,10 +20,10 @@ #include "atrac1denc.h" #include "bitstream/bitstream.h" -#include "atrac/atrac1.h" -#include "atrac/atrac1_dequantiser.h" -#include "atrac/atrac1_qmf.h" -#include "atrac/atrac1_bitalloc.h" +#include "atrac/at1/atrac1.h" +#include "atrac/at1/atrac1_dequantiser.h" +#include "atrac/at1/atrac1_qmf.h" +#include "atrac/at1/atrac1_bitalloc.h" #include "atrac/atrac_psy_common.h" #include "util.h" diff --git a/src/atrac1denc.h b/src/atrac1denc.h index d709177..8c776f9 100644 --- a/src/atrac1denc.h +++ b/src/atrac1denc.h @@ -20,8 +20,8 @@ #include "pcmengin.h" #include "aea.h" #include "transient_detector.h" -#include "atrac/atrac1.h" -#include "atrac/atrac1_qmf.h" +#include "atrac/at1/atrac1.h" +#include "atrac/at1/atrac1_qmf.h" #include "atrac/atrac_scale.h" #include "lib/mdct/mdct.h" diff --git a/src/atrac3denc.h b/src/atrac3denc.h index 778efeb..f92aed6 100644 --- a/src/atrac3denc.h +++ b/src/atrac3denc.h @@ -17,16 +17,14 @@ */ #pragma once -#include "config.h" #include "pcmengin.h" #include "aea.h" -#include "atrac/atrac3.h" -#include "atrac/atrac3_qmf.h" -#include "transient_detector.h" +#include "atrac/at3/atrac3.h" +#include "atrac/at3/atrac3_qmf.h" #include "delay_buffer.h" #include "util.h" -#include "atrac/atrac3_bitstream.h" +#include "atrac/at3/atrac3_bitstream.h" #include "atrac/atrac_scale.h" #include "lib/mdct/mdct.h" #include "gain_processor.h" diff --git a/src/main.cpp b/src/main.cpp index 6cf6ff8..3063ebc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,6 +29,7 @@ #include "aea.h" #include "rm.h" #include "at3.h" +#include "oma.h" #include "config.h" #include "atrac1denc.h" #include "atrac3denc.h" |