bunch of code de-duplication

src/gui/exportOptions.cpp

@@ -22,15 +22,9 @@
 #include "../fileutils.h"
 #include "misc/cpp/imgui_stdlib.h"
 
-void FurnaceGUI::drawExport() {
+void FurnaceGUI::drawExportAudio() {
   exitDisabledTimer=1;
 
-  ImVec2 avail=ImGui::GetContentRegionAvail();
-  avail.y-=ImGui::GetFrameHeightWithSpacing();
-
-  if (ImGui::BeginChild("sysPickerC",avail,false,ImGuiWindowFlags_NoScrollWithMouse|ImGuiWindowFlags_NoScrollbar)) {
-    if (ImGui::BeginTabBar("ExportTypes")) {
-      if (ImGui::BeginTabItem("Audio")) {
   ImGui::RadioButton("one file",&audioExportType,0);
   ImGui::RadioButton("multiple files (one per chip)",&audioExportType,1);
   ImGui::RadioButton("multiple files (one per channel)",&audioExportType,2);
@@ -55,9 +49,11 @@ void FurnaceGUI::drawExport() {
     }
     ImGui::CloseCurrentPopup();
   }
-        ImGui::EndTabItem();
+}
-      }
+
-      if (ImGui::BeginTabItem("VGM")) {
+void FurnaceGUI::drawExportVGM() {
+  exitDisabledTimer=1;
+
   ImGui::Text("settings:");
   if (ImGui::BeginCombo("format version",fmt::sprintf("%d.%.2x",vgmExportVersion>>8,vgmExportVersion&0xff).c_str())) {
     for (int i=0; i<7; i++) {
@@ -140,14 +136,11 @@ void FurnaceGUI::drawExport() {
   } else {
     ImGui::Text("nothing to export");
   }
-        ImGui::EndTabItem();
+}
-      }
+
-      int numZSMCompat=0;
+void FurnaceGUI::drawExportZSM() {
-      for (int i=0; i<e->song.systemLen; i++) {
+  exitDisabledTimer=1;
-        if ((e->song.system[i] == DIV_SYSTEM_VERA) || (e->song.system[i] == DIV_SYSTEM_YM2151)) numZSMCompat++;
+
-      }
-      if (numZSMCompat > 0) {
-        if (ImGui::BeginTabItem("ZSM")) {
   ImGui::Text("Commander X16 Zsound Music File");
   if (ImGui::InputInt("Tick Rate (Hz)",&zsmExportTickRate,1,2)) {
     if (zsmExportTickRate<1) zsmExportTickRate=1;
@@ -160,15 +153,11 @@ void FurnaceGUI::drawExport() {
     openFileDialog(GUI_FILE_EXPORT_ZSM);
     ImGui::CloseCurrentPopup();
   }
-          ImGui::EndTabItem();
+}
-        }
+
-      }
+void FurnaceGUI::drawExportAmigaVal() {
-      int numAmiga=0;
+  exitDisabledTimer=1;
-      for (int i=0; i<e->song.systemLen; i++) {
+
-        if (e->song.system[i]==DIV_SYSTEM_AMIGA) numAmiga++;
-      }
-      if (numAmiga && settings.iCannotWait) {
-        if (ImGui::BeginTabItem("Amiga Validation")) {
   ImGui::Text(
     "this is NOT ROM export! only use for making sure the\n"
     "Furnace Amiga emulator is working properly by\n"
@@ -196,10 +185,11 @@ void FurnaceGUI::drawExport() {
     showError(fmt::sprintf("Done! Baked %d files.",(int)out.size()));
     ImGui::CloseCurrentPopup();
   }
-          ImGui::EndTabItem();
+}
-        }
+
-      }
+void FurnaceGUI::drawExportText() {
-      if (ImGui::BeginTabItem("Text")) {
+  exitDisabledTimer=1;
+
   ImGui::Text(
     "this option exports the song to a text file.\n"
   );
@@ -207,9 +197,11 @@ void FurnaceGUI::drawExport() {
     openFileDialog(GUI_FILE_EXPORT_TEXT);
     ImGui::CloseCurrentPopup();
   }
-        ImGui::EndTabItem();
+}
-      }
+
-      if (ImGui::BeginTabItem("Command Stream")) {
+void FurnaceGUI::drawExportCommand() {
+  exitDisabledTimer=1;
+  
   ImGui::Text(
     "this option exports a text or binary file which\n"
     "contains a dump of the internal command stream\n"
@@ -225,6 +217,48 @@ void FurnaceGUI::drawExport() {
     openFileDialog(GUI_FILE_EXPORT_CMDSTREAM);
     ImGui::CloseCurrentPopup();
   }
+}
+
+void FurnaceGUI::drawExport() {
+  ImVec2 avail=ImGui::GetContentRegionAvail();
+  avail.y-=ImGui::GetFrameHeightWithSpacing();
+
+  if (ImGui::BeginChild("sysPickerC",avail,false,ImGuiWindowFlags_NoScrollWithMouse|ImGuiWindowFlags_NoScrollbar)) {
+    if (ImGui::BeginTabBar("ExportTypes")) {
+      if (ImGui::BeginTabItem("Audio")) {
+        drawExportAudio();
+        ImGui::EndTabItem();
+      }
+      if (ImGui::BeginTabItem("VGM")) {
+        drawExportVGM();
+        ImGui::EndTabItem();
+      }
+      int numZSMCompat=0;
+      for (int i=0; i<e->song.systemLen; i++) {
+        if ((e->song.system[i]==DIV_SYSTEM_VERA) || (e->song.system[i]==DIV_SYSTEM_YM2151)) numZSMCompat++;
+      }
+      if (numZSMCompat>0) {
+        if (ImGui::BeginTabItem("ZSM")) {
+          drawExportZSM();
+          ImGui::EndTabItem();
+        }
+      }
+      int numAmiga=0;
+      for (int i=0; i<e->song.systemLen; i++) {
+        if (e->song.system[i]==DIV_SYSTEM_AMIGA) numAmiga++;
+      }
+      if (numAmiga && settings.iCannotWait) {
+        if (ImGui::BeginTabItem("Amiga Validation")) {
+          drawExportAmigaVal();
+          ImGui::EndTabItem();
+        }
+      }
+      if (ImGui::BeginTabItem("Text")) {
+        drawExportText();
+        ImGui::EndTabItem();
+      }
+      if (ImGui::BeginTabItem("Command Stream")) {
+        drawExportCommand();
         ImGui::EndTabItem();
       }
       ImGui::EndTabBar();

src/gui/gui.cpp

@@ -4103,130 +4103,20 @@ bool FurnaceGUI::loop() {
         ImGui::Separator();
         if (settings.classicExportOptions) {
           if (ImGui::BeginMenu("export audio...")) {
-            exitDisabledTimer=1;
+            drawExportAudio();
-            if (ImGui::MenuItem("one file")) {
-              openFileDialog(GUI_FILE_EXPORT_AUDIO_ONE);
-            }
-            if (ImGui::MenuItem("multiple files (one per chip)")) {
-              openFileDialog(GUI_FILE_EXPORT_AUDIO_PER_SYS);
-            }
-            if (ImGui::MenuItem("multiple files (one per channel)")) {
-              openFileDialog(GUI_FILE_EXPORT_AUDIO_PER_CHANNEL);
-            }
-            if (ImGui::InputInt("Loops",&exportLoops,1,2)) {
-              if (exportLoops<0) exportLoops=0;
-            }
-            if (ImGui::InputDouble("Fade out (seconds)",&exportFadeOut,1.0,2.0,"%.1f")) {
-              if (exportFadeOut<0.0) exportFadeOut=0.0;
-            }
             ImGui::EndMenu();
           }
           if (ImGui::BeginMenu("export VGM...")) {
-            exitDisabledTimer=1;
+            drawExportVGM();
-            ImGui::Text("settings:");
-            if (ImGui::BeginCombo("format version",fmt::sprintf("%d.%.2x",vgmExportVersion>>8,vgmExportVersion&0xff).c_str())) {
-              for (int i=0; i<7; i++) {
-                if (ImGui::Selectable(fmt::sprintf("%d.%.2x",vgmVersions[i]>>8,vgmVersions[i]&0xff).c_str(),vgmExportVersion==vgmVersions[i])) {
-                  vgmExportVersion=vgmVersions[i];
-                }
-              }
-              ImGui::EndCombo();
-            }
-            ImGui::Checkbox("loop",&vgmExportLoop);
-            if (vgmExportLoop && e->song.loopModality==2) {
-              ImGui::Text("loop trail:");
-              ImGui::Indent();
-              if (ImGui::RadioButton("auto-detect",vgmExportTrailingTicks==-1)) {
-                vgmExportTrailingTicks=-1;
-              }
-              if (ImGui::RadioButton("add one loop",vgmExportTrailingTicks==-2)) {
-                vgmExportTrailingTicks=-2;
-              }
-              if (ImGui::RadioButton("custom",vgmExportTrailingTicks>=0)) {
-                vgmExportTrailingTicks=0;
-              }
-              if (vgmExportTrailingTicks>=0) {
-                ImGui::SameLine();
-                if (ImGui::InputInt("##TrailTicks",&vgmExportTrailingTicks,1,100)) {
-                  if (vgmExportTrailingTicks<0) vgmExportTrailingTicks=0;
-                }
-              }
-              ImGui::Unindent();
-            }
-            ImGui::Checkbox("add pattern change hints",&vgmExportPatternHints);
-            if (ImGui::IsItemHovered()) {
-              ImGui::SetTooltip(
-                "inserts data blocks on pattern changes.\n"
-                "useful if you are writing a playback routine.\n\n"
-
-                "the format of a pattern change data block is:\n"
-                "67 66 FE ll ll ll ll 01 oo rr pp pp pp ...\n"
-                "- ll: length, a 32-bit little-endian number\n"
-                "- oo: order\n"
-                "- rr: initial row (a 0Dxx effect is able to select a different row)\n"
-                "- pp: pattern index (one per channel)\n\n"
-
-                "pattern indexes are ordered as they appear in the song."
-              );
-            }
-            ImGui::Checkbox("direct stream mode",&vgmExportDirectStream);
-            if (ImGui::IsItemHovered()) {
-              ImGui::SetTooltip(
-                "required for DualPCM and MSM6258 export.\n\n"
-                "allows for volume/direction changes when playing samples,\n"
-                "at the cost of a massive increase in file size."
-              );
-            }
-            ImGui::Text("chips to export:");
-            bool hasOneAtLeast=false;
-            for (int i=0; i<e->song.systemLen; i++) {
-              int minVersion=e->minVGMVersion(e->song.system[i]);
-              ImGui::BeginDisabled(minVersion>vgmExportVersion || minVersion==0);
-              ImGui::Checkbox(fmt::sprintf("%d. %s##_SYSV%d",i+1,getSystemName(e->song.system[i]),i).c_str(),&willExport[i]);
-              ImGui::EndDisabled();
-              if (minVersion>vgmExportVersion) {
-                if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
-                  ImGui::SetTooltip("this chip is only available in VGM %d.%.2x and higher!",minVersion>>8,minVersion&0xff);
-                }
-              } else if (minVersion==0) {
-                if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled)) {
-                  ImGui::SetTooltip("this chip is not supported by the VGM format!");
-                }
-              } else {
-                if (willExport[i]) hasOneAtLeast=true;
-              }
-            }
-            ImGui::Text("select the chip you wish to export,");
-            ImGui::Text("but only up to %d of each type.",(vgmExportVersion>=0x151)?2:1);
-            if (hasOneAtLeast) {
-              if (ImGui::MenuItem("click to export")) {
-                openFileDialog(GUI_FILE_EXPORT_VGM);
-              }
-            } else {
-              ImGui::Text("nothing to export");
-            }
             ImGui::EndMenu();
           }
           int numZSMCompat=0;
           for (int i=0; i<e->song.systemLen; i++) {
-            if ((e->song.system[i] == DIV_SYSTEM_VERA) || (e->song.system[i] == DIV_SYSTEM_YM2151)) numZSMCompat++;
+            if ((e->song.system[i]==DIV_SYSTEM_VERA) || (e->song.system[i]==DIV_SYSTEM_YM2151)) numZSMCompat++;
           }
           if (numZSMCompat > 0) {
             if (ImGui::BeginMenu("export ZSM...")) {
-              exitDisabledTimer=1;
+              drawExportZSM();
-              ImGui::Text("Commander X16 Zsound Music File");
-              if (ImGui::InputInt("Tick Rate (Hz)",&zsmExportTickRate,1,10)) {
-                if (zsmExportTickRate<1) zsmExportTickRate=1;
-                if (zsmExportTickRate>44100) zsmExportTickRate=44100;
-              }
-              ImGui::Checkbox("loop",&zsmExportLoop);
-              ImGui::SameLine();
-              ImGui::Checkbox("optimize size",&zsmExportOptimize);
-              ImGui::SameLine();
-              if (ImGui::Button("Begin Export")) {
-                openFileDialog(GUI_FILE_EXPORT_ZSM);
-                ImGui::CloseCurrentPopup();
-              }
               ImGui::EndMenu();
             }
           }
@@ -4236,62 +4126,16 @@ bool FurnaceGUI::loop() {
           }
           if (numAmiga && settings.iCannotWait) {
             if (ImGui::BeginMenu("export Amiga validation data...")) {
-              exitDisabledTimer=1;
+              drawExportAmigaVal();
-              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()));
-                ImGui::CloseCurrentPopup();
-              }
               ImGui::EndMenu();
             }
           }
           if (ImGui::BeginMenu("export text...")) {
-            exitDisabledTimer=1;
+            drawExportText();
-            ImGui::Text(
-              "this option exports the song to a text file.\n"
-            );
-            if (ImGui::Button("export")) {
-              openFileDialog(GUI_FILE_EXPORT_TEXT);
-            }
             ImGui::EndMenu();
           }
           if (ImGui::BeginMenu("export command stream...")) {
-            exitDisabledTimer=1;
+            drawExportCommand();
-            ImGui::Text(
-              "this option exports a text or binary file which\n"
-              "contains a dump of the internal command stream\n"
-              "produced when playing the song.\n\n"
-
-              "technical/development use only!"
-            );
-            if (ImGui::Button("export (binary)")) {
-              openFileDialog(GUI_FILE_EXPORT_CMDSTREAM_BINARY);
-            }
-            if (ImGui::Button("export (text)")) {
-              openFileDialog(GUI_FILE_EXPORT_CMDSTREAM);
-            }
             ImGui::EndMenu();
           }
         } else {
@@ -7750,7 +7594,6 @@ FurnaceGUI::FurnaceGUI():
   introStopped(false),
   curTutorial(-1),
   curTutorialStep(0),
-  //audio export types (export options)
   audioExportType(0) {
   // value keys
   valueKeys[SDLK_0]=0;

src/gui/gui.h

@@ -2334,9 +2334,16 @@ class FurnaceGUI {
   // tutorial
   int curTutorial, curTutorialStep;
 
-  //audio export types (export options)
+  // audio export types (export options)
   int audioExportType;
 
+  void drawExportAudio();
+  void drawExportVGM();
+  void drawExportZSM();
+  void drawExportAmigaVal();
+  void drawExportText();
+  void drawExportCommand();
+
   void drawSSGEnv(unsigned char type, const ImVec2& size);
   void drawWaveform(unsigned char type, bool opz, const ImVec2& size);
   void drawAlgorithm(unsigned char alg, FurnaceGUIFMAlgs algType, const ImVec2& size);