src/engine/engine.cpp

@@ -2016,10 +2016,6 @@ bool DivEngine::isPreviewingSample() {
   return (sPreview.sample>=0 && sPreview.sample<(int)song.sample.size());
 }
 
-int DivEngine::getSamplePreviewSample() {
-  return sPreview.sample;
-}
-
 int DivEngine::getSamplePreviewPos() {
   return sPreview.pos;
 }

src/engine/engine.h

@@ -714,7 +714,6 @@ class DivEngine {
 
     // sample preview query
     bool isPreviewingSample();
-    int getSamplePreviewSample();
     int getSamplePreviewPos();
     double getSamplePreviewRate();
 

src/gui/sampleEdit.cpp

@@ -1676,7 +1676,7 @@ void FurnaceGUI::drawSampleEdit() {
         }
 
         dl->PushClipRect(rectMin,rectMax);
-        if (e->isPreviewingSample() && e->getSamplePreviewSample()==curSample) {
+        if (e->isPreviewingSample()) {
           if (!statusBar2.empty()) {
             statusBar2+=" | ";
           }

src/gui/settings.cpp

@@ -1074,7 +1074,9 @@ void FurnaceGUI::drawSettings() {
           ImGui::TableNextColumn();
           ImGui::Text("Action");
           ImGui::TableNextColumn();
+          ImGui::Text("Learn");
           ImGui::TableNextColumn();
+          ImGui::Text("Remove");
 
           for (size_t i=0; i<midiMap.binds.size(); i++) {
             MIDIBind& bind=midiMap.binds[i];
@@ -1176,15 +1178,13 @@ void FurnaceGUI::drawSettings() {
             }
 
             ImGui::TableNextColumn();
-            pushToggleColors(learning==(int)i);
-            if (ImGui::Button((learning==(int)i)?("waiting...##BLearn"):("Learn##BLearn"))) {
+            if (ImGui::Button((learning==(int)i)?("waiting...##BLearn"):(ICON_FA_SQUARE_O "##BLearn"))) {
               if (learning==(int)i) {
                 learning=-1;
               } else {
                 learning=i;
               }
             }
-            popToggleColors();
 
             ImGui::TableNextColumn();
             if (ImGui::Button(ICON_FA_TIMES "##BRemove")) {