Skip to content

Commit 5eef013

Browse files
committed
Modularise decoders.
1 parent 4c140b1 commit 5eef013

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

arch/arch.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ std::unique_ptr<Encoder> Arch::createEncoder(Config& config)
3030
return createEncoder(config->encoder());
3131
}
3232

33-
std::unique_ptr<Encoder> Arch::createEncoder(const EncoderProto& config){
33+
std::unique_ptr<Encoder> Arch::createEncoder(const EncoderProto& config)
34+
{
3435
static const std::map<int,
3536
std::function<std::unique_ptr<Encoder>(const EncoderProto&)>>
3637
encoders = {

build.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,10 @@
2222
cxxlibrary(
2323
name="lib",
2424
srcs=[
25-
"./lib/decoders/decoders.cc",
26-
"./lib/decoders/fluxdecoder.cc",
27-
"./lib/decoders/fmmfm.cc",
2825
"./lib/encoders/encoders.cc",
2926
"./lib/readerwriter.cc",
3027
],
3128
hdrs={
32-
"lib/decoders/decoders.h": "./lib/decoders/decoders.h",
33-
"lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
34-
"lib/decoders/rawbits.h": "./lib/decoders/rawbits.h",
3529
"lib/encoders/encoders.h": "./lib/encoders/encoders.h",
3630
"lib/readerwriter.h": "./lib/readerwriter.h",
3731
},
@@ -52,6 +46,7 @@
5246
"lib/fluxsource",
5347
"lib/imagereader",
5448
"lib/imagewriter",
49+
"lib/decoders",
5550
],
5651
)
5752

lib/build.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33

44
proto(name="common_proto", srcs=["./common.proto"])
5-
protocc(name="common_proto_lib", srcs=[".+common_proto"], deps=["+protobuf_lib"])
5+
protocc(
6+
name="common_proto_lib", srcs=[".+common_proto"], deps=["+protobuf_lib"]
7+
)
68

79
proto(
810
name="layout_proto",

lib/core/utils.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,4 +249,3 @@ void warning(const std::string msg)
249249
{
250250
log(msg);
251251
}
252-

lib/decoders/build.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
from build.protobuf import proto, protocc
2+
from build.c import cxxlibrary
23

34
proto(
45
name="proto",
56
srcs=["./decoders.proto"],
67
deps=["lib+common_proto", "arch+proto", "lib/fluxsink+proto"],
78
)
9+
810
protocc(
911
name="proto_lib",
1012
srcs=[".+proto"],
1113
deps=["lib+common_proto_lib", "arch+proto_lib", "lib/fluxsink+proto_lib"],
1214
)
15+
16+
cxxlibrary(
17+
name="decoders",
18+
srcs=["./decoders.cc", "./fluxdecoder.cc", "./fmmfm.cc"],
19+
hdrs={
20+
"lib/decoders/decoders.h": "./decoders.h",
21+
"lib/decoders/fluxdecoder.h": "./fluxdecoder.h",
22+
"lib/decoders/rawbits.h": "./rawbits.h",
23+
},
24+
deps=["lib/core", "lib/config", "lib/data", ".+proto_lib"],
25+
)

lib/decoders/decoders.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include "lib/data/fluxmap.h"
44
#include "lib/config/config.h"
55
#include "lib/decoders/decoders.h"
6-
#include "lib/encoders/encoders.h"
76
#include "lib/data/fluxmapreader.h"
87
#include "lib/data/flux.h"
98
#include "protocol.h"
@@ -14,7 +13,6 @@
1413
#include "lib/data/layout.h"
1514
#include <numeric>
1615

17-
1816
std::shared_ptr<TrackDataFlux> Decoder::decodeToSectors(
1917
std::shared_ptr<const Fluxmap> fluxmap,
2018
std::shared_ptr<const TrackInfo>& trackInfo)

0 commit comments

Comments
 (0)