apvr eatavel eao rso jyrsovrs

to-do:
- make an "exporting ROM" dialog with progress and all
- move TIunA export to the ROM export framework
- perhaps do the same with ZSM in the future?

src/engine/engine.h

@@ -697,9 +697,8 @@ class DivEngine {
     // save as .fur.
     // if notPrimary is true then the song will not be altered
     SafeWriter* saveFur(bool notPrimary=false, bool newPatternFormat=true);
-    // build a ROM file (TODO).
+    // return a ROM exporter.
-    // specify system to build ROM for.
+    DivROMExport* buildROM(DivROMExportOptions sys);
-    std::vector<DivROMExportOutput> buildROM(DivROMExportOptions sys);
     // dump to VGM.
     // set trailingTicks to:
     // - 0 to add one tick of trailing

src/engine/export.cpp

@@ -21,7 +21,7 @@
 
 #include "export/amigaValidation.h"
 
-std::vector<DivROMExportOutput> DivEngine::buildROM(DivROMExportOptions sys) {
+DivROMExport* DivEngine::buildROM(DivROMExportOptions sys) {
   DivROMExport* exporter=NULL;
   switch (sys) {
     case DIV_ROM_AMIGA_VALIDATION:
@@ -31,7 +31,5 @@ std::vector<DivROMExportOutput> DivEngine::buildROM(DivROMExportOptions sys) {
       exporter=new DivROMExport;
       break;
   }
-  std::vector<DivROMExportOutput> ret=exporter->go(this);
+  return exporter;
-  delete exporter;
-  return ret;
 }

src/engine/export.h

@@ -51,13 +51,16 @@ struct DivROMExportProgress {
 };
 
 class DivROMExport {
-  std::vector<String> exportLog;
+  protected:
-  std::mutex logLock;
+    std::vector<String> exportLog;
-  void logAppend(String what);
+    std::vector<DivROMExportOutput> output;
+    std::mutex logLock;
+    void logAppend(String what);
   public:
     virtual bool go(DivEngine* eng);
     virtual void abort();
-    virtual std::vector<DivROMExportOutput> getResult();
+    virtual void wait();
+    std::vector<DivROMExportOutput>& getResult();
     virtual bool hasFailed();
     virtual DivROMExportProgress getProgress();
     virtual ~DivROMExport() {}

src/engine/export/abstract.cpp

@@ -20,7 +20,34 @@
 #include "../export.h"
 #include "../../ta-log.h"
 
-std::vector<DivROMExportOutput> DivROMExport::go(DivEngine* e) {
+bool DivROMExport::go(DivEngine* eng) {
   logW("what's this? the null ROM export?");
-  return std::vector<DivROMExportOutput>();
+  return false;
+}
+
+void DivROMExport::abort() {
+}
+
+std::vector<DivROMExportOutput>& DivROMExport::getResult() {
+  return output;
+}
+
+bool DivROMExport::hasFailed() {
+  return true;
+}
+
+DivROMExportProgress DivROMExport::getProgress() {
+  DivROMExportProgress ret;
+  ret.name="Test";
+  ret.amount=0.0f;
+  return ret;
+}
+
+void DivROMExport::logAppend(String what) {
+  logLock.lock();
+  exportLog.push_back(what);
+  logLock.unlock();
+}
+
+void DivROMExport::wait() {
 }

src/engine/export/amigaValidation.cpp

@@ -40,8 +40,7 @@ struct SampleBookEntry {
     len(0) {}
 };
 
-std::vector<DivROMExportOutput> DivExportAmigaValidation::go(DivEngine* e) {
+void DivExportAmigaValidation::run() {
-  std::vector<DivROMExportOutput> ret;
   std::vector<WaveEntry> waves;
   std::vector<SampleBookEntry> sampleBook;
   unsigned int wavesDataPtr=0;
@@ -266,12 +265,16 @@ std::vector<DivROMExportOutput> DivExportAmigaValidation::go(DivEngine* e) {
   }
 
   // finish
-  ret.reserve(5);
+  output.reserve(5);
-  ret.push_back(DivROMExportOutput("sbook.bin",sbook));
+  output.push_back(DivROMExportOutput("sbook.bin",sbook));
-  ret.push_back(DivROMExportOutput("wbook.bin",wbook));
+  output.push_back(DivROMExportOutput("wbook.bin",wbook));
-  ret.push_back(DivROMExportOutput("sample.bin",sample));
+  output.push_back(DivROMExportOutput("sample.bin",sample));
-  ret.push_back(DivROMExportOutput("wave.bin",wave));
+  output.push_back(DivROMExportOutput("wave.bin",wave));
-  ret.push_back(DivROMExportOutput("seq.bin",seq));
+  output.push_back(DivROMExportOutput("seq.bin",seq));
-
+}
-  return ret;
+
+bool DivExportAmigaValidation::go(DivEngine* eng) {
+  e=eng;
+  exportThread=new std::thread(&DivExportAmigaValidation::run,this);
+  return true;
 }

src/engine/export/amigaValidation.h

@@ -20,7 +20,10 @@
 #include "../export.h"
 
 class DivExportAmigaValidation: public DivROMExport {
+  DivEngine* e;
+  std::thread* exportThread;
+  void run();
   public:
-    std::vector<DivROMExportOutput> go(DivEngine* e);
+    bool go(DivEngine* e);
     ~DivExportAmigaValidation() {}
 };

src/gui/editControls.cpp

@@ -619,41 +619,6 @@ void FurnaceGUI::drawMobileControls() {
         if (ImGui::Button(_("Switch to Desktop Mode"))) {
           toggleMobileUI(!mobileUI);
         }
-
-        int numAmiga=0;
-        for (int i=0; i<e->song.systemLen; i++) {
-          if (e->song.system[i]==DIV_SYSTEM_AMIGA) numAmiga++;
-        }
-
-        if (numAmiga) {
-          ImGui::Text(_(
-            "this is NOT ROM export! only use for making sure the\n"
-            "Furnace Amiga emulator is working properly by\n"
-            "comparing it with real Amiga output."
-          ));
-          ImGui::AlignTextToFramePadding();
-          ImGui::Text(_("Directory"));
-          ImGui::SameLine();
-          ImGui::InputText("##AVDPath",&workingDirROMExport);
-          if (ImGui::Button(_("Bake Data"))) {
-            std::vector<DivROMExportOutput> out=e->buildROM(DIV_ROM_AMIGA_VALIDATION);
-            if (workingDirROMExport.size()>0) {
-              if (workingDirROMExport[workingDirROMExport.size()-1]!=DIR_SEPARATOR) workingDirROMExport+=DIR_SEPARATOR_STR;
-            }
-            for (DivROMExportOutput& i: out) {
-              String path=workingDirROMExport+i.name;
-              FILE* outFile=ps_fopen(path.c_str(),"wb");
-              if (outFile!=NULL) {
-                fwrite(i.data->getFinalBuf(),1,i.data->size(),outFile);
-                fclose(outFile);
-              }
-              i.data->finish();
-              delete i.data;
-            }
-            showError(fmt::sprintf(_("Done! Baked %d files."),(int)out.size()));
-          }
-        }
-
         break;
       }
     }

src/gui/exportOptions.cpp

@@ -329,21 +329,31 @@ void FurnaceGUI::drawExportAmigaVal(bool onWindow) {
     ImGui::SameLine();
   }
   if (ImGui::Button(_("Bake Data"),ImVec2(200.0f*dpiScale,0))) {
-    std::vector<DivROMExportOutput> out=e->buildROM(DIV_ROM_AMIGA_VALIDATION);
+    DivROMExport* ex=e->buildROM(DIV_ROM_AMIGA_VALIDATION);
-    if (workingDirROMExport.size()>0) {
+    if (ex->go(e)) {
-      if (workingDirROMExport[workingDirROMExport.size()-1]!=DIR_SEPARATOR) workingDirROMExport+=DIR_SEPARATOR_STR;
+      ex->wait();
-    }
+      if (ex->hasFailed()) {
-    for (DivROMExportOutput& i: out) {
+        showError("error!");
-      String path=workingDirROMExport+i.name;
+      } else {
-      FILE* outFile=ps_fopen(path.c_str(),"wb");
+        if (workingDirROMExport.size()>0) {
-      if (outFile!=NULL) {
+          if (workingDirROMExport[workingDirROMExport.size()-1]!=DIR_SEPARATOR) workingDirROMExport+=DIR_SEPARATOR_STR;
-        fwrite(i.data->getFinalBuf(),1,i.data->size(),outFile);
+        }
-        fclose(outFile);
+        for (DivROMExportOutput& i: ex->getResult()) {
+          String path=workingDirROMExport+i.name;
+          FILE* outFile=ps_fopen(path.c_str(),"wb");
+          if (outFile!=NULL) {
+            fwrite(i.data->getFinalBuf(),1,i.data->size(),outFile);
+            fclose(outFile);
+          }
+          i.data->finish();
+          delete i.data;
+        }
+        showError(fmt::sprintf(_("Done! Baked %d files."),(int)ex->getResult().size()));
       }
-      i.data->finish();
+    } else {
-      delete i.data;
+      showError("error!");
     }
-    showError(fmt::sprintf(_("Done! Baked %d files."),(int)out.size()));
+    delete ex;
     ImGui::CloseCurrentPopup();
   }
 }