Skip to content

Commit 6104534

Browse files
authored
Move implementation details into corresponding dirs (#52)
1 parent e9eb830 commit 6104534

20 files changed

Lines changed: 40 additions & 41 deletions

src/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,17 @@ set(SOURCE_ATRACDENC_IMPL
8181
env.cpp
8282
transient_detector.cpp
8383
atrac1denc.cpp
84-
atrac/atrac1.cpp
85-
atrac/atrac1_dequantiser.cpp
84+
atrac/at1/atrac1.cpp
85+
atrac/at1/atrac1_bitalloc.cpp
86+
atrac/at1/atrac1_dequantiser.cpp
8687
atrac/atrac_scale.cpp
8788
atrac/atrac_psy_common.cpp
88-
atrac/atrac1_bitalloc.cpp
8989
oma.cpp
9090
rm.cpp
9191
at3.cpp
9292
atrac3denc.cpp
93-
atrac/atrac3.cpp
94-
atrac/atrac3_bitstream.cpp
93+
atrac/at3/atrac3.cpp
94+
atrac/at3/atrac3_bitstream.cpp
9595
atrac/atrac3plus_pqf/atrac3plus_pqf.c
9696
atrac/at3p/ff/atrac3plusdsp.c
9797
atrac/at3p/at3p.cpp
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
*/
1818

1919
#pragma once
20+
#include <config.h>
2021
#include <cstdint>
2122
#include <array>
2223
#include <map>
2324
#include <math.h>
24-
#include "config.h"
2525

2626
namespace NBitStream {
2727
class TBitStream;
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
*/
1818

1919
#include "atrac1_bitalloc.h"
20-
#include "atrac_psy_common.h"
21-
#include "atrac_scale.h"
2220
#include "atrac1.h"
21+
#include <atrac/atrac_psy_common.h>
22+
#include <atrac/atrac_scale.h>
2323
#include <math.h>
2424
#include <cassert>
25-
#include "bitstream/bitstream.h"
26-
#include "../env.h"
25+
#include <bitstream/bitstream.h>
26+
#include <env.h>
2727

2828
namespace NAtracDEnc {
2929
namespace NAtrac1 {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
*/
1818

1919
#pragma once
20-
#include "atrac_scale.h"
21-
#include "atrac/atrac1.h"
22-
#include "../aea.h"
20+
#include "atrac1.h"
21+
#include <atrac/atrac_scale.h>
22+
#include <compressed_io.h>
2323
#include <vector>
2424
#include <map>
2525
#include <cstdint>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
*/
1818

1919
#include "atrac1_dequantiser.h"
20+
#include "lib/bitstream/bitstream.h"
2021
#include <string.h>
22+
2123
namespace NAtracDEnc {
2224
namespace NAtrac1 {
2325

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
#pragma once
2020
#include "atrac1.h"
21-
#include "atrac_scale.h"
22-
2321

2422
namespace NAtracDEnc {
2523
namespace NAtrac1 {
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
*/
1818

1919
#pragma once
20-
#include "../config.h"
20+
2121
#include <math.h>
22+
#include <config.h>
2223
#include <cstdint>
2324
#include <vector>
2425
#include <cassert>

0 commit comments

Comments
 (0)