Move the fluxtoau tool into the main client.

.appveyor.yml

@@ -15,7 +15,7 @@ install:
 
 build_script:
   - make
-  - zip -9 fluxengine.zip fluxengine.exe brother120tool.exe fluxtoau.exe
+  - zip -9 fluxengine.zip fluxengine.exe brother120tool.exe
 
 artifacts:
   - path: fluxengine.zip

mkninja.sh

@@ -181,6 +181,7 @@ buildlibrary libbackend.a \
 buildlibrary libfrontend.a \
     src/fe-cwftoflux.cc \
     src/fe-erase.cc \
+    src/fe-fluxtoau.cc \
     src/fe-fluxtovcd.cc \
     src/fe-inspect.cc \
     src/fe-readadfs.cc \
@@ -222,11 +223,6 @@ buildsimpleprogram brother120tool \
     libemu.a \
     libfmt.a \
 
-buildsimpleprogram fluxtoau \
-    tools/fluxtoau.cc \
-    libbackend.a \
-    libfmt.a \
-
 runtest dataspec-test       tests/dataspec.cc
 runtest flags-test          tests/flags.cc
 runtest fmmfm-test          tests/fmmfm.cc

src/fe-fluxtoau.cc

@@ -10,7 +10,7 @@
 #include "fmt/format.h"
 #include <fstream>
 
-FlagGroup flags { &hardwareFluxSourceFlags };
+static FlagGroup flags { &hardwareFluxSourceFlags };
 
 static DataSpecFlag source(
     { "--source", "-s" },
@@ -30,7 +30,7 @@ static SettableFlag withIndex(
     { "--with-index" },
     "place index markers in the right hand channel");
 
-int main(int argc, const char* argv[])
+int mainConvertFluxToAu(int argc, const char* argv[])
 {
     flags.parseFlags(argc, argv);
 
@@ -94,5 +94,7 @@ int main(int argc, const char* argv[])
         of.write((const char*) data.cbegin(), data.size());
     }
 
+    std::cerr << "Done. Warning: do not play this file, or you will break your speakers"
+	         " and/or ears!\n";
     return 0;
 }

src/fe-fluxtovcd.cc

@@ -10,7 +10,7 @@
 #include "fmt/format.h"
 #include <fstream>
 
-FlagGroup flags { &hardwareFluxSourceFlags };
+static FlagGroup flags { &hardwareFluxSourceFlags };
 
 static DataSpecFlag source(
     { "--source", "-s" },

src/fluxengine.cc

@@ -4,6 +4,7 @@ typedef int command_cb(int agrc, const char* argv[]);
 
 extern command_cb mainErase;
 extern command_cb mainConvertCwfToFlux;
+extern command_cb mainConvertFluxToAu;
 extern command_cb mainConvertFluxToVcd;
 extern command_cb mainInspect;
 extern command_cb mainReadADFS;
@@ -82,6 +83,7 @@ static std::vector<Command> writeables =
 static std::vector<Command> convertables =
 {
     { "cwftoflux",     mainConvertCwfToFlux, "Converts CatWeasel stream files to flux.", },
+    { "fluxtoau",      mainConvertFluxToAu,  "Converts (one track of a) flux file to an .au audio file.", },
     { "fluxtovcd",     mainConvertFluxToVcd, "Converts (one track of a) flux file to a VCD file.", },
 };