otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

GUI: allow use of negative octaves

Browse source 
closes #41
This commit is contained in:
tildearrow 2022-01-20 16:21:35 -05:00
parent 0f28ae0fee
commit aa82ccfbc5
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/gui.cpp
View file

@ -277,7 +277,7 @@ void FurnaceGUI::drawEditControls() {
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::InputInt("##Octave",&curOctave,1,1)) { if (ImGui::InputInt("##Octave",&curOctave,1,1)) {
if (curOctave>6) curOctave=6; if (curOctave>6) curOctave=6;
if (curOctave<0) curOctave=0; if (curOctave<-5) curOctave=-5;
} }
ImGui::Text("Edit Step"); ImGui::Text("Edit Step");
@ -2570,7 +2570,7 @@ void FurnaceGUI::doTranspose(int amount) {
for (int j=selStart.y; j<=selEnd.y; j++) { for (int j=selStart.y; j<=selEnd.y; j++) {
if (iFine==0) { if (iFine==0) {
int origNote=pat->data[j][0]; int origNote=pat->data[j][0];
int origOctave=pat->data[j][1]; int origOctave=(signed char)pat->data[j][1];
if (origNote!=0 && origNote!=100) { if (origNote!=0 && origNote!=100) {
origNote+=amount; origNote+=amount;
while (origNote>12) { while (origNote>12) {
@ -2585,12 +2585,12 @@ void FurnaceGUI::doTranspose(int amount) {
origNote=12; origNote=12;
origOctave=7; origOctave=7;
} }
if (origOctave<0) { if (origOctave<-5) {
origNote=1; origNote=1;
origOctave=0; origOctave=-5;
} }
pat->data[j][0]=origNote; pat->data[j][0]=origNote;
pat->data[j][1]=origOctave; pat->data[j][1]=(unsigned char)origOctave;
} }
} }
} }
@ -3036,6 +3036,7 @@ void FurnaceGUI::keyDown(SDL_Event& ev) {
pat->data[cursor.y][0]=12; pat->data[cursor.y][0]=12;
pat->data[cursor.y][1]--; pat->data[cursor.y][1]--;
} }
pat->data[cursor.y][1]=(unsigned char)pat->data[cursor.y][1];
pat->data[cursor.y][2]=curIns; pat->data[cursor.y][2]=curIns;
previewNote(cursor.xCoarse,num); previewNote(cursor.xCoarse,num);
} }