Modularise decoders.

Author: davidgiven

arch/arch.cc

@@ -30,7 +30,8 @@ std::unique_ptr<Encoder> Arch::createEncoder(Config& config)
     return createEncoder(config->encoder());
 }
 
-    std::unique_ptr<Encoder> Arch::createEncoder(const EncoderProto& config){
+std::unique_ptr<Encoder> Arch::createEncoder(const EncoderProto& config)
+{
     static const std::map<int,
         std::function<std::unique_ptr<Encoder>(const EncoderProto&)>>
         encoders = {

build.py

@@ -22,16 +22,10 @@
 cxxlibrary(
     name="lib",
     srcs=[
-        "./lib/decoders/decoders.cc",
-        "./lib/decoders/fluxdecoder.cc",
-        "./lib/decoders/fmmfm.cc",
         "./lib/encoders/encoders.cc",
         "./lib/readerwriter.cc",
     ],
     hdrs={
-        "lib/decoders/decoders.h": "./lib/decoders/decoders.h",
-        "lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
-        "lib/decoders/rawbits.h": "./lib/decoders/rawbits.h",
         "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
         "lib/readerwriter.h": "./lib/readerwriter.h",
     },
@@ -52,6 +46,7 @@
         "lib/fluxsource",
         "lib/imagereader",
         "lib/imagewriter",
+        "lib/decoders",
     ],
 )
 

lib/build.py

@@ -2,7 +2,9 @@
 
 
 proto(name="common_proto", srcs=["./common.proto"])
-protocc(name="common_proto_lib", srcs=[".+common_proto"], deps=["+protobuf_lib"])
+protocc(
+    name="common_proto_lib", srcs=[".+common_proto"], deps=["+protobuf_lib"]
+)
 
 proto(
     name="layout_proto",

lib/core/utils.cc

@@ -249,4 +249,3 @@ void warning(const std::string msg)
 {
     log(msg);
 }
-

lib/decoders/build.py

@@ -1,12 +1,25 @@
 from build.protobuf import proto, protocc
+from build.c import cxxlibrary
 
 proto(
     name="proto",
     srcs=["./decoders.proto"],
     deps=["lib+common_proto", "arch+proto", "lib/fluxsink+proto"],
 )
+
 protocc(
     name="proto_lib",
     srcs=[".+proto"],
     deps=["lib+common_proto_lib", "arch+proto_lib", "lib/fluxsink+proto_lib"],
 )
+
+cxxlibrary(
+    name="decoders",
+    srcs=["./decoders.cc", "./fluxdecoder.cc", "./fmmfm.cc"],
+    hdrs={
+        "lib/decoders/decoders.h": "./decoders.h",
+        "lib/decoders/fluxdecoder.h": "./fluxdecoder.h",
+        "lib/decoders/rawbits.h": "./rawbits.h",
+    },
+    deps=["lib/core", "lib/config", "lib/data", ".+proto_lib"],
+)

lib/decoders/decoders.cc

@@ -3,7 +3,6 @@
 #include "lib/data/fluxmap.h"
 #include "lib/config/config.h"
 #include "lib/decoders/decoders.h"
-#include "lib/encoders/encoders.h"
 #include "lib/data/fluxmapreader.h"
 #include "lib/data/flux.h"
 #include "protocol.h"
@@ -14,7 +13,6 @@
 #include "lib/data/layout.h"
 #include <numeric>
 
-
 std::shared_ptr<TrackDataFlux> Decoder::decodeToSectors(
     std::shared_ptr<const Fluxmap> fluxmap,
     std::shared_ptr<const TrackInfo>& trackInfo)