Move fluxmapreader/fluxpattern into data.

arch/aeslanier/decoder.cc

@@ -3,8 +3,8 @@
 #include "aeslanier.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/data/sector.h"
 #include "lib/core/bytes.h"
 #include "fmt/format.h"

arch/agat/decoder.cc

@@ -3,8 +3,8 @@
 #include "agat.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/data/sector.h"
 #include "lib/core/bytes.h"
 #include "fmt/format.h"

arch/amiga/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

arch/apple2/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

arch/brother/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/decoders/decoders.h"
 #include "lib/encoders/encoders.h"
 #include "brother.h"

arch/c64/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

arch/f85/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

arch/fb100/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

arch/ibm/decoder.cc

@@ -3,8 +3,8 @@
 #include "ibm.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/data/sector.h"
 #include "arch/ibm/ibm.pb.h"
 #include "lib/config/proto.h"

arch/macintosh/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

arch/micropolis/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"
 #include "micropolis.h"

arch/mx/decoder.cc

@@ -3,8 +3,8 @@
 #include "arch/mx/mx.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/data/sector.h"
 #include <string.h>
 

arch/northstar/decoder.cc

@@ -13,8 +13,8 @@
 
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"
 #include "northstar.h"

arch/rolandd20/decoder.cc

@@ -2,8 +2,8 @@
 #include "lib/decoders/decoders.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/data/sector.h"
 #include "lib/core/bytes.h"
 #include "rolandd20.h"

arch/smaky6/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

arch/tartu/decoder.cc

@@ -4,8 +4,8 @@
 #include "arch/tartu/tartu.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/data/sector.h"
 #include <string.h>
 

arch/tids990/decoder.cc

@@ -4,8 +4,8 @@
 #include "arch/tids990/tids990.h"
 #include "lib/core/crc.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/data/sector.h"
 #include <string.h>
 #include "fmt/format.h"

arch/victor9k/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

arch/zilogmcz/decoder.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "protocol.h"
 #include "lib/decoders/decoders.h"
 #include "lib/data/sector.h"

build.py

@@ -28,8 +28,6 @@ cxxlibrary(
         "./lib/decoders/decoders.cc",
         "./lib/fl2.cc",
         "./lib/decoders/fluxdecoder.cc",
-        "./lib/decoders/fluxmapreader.cc",
-        "./lib/decoders/fluxpattern.cc",
         "./lib/decoders/fmmfm.cc",
         "./lib/encoders/encoders.cc",
         "./lib/fluxsink/a2rfluxsink.cc",
@@ -150,8 +148,6 @@ cxxlibrary(
         "lib/a2r.h": "./lib/a2r.h",
         "lib/decoders/decoders.h": "./lib/decoders/decoders.h",
         "lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
-        "lib/decoders/fluxmapreader.h": "./lib/decoders/fluxmapreader.h",
-        "lib/decoders/fluxpattern.h": "./lib/decoders/fluxpattern.h",
         "lib/decoders/rawbits.h": "./lib/decoders/rawbits.h",
         "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
         "lib/scp.h": "./lib/scp.h",

lib/data/build.py

@@ -2,13 +2,22 @@ from build.c import cxxlibrary
 
 cxxlibrary(
     name="data",
-    srcs=["./fluxmap.cc", "./sector.cc", "./layout.cc", "./image.cc"],
+    srcs=[
+        "./fluxmap.cc",
+        "./sector.cc",
+        "./layout.cc",
+        "./image.cc",
+        "./fluxmapreader.cc",
+        "./fluxpattern.cc",
+    ],
     hdrs={
         "lib/data/flux.h": "./flux.h",
         "lib/data/fluxmap.h": "./fluxmap.h",
         "lib/data/sector.h": "./sector.h",
         "lib/data/layout.h": "./layout.h",
         "lib/data/image.h": "./image.h",
+        "lib/data/fluxmapreader.h": "./fluxmapreader.h",
+        "lib/data/fluxpattern.h": "./fluxpattern.h",
     },
     deps=["lib/core", "lib/config", "+protocol"],
 )

lib/data/fluxmapreader.cc

@@ -1,8 +1,8 @@
 #include "lib/core/globals.h"
 #include "lib/config/config.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/config/proto.h"
 #include "protocol.h"
 #include <numeric>

lib/data/fluxpattern.cc

@@ -1,7 +1,7 @@
 #include "lib/core/globals.h"
 #include "lib/config/config.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include "lib/config/proto.h"
 #include "protocol.h"
 #include <numeric>

lib/decoders/decoders.cc

@@ -23,7 +23,7 @@
 #include "arch/tids990/tids990.h"
 #include "arch/victor9k/victor9k.h"
 #include "arch/zilogmcz/zilogmcz.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/data/flux.h"
 #include "protocol.h"
 #include "lib/decoders/rawbits.h"

lib/decoders/decoders.h

@@ -3,7 +3,7 @@
 
 #include "lib/core/bytes.h"
 #include "lib/data/sector.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/decoders/fluxdecoder.h"
 
 class Sector;

lib/decoders/fluxdecoder.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/decoders/fluxdecoder.h"
 #include "lib/decoders/decoders.pb.h"
 

lib/fluxsink/a2rfluxsink.cc

@@ -4,7 +4,7 @@
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
 #include "lib/core/logger.h"
 #include "lib/config/proto.h"

lib/fluxsink/aufluxsink.cc

@@ -4,7 +4,7 @@
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
 #include "lib/config/proto.h"
 #include <fstream>

lib/fluxsink/fl2fluxsink.cc

@@ -5,7 +5,7 @@
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
 #include "lib/config/proto.h"
 #include "lib/fl2.pb.h"

lib/fluxsink/scpfluxsink.cc

@@ -5,7 +5,7 @@
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
 #include "lib/config/proto.h"
 #include "lib/data/fluxmap.h"

lib/fluxsink/vcdfluxsink.cc

@@ -4,7 +4,7 @@
 #include "lib/core/bytes.h"
 #include "protocol.h"
 #include "lib/fluxsink/fluxsink.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/fluxsink/fluxsink.pb.h"
 #include "lib/config/proto.h"
 #include <fstream>

lib/usb/applesauceusb.cc

@@ -6,7 +6,7 @@
 #include "lib/core/utils.h"
 #include "serial.h"
 #include "usb.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include <unistd.h>
 
 class ApplesauceUsb;

src/fe-analysedriveresponse.cc

@@ -4,7 +4,7 @@
 #include "lib/usb/usb.h"
 #include "lib/core/bitmap.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/readerwriter.h"
 #include "protocol.h"
 #include "lib/config/proto.h"

src/fe-analyselayout.cc

@@ -7,7 +7,7 @@
 #include "lib/data/sector.h"
 #include "lib/core/csvreader.h"
 #include "lib/data/image.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "agg2d.h"
 #include "stb_image_write.h"
 #include <math.h>

src/fe-inspect.cc

@@ -3,7 +3,7 @@
 #include "lib/config/flags.h"
 #include "lib/readerwriter.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/decoders/fluxdecoder.h"
 #include "lib/decoders/decoders.h"
 #include "lib/fluxsource/fluxsource.h"

src/gui/fluxviewercontrol.cc

@@ -8,7 +8,7 @@
 #include "lib/decoders/decoders.pb.h"
 #include "lib/data/sector.h"
 #include "lib/data/layout.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "lib/core/crc.h"
 
 DECLARE_COLOUR(BACKGROUND, 192, 192, 192);

src/gui/histogramviewer.h

@@ -2,7 +2,7 @@
 
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 
 class HistogramViewer : public wxWindow
 {

tests/fluxmapreader.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxmapreader.h"
+#include "lib/data/fluxmapreader.h"
 #include "protocol.h"
 #include "fmt/format.h"
 #include "tests.h"

tests/fluxpattern.cc

@@ -1,6 +1,6 @@
 #include "lib/core/globals.h"
 #include "lib/data/fluxmap.h"
-#include "lib/decoders/fluxpattern.h"
+#include "lib/data/fluxpattern.h"
 #include <sstream>
 
 typedef std::vector<unsigned> ivector;