GUI: re-organize code

ins/wave/sample lists now in dataList.cpp
wave editor now under its own file

CMakeLists.txt

@@ -357,12 +357,14 @@ src/gui/fileDialog.cpp
 src/gui/intConst.cpp
 src/gui/guiConst.cpp
 
+src/gui/dataList.cpp
 src/gui/insEdit.cpp
 src/gui/orders.cpp
 src/gui/pattern.cpp
 src/gui/sampleEdit.cpp
 src/gui/settings.cpp
 src/gui/util.cpp
+src/gui/waveEdit.cpp
 src/gui/gui.cpp
 )
 

src/gui/dataList.cpp

@@ -0,0 +1,348 @@
+#include "gui.h"
+#include "IconsFontAwesome4.h"
+#include "misc/cpp/imgui_stdlib.h"
+#include "plot_nolerp.h"
+#include "guiConst.h"
+#include <fmt/printf.h>
+
+const char* sampleNote[12]={
+  "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"
+};
+
+void FurnaceGUI::drawInsList() {
+  if (nextWindow==GUI_WINDOW_INS_LIST) {
+    insListOpen=true;
+    ImGui::SetNextWindowFocus();
+    nextWindow=GUI_WINDOW_NOTHING;
+  }
+  if (!insListOpen) return;
+  if (ImGui::Begin("Instruments",&insListOpen)) {
+    if (ImGui::Button(ICON_FA_PLUS "##InsAdd")) {
+      doAction(GUI_ACTION_INS_LIST_ADD);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FILES_O "##InsClone")) {
+      doAction(GUI_ACTION_INS_LIST_DUPLICATE);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FOLDER_OPEN "##InsLoad")) {
+      doAction(GUI_ACTION_INS_LIST_OPEN);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FLOPPY_O "##InsSave")) {
+      doAction(GUI_ACTION_INS_LIST_SAVE);
+    }
+    ImGui::SameLine();
+    if (ImGui::ArrowButton("InsUp",ImGuiDir_Up)) {
+      doAction(GUI_ACTION_INS_LIST_MOVE_UP);
+    }
+    ImGui::SameLine();
+    if (ImGui::ArrowButton("InsDown",ImGuiDir_Down)) {
+      doAction(GUI_ACTION_INS_LIST_MOVE_DOWN);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_TIMES "##InsDelete")) {
+      doAction(GUI_ACTION_INS_LIST_DELETE);
+    }
+    ImGui::Separator();
+    if (ImGui::BeginTable("InsListScroll",1,ImGuiTableFlags_ScrollY)) {
+      if (settings.unifiedDataView) {
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::Text(ICON_FA_TASKS " Instruments");
+        ImGui::Indent();
+      }
+
+      for (int i=0; i<(int)e->song.ins.size(); i++) {
+        DivInstrument* ins=e->song.ins[i];
+        String name;
+        switch (ins->type) {
+          case DIV_INS_FM:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_FM]);
+            name=fmt::sprintf(ICON_FA_AREA_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_STD:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_STD]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_GB:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_GB]);
+            name=fmt::sprintf(ICON_FA_GAMEPAD " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_C64:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_C64]);
+            name=fmt::sprintf(ICON_FA_KEYBOARD_O " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_AMIGA:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_AMIGA]);
+            name=fmt::sprintf(ICON_FA_VOLUME_UP " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_PCE:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_PCE]);
+            name=fmt::sprintf(ICON_FA_ID_BADGE " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_AY:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_AY]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_AY8930:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_AY8930]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_TIA:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_TIA]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_SAA1099:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_SAA1099]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_VIC:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_VIC]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_PET:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_PET]);
+            name=fmt::sprintf(ICON_FA_SQUARE " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_VRC6:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_VRC6]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_OPLL:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_OPLL]);
+            name=fmt::sprintf(ICON_FA_AREA_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_OPL:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_OPL]);
+            name=fmt::sprintf(ICON_FA_AREA_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_FDS:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_FDS]);
+            name=fmt::sprintf(ICON_FA_FLOPPY_O " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_VBOY:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_VBOY]);
+            name=fmt::sprintf(ICON_FA_BINOCULARS " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_N163:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_N163]);
+            name=fmt::sprintf(ICON_FA_CALCULATOR " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_SCC:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_SCC]);
+            name=fmt::sprintf(ICON_FA_CALCULATOR " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_OPZ:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_OPZ]);
+            name=fmt::sprintf(ICON_FA_AREA_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_POKEY:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_POKEY]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_BEEPER:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_BEEPER]);
+            name=fmt::sprintf(ICON_FA_SQUARE " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_SWAN:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_SWAN]);
+            name=fmt::sprintf(ICON_FA_GAMEPAD " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_MIKEY:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_MIKEY]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_VERA:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_VERA]);
+            name=fmt::sprintf(ICON_FA_KEYBOARD_O " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          case DIV_INS_X1_010:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_X1_010]);
+            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+          default:
+            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_UNKNOWN]);
+            name=fmt::sprintf(ICON_FA_QUESTION " %.2X: %s##_INS%d",i,ins->name,i);
+            break;
+        }
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        if (ImGui::Selectable(name.c_str(),curIns==i)) {
+          curIns=i;
+        }
+        if (settings.insFocusesPattern && patternOpen && ImGui::IsItemActivated()) {
+          nextWindow=GUI_WINDOW_PATTERN;
+          curIns=i;
+        }
+        ImGui::PopStyleColor();
+        if (ImGui::IsItemHovered()) {
+          ImGui::SetTooltip("%s",(ins->type>DIV_INS_MAX)?"Unknown":insTypes[ins->type]);
+          if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {
+            insEditOpen=true;
+            nextWindow=GUI_WINDOW_INS_EDIT;
+          }
+        }
+      }
+
+      if (settings.unifiedDataView) {
+        ImGui::Unindent();
+
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::Text(ICON_FA_AREA_CHART " Wavetables");
+        ImGui::Indent();
+        actualWaveList();
+        ImGui::Unindent();
+
+        ImGui::TableNextRow();
+        ImGui::TableNextColumn();
+        ImGui::Text(ICON_FA_VOLUME_UP " Samples");
+        ImGui::Indent();
+        actualSampleList();
+        ImGui::Unindent();
+      }
+
+      ImGui::EndTable();
+    }
+  }
+  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_INS_LIST;
+  ImGui::End();
+}
+
+void FurnaceGUI::drawWaveList() {
+  if (nextWindow==GUI_WINDOW_WAVE_LIST) {
+    waveListOpen=true;
+    ImGui::SetNextWindowFocus();
+    nextWindow=GUI_WINDOW_NOTHING;
+  }
+  if (!waveListOpen) return;
+  if (ImGui::Begin("Wavetables",&waveListOpen)) {
+    if (ImGui::Button(ICON_FA_PLUS "##WaveAdd")) {
+      doAction(GUI_ACTION_WAVE_LIST_ADD);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FILES_O "##WaveClone")) {
+      doAction(GUI_ACTION_WAVE_LIST_DUPLICATE);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FOLDER_OPEN "##WaveLoad")) {
+      doAction(GUI_ACTION_WAVE_LIST_OPEN);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FLOPPY_O "##WaveSave")) {
+      doAction(GUI_ACTION_WAVE_LIST_SAVE);
+    }
+    ImGui::SameLine();
+    if (ImGui::ArrowButton("WaveUp",ImGuiDir_Up)) {
+      doAction(GUI_ACTION_WAVE_LIST_UP);
+    }
+    ImGui::SameLine();
+    if (ImGui::ArrowButton("WaveDown",ImGuiDir_Down)) {
+      doAction(GUI_ACTION_WAVE_LIST_DOWN);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_TIMES "##WaveDelete")) {
+      doAction(GUI_ACTION_WAVE_LIST_DELETE);
+    }
+    ImGui::Separator();
+    if (ImGui::BeginTable("WaveListScroll",1,ImGuiTableFlags_ScrollY)) {
+      actualWaveList();
+      ImGui::EndTable();
+    }
+  }
+  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_WAVE_LIST;
+  ImGui::End();
+}
+
+void FurnaceGUI::drawSampleList() {
+  if (nextWindow==GUI_WINDOW_SAMPLE_LIST) {
+    sampleListOpen=true;
+    ImGui::SetNextWindowFocus();
+    nextWindow=GUI_WINDOW_NOTHING;
+  }
+  if (!sampleListOpen) return;
+  if (ImGui::Begin("Samples",&sampleListOpen)) {
+    if (ImGui::Button(ICON_FA_PLUS "##SampleAdd")) {
+      doAction(GUI_ACTION_SAMPLE_LIST_ADD);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FOLDER_OPEN "##SampleLoad")) {
+      doAction(GUI_ACTION_SAMPLE_LIST_OPEN);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FLOPPY_O "##SampleSave")) {
+      doAction(GUI_ACTION_SAMPLE_LIST_SAVE);
+    }
+    ImGui::SameLine();
+    if (ImGui::ArrowButton("SampleUp",ImGuiDir_Up)) {
+      doAction(GUI_ACTION_SAMPLE_LIST_MOVE_UP);
+    }
+    ImGui::SameLine();
+    if (ImGui::ArrowButton("SampleDown",ImGuiDir_Down)) {
+      doAction(GUI_ACTION_SAMPLE_LIST_MOVE_DOWN);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_TIMES "##SampleDelete")) {
+      doAction(GUI_ACTION_SAMPLE_LIST_DELETE);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_VOLUME_UP "##PreviewSampleL")) {
+      doAction(GUI_ACTION_SAMPLE_LIST_PREVIEW);
+    }
+    ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_VOLUME_OFF "##StopSampleL")) {
+      doAction(GUI_ACTION_SAMPLE_LIST_STOP_PREVIEW);
+    }
+    ImGui::Separator();
+    if (ImGui::BeginTable("SampleListScroll",1,ImGuiTableFlags_ScrollY)) {
+      actualSampleList();
+      ImGui::EndTable();
+    }
+    ImGui::Unindent();
+  }
+  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_SAMPLE_LIST;
+  ImGui::End();
+}
+
+void FurnaceGUI::actualWaveList() {
+  float wavePreview[256];
+  for (int i=0; i<(int)e->song.wave.size(); i++) {
+    DivWavetable* wave=e->song.wave[i];
+    for (int i=0; i<wave->len; i++) {
+      wavePreview[i]=wave->data[i];
+    }
+    if (wave->len>0) wavePreview[wave->len]=wave->data[wave->len-1];
+    ImGui::TableNextRow();
+    ImGui::TableNextColumn();
+    if (ImGui::Selectable(fmt::sprintf("%d##_WAVE%d\n",i,i).c_str(),curWave==i)) {
+      curWave=i;
+    }
+    if (ImGui::IsItemHovered()) {
+      if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {
+        waveEditOpen=true;
+      }
+    }
+    ImGui::SameLine();
+    PlotNoLerp(fmt::sprintf("##_WAVEP%d",i).c_str(),wavePreview,wave->len+1,0,NULL,0,wave->max);
+  }
+}
+
+void FurnaceGUI::actualSampleList() {
+  for (int i=0; i<(int)e->song.sample.size(); i++) {
+    DivSample* sample=e->song.sample[i];
+    ImGui::TableNextRow();
+    ImGui::TableNextColumn();
+    if (ImGui::Selectable(fmt::sprintf("%d: %s##_SAM%d",i,sample->name,i).c_str(),curSample==i)) {
+      curSample=i;
+      samplePos=0;
+      updateSampleTex=true;
+    }
+    if (ImGui::IsItemHovered()) {
+      ImGui::SetTooltip("Bank %d: %s",i/12,sampleNote[i%12]);
+      if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {
+        sampleEditOpen=true;
+      }
+    }
+  }
+}

src/gui/gui.cpp

@@ -1138,304 +1138,6 @@ void FurnaceGUI::drawSongInfo() {
   ImGui::End();
 }
 
-void FurnaceGUI::drawInsList() {
-  if (nextWindow==GUI_WINDOW_INS_LIST) {
-    insListOpen=true;
-    ImGui::SetNextWindowFocus();
-    nextWindow=GUI_WINDOW_NOTHING;
-  }
-  if (!insListOpen) return;
-  if (ImGui::Begin("Instruments",&insListOpen)) {
-    if (ImGui::Button(ICON_FA_PLUS "##InsAdd")) {
-      doAction(GUI_ACTION_INS_LIST_ADD);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FILES_O "##InsClone")) {
-      doAction(GUI_ACTION_INS_LIST_DUPLICATE);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FOLDER_OPEN "##InsLoad")) {
-      doAction(GUI_ACTION_INS_LIST_OPEN);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FLOPPY_O "##InsSave")) {
-      doAction(GUI_ACTION_INS_LIST_SAVE);
-    }
-    ImGui::SameLine();
-    if (ImGui::ArrowButton("InsUp",ImGuiDir_Up)) {
-      doAction(GUI_ACTION_INS_LIST_MOVE_UP);
-    }
-    ImGui::SameLine();
-    if (ImGui::ArrowButton("InsDown",ImGuiDir_Down)) {
-      doAction(GUI_ACTION_INS_LIST_MOVE_DOWN);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_TIMES "##InsDelete")) {
-      doAction(GUI_ACTION_INS_LIST_DELETE);
-    }
-    ImGui::Separator();
-    if (ImGui::BeginTable("InsListScroll",1,ImGuiTableFlags_ScrollY)) {
-      if (settings.unifiedDataView) {
-        ImGui::TableNextRow();
-        ImGui::TableNextColumn();
-        ImGui::Text(ICON_FA_TASKS " Instruments");
-        ImGui::Indent();
-      }
-
-      for (int i=0; i<(int)e->song.ins.size(); i++) {
-        DivInstrument* ins=e->song.ins[i];
-        String name;
-        switch (ins->type) {
-          case DIV_INS_FM:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_FM]);
-            name=fmt::sprintf(ICON_FA_AREA_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_STD:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_STD]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_GB:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_GB]);
-            name=fmt::sprintf(ICON_FA_GAMEPAD " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_C64:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_C64]);
-            name=fmt::sprintf(ICON_FA_KEYBOARD_O " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_AMIGA:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_AMIGA]);
-            name=fmt::sprintf(ICON_FA_VOLUME_UP " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_PCE:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_PCE]);
-            name=fmt::sprintf(ICON_FA_ID_BADGE " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_AY:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_AY]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_AY8930:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_AY8930]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_TIA:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_TIA]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_SAA1099:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_SAA1099]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_VIC:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_VIC]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_PET:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_PET]);
-            name=fmt::sprintf(ICON_FA_SQUARE " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_VRC6:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_VRC6]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_OPLL:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_OPLL]);
-            name=fmt::sprintf(ICON_FA_AREA_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_OPL:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_OPL]);
-            name=fmt::sprintf(ICON_FA_AREA_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_FDS:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_FDS]);
-            name=fmt::sprintf(ICON_FA_FLOPPY_O " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_VBOY:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_VBOY]);
-            name=fmt::sprintf(ICON_FA_BINOCULARS " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_N163:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_N163]);
-            name=fmt::sprintf(ICON_FA_CALCULATOR " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_SCC:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_SCC]);
-            name=fmt::sprintf(ICON_FA_CALCULATOR " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_OPZ:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_OPZ]);
-            name=fmt::sprintf(ICON_FA_AREA_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_POKEY:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_POKEY]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_BEEPER:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_BEEPER]);
-            name=fmt::sprintf(ICON_FA_SQUARE " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_SWAN:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_SWAN]);
-            name=fmt::sprintf(ICON_FA_GAMEPAD " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_MIKEY:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_MIKEY]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_VERA:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_VERA]);
-            name=fmt::sprintf(ICON_FA_KEYBOARD_O " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          case DIV_INS_X1_010:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_X1_010]);
-            name=fmt::sprintf(ICON_FA_BAR_CHART " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-          default:
-            ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_INSTR_UNKNOWN]);
-            name=fmt::sprintf(ICON_FA_QUESTION " %.2X: %s##_INS%d",i,ins->name,i);
-            break;
-        }
-        ImGui::TableNextRow();
-        ImGui::TableNextColumn();
-        if (ImGui::Selectable(name.c_str(),curIns==i)) {
-          curIns=i;
-        }
-        if (settings.insFocusesPattern && patternOpen && ImGui::IsItemActivated()) {
-          nextWindow=GUI_WINDOW_PATTERN;
-          curIns=i;
-        }
-        ImGui::PopStyleColor();
-        if (ImGui::IsItemHovered()) {
-          ImGui::SetTooltip("%s",(ins->type>DIV_INS_MAX)?"Unknown":insTypes[ins->type]);
-          if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {
-            insEditOpen=true;
-            nextWindow=GUI_WINDOW_INS_EDIT;
-          }
-        }
-      }
-
-      if (settings.unifiedDataView) {
-        ImGui::Unindent();
-
-        ImGui::TableNextRow();
-        ImGui::TableNextColumn();
-        ImGui::Text(ICON_FA_AREA_CHART " Wavetables");
-        ImGui::Indent();
-        actualWaveList();
-        ImGui::Unindent();
-
-        ImGui::TableNextRow();
-        ImGui::TableNextColumn();
-        ImGui::Text(ICON_FA_VOLUME_UP " Samples");
-        ImGui::Indent();
-        actualSampleList();
-        ImGui::Unindent();
-      }
-
-      ImGui::EndTable();
-    }
-  }
-  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_INS_LIST;
-  ImGui::End();
-}
-
-const char* sampleNote[12]={
-  "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"
-};
-
-
-void FurnaceGUI::actualWaveList() {
-  float wavePreview[256];
-  for (int i=0; i<(int)e->song.wave.size(); i++) {
-    DivWavetable* wave=e->song.wave[i];
-    for (int i=0; i<wave->len; i++) {
-      wavePreview[i]=wave->data[i];
-    }
-    if (wave->len>0) wavePreview[wave->len]=wave->data[wave->len-1];
-    ImGui::TableNextRow();
-    ImGui::TableNextColumn();
-    if (ImGui::Selectable(fmt::sprintf("%d##_WAVE%d\n",i,i).c_str(),curWave==i)) {
-      curWave=i;
-    }
-    if (ImGui::IsItemHovered()) {
-      if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {
-        waveEditOpen=true;
-      }
-    }
-    ImGui::SameLine();
-    PlotNoLerp(fmt::sprintf("##_WAVEP%d",i).c_str(),wavePreview,wave->len+1,0,NULL,0,wave->max);
-  }
-}
-
-void FurnaceGUI::actualSampleList() {
-  for (int i=0; i<(int)e->song.sample.size(); i++) {
-    DivSample* sample=e->song.sample[i];
-    ImGui::TableNextRow();
-    ImGui::TableNextColumn();
-    if (ImGui::Selectable(fmt::sprintf("%d: %s##_SAM%d",i,sample->name,i).c_str(),curSample==i)) {
-      curSample=i;
-      samplePos=0;
-      updateSampleTex=true;
-    }
-    if (ImGui::IsItemHovered()) {
-      ImGui::SetTooltip("Bank %d: %s",i/12,sampleNote[i%12]);
-      if (ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left)) {
-        sampleEditOpen=true;
-      }
-    }
-  }
-}
-
-void FurnaceGUI::drawSampleList() {
-  if (nextWindow==GUI_WINDOW_SAMPLE_LIST) {
-    sampleListOpen=true;
-    ImGui::SetNextWindowFocus();
-    nextWindow=GUI_WINDOW_NOTHING;
-  }
-  if (!sampleListOpen) return;
-  if (ImGui::Begin("Samples",&sampleListOpen)) {
-    if (ImGui::Button(ICON_FA_PLUS "##SampleAdd")) {
-      doAction(GUI_ACTION_SAMPLE_LIST_ADD);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FOLDER_OPEN "##SampleLoad")) {
-      doAction(GUI_ACTION_SAMPLE_LIST_OPEN);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FLOPPY_O "##SampleSave")) {
-      doAction(GUI_ACTION_SAMPLE_LIST_SAVE);
-    }
-    ImGui::SameLine();
-    if (ImGui::ArrowButton("SampleUp",ImGuiDir_Up)) {
-      doAction(GUI_ACTION_SAMPLE_LIST_MOVE_UP);
-    }
-    ImGui::SameLine();
-    if (ImGui::ArrowButton("SampleDown",ImGuiDir_Down)) {
-      doAction(GUI_ACTION_SAMPLE_LIST_MOVE_DOWN);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_TIMES "##SampleDelete")) {
-      doAction(GUI_ACTION_SAMPLE_LIST_DELETE);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_VOLUME_UP "##PreviewSampleL")) {
-      doAction(GUI_ACTION_SAMPLE_LIST_PREVIEW);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_VOLUME_OFF "##StopSampleL")) {
-      doAction(GUI_ACTION_SAMPLE_LIST_STOP_PREVIEW);
-    }
-    ImGui::Separator();
-    if (ImGui::BeginTable("SampleListScroll",1,ImGuiTableFlags_ScrollY)) {
-      actualSampleList();
-      ImGui::EndTable();
-    }
-    ImGui::Unindent();
-  }
-  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_SAMPLE_LIST;
-  ImGui::End();
-}
-
 void FurnaceGUI::drawMixer() {
   if (nextWindow==GUI_WINDOW_MIXER) {
     mixerOpen=true;

src/gui/insEdit.cpp

@@ -1946,132 +1946,4 @@ void FurnaceGUI::drawInsEdit() {
   }
   if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_INS_EDIT;
   ImGui::End();
-}
+}
-
-#undef P
-#undef PARAMETER
-
-void FurnaceGUI::drawWaveList() {
-  if (nextWindow==GUI_WINDOW_WAVE_LIST) {
-    waveListOpen=true;
-    ImGui::SetNextWindowFocus();
-    nextWindow=GUI_WINDOW_NOTHING;
-  }
-  if (!waveListOpen) return;
-  if (ImGui::Begin("Wavetables",&waveListOpen)) {
-    if (ImGui::Button(ICON_FA_PLUS "##WaveAdd")) {
-      doAction(GUI_ACTION_WAVE_LIST_ADD);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FILES_O "##WaveClone")) {
-      doAction(GUI_ACTION_WAVE_LIST_DUPLICATE);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FOLDER_OPEN "##WaveLoad")) {
-      doAction(GUI_ACTION_WAVE_LIST_OPEN);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_FLOPPY_O "##WaveSave")) {
-      doAction(GUI_ACTION_WAVE_LIST_SAVE);
-    }
-    ImGui::SameLine();
-    if (ImGui::ArrowButton("WaveUp",ImGuiDir_Up)) {
-      doAction(GUI_ACTION_WAVE_LIST_UP);
-    }
-    ImGui::SameLine();
-    if (ImGui::ArrowButton("WaveDown",ImGuiDir_Down)) {
-      doAction(GUI_ACTION_WAVE_LIST_DOWN);
-    }
-    ImGui::SameLine();
-    if (ImGui::Button(ICON_FA_TIMES "##WaveDelete")) {
-      doAction(GUI_ACTION_WAVE_LIST_DELETE);
-    }
-    ImGui::Separator();
-    if (ImGui::BeginTable("WaveListScroll",1,ImGuiTableFlags_ScrollY)) {
-      actualWaveList();
-      ImGui::EndTable();
-    }
-  }
-  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_WAVE_LIST;
-  ImGui::End();
-}
-
-void FurnaceGUI::drawWaveEdit() {
-  if (nextWindow==GUI_WINDOW_WAVE_EDIT) {
-    waveEditOpen=true;
-    ImGui::SetNextWindowFocus();
-    nextWindow=GUI_WINDOW_NOTHING;
-  }
-  if (!waveEditOpen) return;
-  float wavePreview[256];
-  ImGui::SetNextWindowSizeConstraints(ImVec2(450.0f*dpiScale,300.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
-  if (ImGui::Begin("Wavetable Editor",&waveEditOpen,settings.allowEditDocking?0:ImGuiWindowFlags_NoDocking)) {
-    if (curWave<0 || curWave>=(int)e->song.wave.size()) {
-      ImGui::Text("no wavetable selected");
-    } else {
-      DivWavetable* wave=e->song.wave[curWave];
-      ImGui::Text("Width");
-      if (ImGui::IsItemHovered()) {
-        ImGui::SetTooltip("use a width of:\n- any on Amiga/X1-010\n- 32 on Game Boy, PC Engine and WonderSwan\nany other widths will be scaled during playback.");
-      }
-      ImGui::SameLine();
-      ImGui::SetNextItemWidth(128.0f*dpiScale);
-      if (ImGui::InputInt("##_WTW",&wave->len,1,2)) {
-        if (wave->len>256) wave->len=256;
-        if (wave->len<1) wave->len=1;
-        e->notifyWaveChange(curWave);
-        if (wavePreviewOn) e->previewWave(curWave,wavePreviewNote);
-        MARK_MODIFIED;
-      }
-      ImGui::SameLine();
-      ImGui::Text("Height");
-      if (ImGui::IsItemHovered()) {
-        ImGui::SetTooltip("use a height of:\n- 15 for Game Boy and WonderSwan\n- 31 for PC Engine\nany other heights will be scaled during playback.");
-      }
-      ImGui::SameLine();
-      ImGui::SetNextItemWidth(128.0f*dpiScale);
-      if (ImGui::InputInt("##_WTH",&wave->max,1,2)) {
-        if (wave->max>255) wave->max=255;
-        if (wave->max<1) wave->max=1;
-        e->notifyWaveChange(curWave);
-        MARK_MODIFIED;
-      }
-      for (int i=0; i<wave->len; i++) {
-        if (wave->data[i]>wave->max) wave->data[i]=wave->max;
-        wavePreview[i]=wave->data[i];
-      }
-      if (wave->len>0) wavePreview[wave->len]=wave->data[wave->len-1];
-      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); //wavetable text input size found here
-      if (ImGui::InputText("##MMLWave",&mmlStringW)) {
-        decodeMMLStrW(mmlStringW,wave->data,wave->len,wave->max);
-      }
-      if (!ImGui::IsItemActive()) {
-        encodeMMLStr(mmlStringW,wave->data,wave->len,-1,-1);
-      }
-
-      ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f));
-
-      ImVec2 contentRegion=ImGui::GetContentRegionAvail(); //wavetable graph size determined here
-      if (ImGui::GetContentRegionAvail().y > (ImGui::GetContentRegionAvail().x / 2.0f)) {
-        contentRegion=ImVec2(ImGui::GetContentRegionAvail().x,ImGui::GetContentRegionAvail().x / 2.0f);
-      }
-      PlotNoLerp("##Waveform",wavePreview,wave->len+1,0,NULL,0,wave->max,contentRegion);
-      if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
-        waveDragStart=ImGui::GetItemRectMin();
-        waveDragAreaSize=contentRegion;
-        waveDragMin=0;
-        waveDragMax=wave->max;
-        waveDragLen=wave->len;
-        waveDragActive=true;
-        waveDragTarget=wave->data;
-        processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y);
-        e->notifyWaveChange(curWave);
-        modified=true;
-      }
-      ImGui::PopStyleVar();
-    }
-  }
-  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_WAVE_EDIT;
-  ImGui::End();
-}
-

src/gui/waveEdit.cpp

@@ -0,0 +1,82 @@
+#include "gui.h"
+#include "plot_nolerp.h"
+#include "misc/cpp/imgui_stdlib.h"
+
+void FurnaceGUI::drawWaveEdit() {
+  if (nextWindow==GUI_WINDOW_WAVE_EDIT) {
+    waveEditOpen=true;
+    ImGui::SetNextWindowFocus();
+    nextWindow=GUI_WINDOW_NOTHING;
+  }
+  if (!waveEditOpen) return;
+  float wavePreview[256];
+  ImGui::SetNextWindowSizeConstraints(ImVec2(450.0f*dpiScale,300.0f*dpiScale),ImVec2(scrW*dpiScale,scrH*dpiScale));
+  if (ImGui::Begin("Wavetable Editor",&waveEditOpen,settings.allowEditDocking?0:ImGuiWindowFlags_NoDocking)) {
+    if (curWave<0 || curWave>=(int)e->song.wave.size()) {
+      ImGui::Text("no wavetable selected");
+    } else {
+      DivWavetable* wave=e->song.wave[curWave];
+      ImGui::Text("Width");
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("use a width of:\n- any on Amiga/X1-010\n- 32 on Game Boy, PC Engine and WonderSwan\nany other widths will be scaled during playback.");
+      }
+      ImGui::SameLine();
+      ImGui::SetNextItemWidth(128.0f*dpiScale);
+      if (ImGui::InputInt("##_WTW",&wave->len,1,2)) {
+        if (wave->len>256) wave->len=256;
+        if (wave->len<1) wave->len=1;
+        e->notifyWaveChange(curWave);
+        if (wavePreviewOn) e->previewWave(curWave,wavePreviewNote);
+        MARK_MODIFIED;
+      }
+      ImGui::SameLine();
+      ImGui::Text("Height");
+      if (ImGui::IsItemHovered()) {
+        ImGui::SetTooltip("use a height of:\n- 15 for Game Boy and WonderSwan\n- 31 for PC Engine\nany other heights will be scaled during playback.");
+      }
+      ImGui::SameLine();
+      ImGui::SetNextItemWidth(128.0f*dpiScale);
+      if (ImGui::InputInt("##_WTH",&wave->max,1,2)) {
+        if (wave->max>255) wave->max=255;
+        if (wave->max<1) wave->max=1;
+        e->notifyWaveChange(curWave);
+        MARK_MODIFIED;
+      }
+      for (int i=0; i<wave->len; i++) {
+        if (wave->data[i]>wave->max) wave->data[i]=wave->max;
+        wavePreview[i]=wave->data[i];
+      }
+      if (wave->len>0) wavePreview[wave->len]=wave->data[wave->len-1];
+      ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x); // wavetable text input size found here
+      if (ImGui::InputText("##MMLWave",&mmlStringW)) {
+        decodeMMLStrW(mmlStringW,wave->data,wave->len,wave->max);
+      }
+      if (!ImGui::IsItemActive()) {
+        encodeMMLStr(mmlStringW,wave->data,wave->len,-1,-1);
+      }
+
+      ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,ImVec2(0.0f,0.0f));
+
+      ImVec2 contentRegion=ImGui::GetContentRegionAvail(); // wavetable graph size determined here
+      if (ImGui::GetContentRegionAvail().y > (ImGui::GetContentRegionAvail().x / 2.0f)) {
+        contentRegion=ImVec2(ImGui::GetContentRegionAvail().x,ImGui::GetContentRegionAvail().x / 2.0f);
+      }
+      PlotNoLerp("##Waveform",wavePreview,wave->len+1,0,NULL,0,wave->max,contentRegion);
+      if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
+        waveDragStart=ImGui::GetItemRectMin();
+        waveDragAreaSize=contentRegion;
+        waveDragMin=0;
+        waveDragMax=wave->max;
+        waveDragLen=wave->len;
+        waveDragActive=true;
+        waveDragTarget=wave->data;
+        processDrags(ImGui::GetMousePos().x,ImGui::GetMousePos().y);
+        e->notifyWaveChange(curWave);
+        modified=true;
+      }
+      ImGui::PopStyleVar();
+    }
+  }
+  if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_WAVE_EDIT;
+  ImGui::End();
+}