From 64745648a0d724586177be6718501fbf4336283b Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Tue, 18 Jan 2022 16:55:32 -0500
Subject: [PATCH] allow negative octaves

---
 src/engine/platform/pce.h |  6 +++---
 src/engine/playback.cpp   |  2 +-
 src/gui/gui.cpp           | 13 ++++++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/engine/platform/pce.h b/src/engine/platform/pce.h
index ade62bb34..3eac1d347 100644
--- a/src/engine/platform/pce.h
+++ b/src/engine/platform/pce.h
@@ -8,11 +8,11 @@
 
 class DivPlatformPCE: public DivDispatch {
   struct Channel {
-    int freq, baseFreq, pitch;
+    int freq, baseFreq, pitch, note;
     int dacPeriod, dacRate;
     unsigned int dacPos;
     int dacSample;
-    unsigned char ins, note, pan;
+    unsigned char ins, pan;
     bool active, insChanged, freqChanged, keyOn, keyOff, inPorta, noise, pcm;
     signed char vol, outVol, wave;
     DivMacroInt std;
@@ -20,12 +20,12 @@ class DivPlatformPCE: public DivDispatch {
       freq(0),
       baseFreq(0),
       pitch(0),
+      note(0),
       dacPeriod(0),
       dacRate(0),
       dacPos(0),
       dacSample(0),
       ins(-1),
-      note(0),
       pan(255),
       active(false),
       insChanged(true),
diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index 22c1c85c4..ce04a00b7 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -440,7 +440,7 @@ void DivEngine::processRow(int i, bool afterDelay) {
     dispatchCmd(DivCommand(DIV_CMD_NOTE_OFF,i));
   } else if (!(pat->data[whatRow][0]==0 && pat->data[whatRow][1]==0)) {
     chan[i].oldNote=chan[i].note;
-    chan[i].note=pat->data[whatRow][0]+pat->data[whatRow][1]*12;
+    chan[i].note=pat->data[whatRow][0]+((signed char)pat->data[whatRow][1])*12;
     if (!chan[i].keyOn) {
       if (disCont[dispatchOfChan[i]].dispatch->keyOffAffectsArp(dispatchChanOfChan[i])) {
         chan[i].arp=0;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 925285977..64eb0f70d 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -87,7 +87,12 @@ const int opOrder[4]={
   0, 2, 1, 3
 };
 
-const char* noteNames[120]={
+const char* noteNames[180]={
+  "c_5", "c+5", "d_5", "d+5", "e_5", "f_5", "f+5", "g_5", "g+5", "a_5", "a+5", "b_5",
+  "c_4", "c+4", "d_4", "d+4", "e_4", "f_4", "f+4", "g_4", "g+4", "a_4", "a+4", "b_4",
+  "c_3", "c+3", "d_3", "d+3", "e_3", "f_3", "f+3", "g_3", "g+3", "a_3", "a+3", "b_3",
+  "c_2", "c+2", "d_2", "d+2", "e_2", "f_2", "f+2", "g_2", "g+2", "a_2", "a+2", "b_2",
+  "c_1", "c+1", "d_1", "d+1", "e_1", "f_1", "f+1", "g_1", "g+1", "a_1", "a+1", "b_1",
   "C-0", "C#0", "D-0", "D#0", "E-0", "F-0", "F#0", "G-0", "G#0", "A-0", "A#0", "B-0",
   "C-1", "C#1", "D-1", "D#1", "E-1", "F-1", "F#1", "G-1", "G#1", "A-1", "A#1", "B-1",
   "C-2", "C#2", "D-2", "D#2", "E-2", "F-2", "F#2", "G-2", "G#2", "A-2", "A#2", "B-2",
@@ -114,8 +119,10 @@ const char* FurnaceGUI::noteName(short note, short octave) {
   } else if (octave==0 && note==0) {
     return "...";
   }
-  int seek=note+octave*12;
-  if (seek>=120) return "???";
+  int seek=(note+(signed char)octave*12)+60;
+  if (seek<0 || seek>=180) {
+    return "???";
+  }
   return noteNames[seek];
 }