From b3e9f53ec47f30e1c520522c4728fd1f3288983d Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Wed, 27 Jul 2022 17:57:36 -0500
Subject: [PATCH] GUI: the poll

---
 src/gui/songInfo.cpp |   2 -
 src/gui/subSongs.cpp | 130 -------------------------------------------
 2 files changed, 132 deletions(-)

diff --git a/src/gui/songInfo.cpp b/src/gui/songInfo.cpp
index f1428db5e..7f7e026ed 100644
--- a/src/gui/songInfo.cpp
+++ b/src/gui/songInfo.cpp
@@ -226,8 +226,6 @@ void FurnaceGUI::drawSongInfo() {
       }
       ImGui::EndTable();
     }
-
-    ImGui::TextWrapped("if this feels incomplete, go to Subsongs.\nthe outcome of this Song Information window will be determined by a poll on the Furnace Discord.");
   }
   if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_SONG_INFO;
   ImGui::End();
diff --git a/src/gui/subSongs.cpp b/src/gui/subSongs.cpp
index c100600d1..c56bf6405 100644
--- a/src/gui/subSongs.cpp
+++ b/src/gui/subSongs.cpp
@@ -94,136 +94,6 @@ void FurnaceGUI::drawSubSongs() {
     if (ImGui::InputText("##SubSongName",&e->curSubSong->name)) {
       MARK_MODIFIED;
     }
-
-    if (ImGui::BeginTable("OtherSubProps",3,ImGuiTableFlags_SizingStretchProp)) {
-      ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed,0.0);
-      ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthStretch,0.0);
-      ImGui::TableSetupColumn("c2",ImGuiTableColumnFlags_WidthStretch,0.0);
-
-      ImGui::TableNextRow();
-      ImGui::TableNextColumn();
-      ImGui::Text("TimeBase");
-      ImGui::TableNextColumn();
-      float avail=ImGui::GetContentRegionAvail().x;
-      ImGui::SetNextItemWidth(avail);
-      unsigned char realTB=e->curSubSong->timeBase+1;
-      if (ImGui::InputScalar("##TimeBase",ImGuiDataType_U8,&realTB,&_ONE,&_THREE)) { MARK_MODIFIED
-        if (realTB<1) realTB=1;
-        if (realTB>16) realTB=16;
-        e->curSubSong->timeBase=realTB-1;
-      }
-      ImGui::TableNextColumn();
-      ImGui::Text("%.2f BPM",calcBPM(e->curSubSong->speed1,e->curSubSong->speed2,e->curSubSong->hz,e->curSubSong->virtualTempoN,e->curSubSong->virtualTempoD));
-
-      ImGui::TableNextRow();
-      ImGui::TableNextColumn();
-      ImGui::Text("Speed");
-      ImGui::TableNextColumn();
-      ImGui::SetNextItemWidth(avail);
-      if (ImGui::InputScalar("##Speed1",ImGuiDataType_U8,&e->curSubSong->speed1,&_ONE,&_THREE)) { MARK_MODIFIED
-        if (e->curSubSong->speed1<1) e->curSubSong->speed1=1;
-        if (e->isPlaying()) play();
-      }
-      ImGui::TableNextColumn();
-      ImGui::SetNextItemWidth(avail);
-      if (ImGui::InputScalar("##Speed2",ImGuiDataType_U8,&e->curSubSong->speed2,&_ONE,&_THREE)) { MARK_MODIFIED
-        if (e->curSubSong->speed2<1) e->curSubSong->speed2=1;
-        if (e->isPlaying()) play();
-      }
-
-      ImGui::TableNextRow();
-      ImGui::TableNextColumn();
-      ImGui::Text("Virtual Tempo");
-      ImGui::TableNextColumn();
-      ImGui::SetNextItemWidth(avail);
-      if (ImGui::InputScalar("##VTempoN",ImGuiDataType_S16,&e->curSubSong->virtualTempoN,&_ONE,&_THREE)) { MARK_MODIFIED
-        if (e->curSubSong->virtualTempoN<1) e->curSubSong->virtualTempoN=1;
-        if (e->curSubSong->virtualTempoN>255) e->curSubSong->virtualTempoN=255;
-      }
-      if (ImGui::IsItemHovered()) {
-        ImGui::SetTooltip("Numerator");
-      }
-      ImGui::TableNextColumn();
-      ImGui::SetNextItemWidth(avail);
-      if (ImGui::InputScalar("##VTempoD",ImGuiDataType_S16,&e->curSubSong->virtualTempoD,&_ONE,&_THREE)) { MARK_MODIFIED
-        if (e->curSubSong->virtualTempoD<1) e->curSubSong->virtualTempoD=1;
-        if (e->curSubSong->virtualTempoD>255) e->curSubSong->virtualTempoD=255;
-      }
-      if (ImGui::IsItemHovered()) {
-        ImGui::SetTooltip("Denominator (set to base tempo)");
-      }
-
-      ImGui::TableNextRow();
-      ImGui::TableNextColumn();
-      ImGui::Text("Highlight");
-      ImGui::TableNextColumn();
-      ImGui::SetNextItemWidth(avail);
-      if (ImGui::InputScalar("##Highlight1",ImGuiDataType_U8,&e->curSubSong->hilightA,&_ONE,&_THREE)) {
-        MARK_MODIFIED;
-      }
-      ImGui::TableNextColumn();
-      ImGui::SetNextItemWidth(avail);
-      if (ImGui::InputScalar("##Highlight2",ImGuiDataType_U8,&e->curSubSong->hilightB,&_ONE,&_THREE)) {
-        MARK_MODIFIED;
-      }
-
-      ImGui::TableNextRow();
-      ImGui::TableNextColumn();
-      ImGui::Text("Pattern Length");
-      ImGui::TableNextColumn();
-      ImGui::SetNextItemWidth(avail);
-      int patLen=e->curSubSong->patLen;
-      if (ImGui::InputInt("##PatLength",&patLen,1,3)) { MARK_MODIFIED
-        if (patLen<1) patLen=1;
-        if (patLen>256) patLen=256;
-        e->curSubSong->patLen=patLen;
-      }
-
-      ImGui::TableNextRow();
-      ImGui::TableNextColumn();
-      ImGui::Text("Song Length");
-      ImGui::TableNextColumn();
-      ImGui::SetNextItemWidth(avail);
-      int ordLen=e->curSubSong->ordersLen;
-      if (ImGui::InputInt("##OrdLength",&ordLen,1,3)) { MARK_MODIFIED
-        if (ordLen<1) ordLen=1;
-        if (ordLen>256) ordLen=256;
-        e->curSubSong->ordersLen=ordLen;
-        if (curOrder>=ordLen) {
-          setOrder(ordLen-1);
-        }
-      }
-
-      ImGui::TableNextRow();
-      ImGui::TableNextColumn();
-      if (ImGui::Selectable(tempoView?"Base Tempo##TempoOrHz":"Tick Rate##TempoOrHz")) {
-        tempoView=!tempoView;
-      }
-      ImGui::TableNextColumn();
-      ImGui::SetNextItemWidth(avail);
-      float setHz=tempoView?e->curSubSong->hz*2.5:e->curSubSong->hz;
-      if (ImGui::InputFloat("##Rate",&setHz,1.0f,1.0f,"%g")) { MARK_MODIFIED
-        if (tempoView) setHz/=2.5;
-        if (setHz<10) setHz=10;
-        if (setHz>999) setHz=999;
-        e->setSongRate(setHz,setHz<52);
-      }
-      if (tempoView) {
-        ImGui::TableNextColumn();
-        ImGui::Text("= %gHz",e->curSubSong->hz);
-      } else {
-        if (e->curSubSong->hz>=49.98 && e->curSubSong->hz<=50.02) {
-          ImGui::TableNextColumn();
-          ImGui::Text("PAL");
-        }
-        if (e->curSubSong->hz>=59.9 && e->curSubSong->hz<=60.11) {
-          ImGui::TableNextColumn();
-          ImGui::Text("NTSC");
-        }
-      }
-
-      ImGui::EndTable();
-    }
   }
   if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_SUBSONGS;
   ImGui::End();