Wirlaburla/Trakker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fixed my goddamn rebasing

Browse Source
This commit is contained in:
Wirlaburla 2024-02-27 21:14:13 -06:00
parent b57095ead6
commit 3b09077e4c
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main.cpp
View File

@ -621,24 +621,24 @@ void displayVolumes(xmp_module_info *mi, xmp_frame_info *fi) {
void displayNoteRoll(xmp_module_info *mi, xmp_frame_info *fi) { void displayNoteRoll(xmp_module_info *mi, xmp_frame_info *fi) {
int ins = mi->mod->ins; int ins = mi->mod->ins;
chtype no_pair = COLOR_PAIR(5); chtype no_pair = COLOR_PAIR(5);
for (int y = vOffset; y < ins; y++) { if (dynamicRoll) {
if (!dynamicRoll) { prMin = 0; prMax = 144; } for (int l = 0; l < (96/12); l++) {
else if (y == vOffset) { int cnote = (l*12);
for (int l = 0; l < (96/12); l++) { if (cnote < prMin && l == (prMin / 12)) {
int cnote = (l*12); wmove(dis, 0, 0);
if (cnote < prMin && l == (prMin / 12)) { wprintw(dis, "<%i", l);
wmove(dis, 0, 0); } else if (cnote <= prMax && cnote >= prMin) {
wprintw(dis, "<%i", l); wmove(dis, 0, (((cnote - prMin) * (COLS - 5)) / (prMax - prMin))+3);
} else if (cnote <= prMax && cnote >= prMin) { wprintw(dis, "%i", l);
wmove(dis, 0, (((cnote - prMin) * (COLS - 5)) / (prMax - prMin))+3);
wprintw(dis, "%i", l);
}
} }
} }
}
for (int y = vOffset; y < ins; y++) {
if (!dynamicRoll) { prMin = 0; prMax = 144; }
if (y > (LINES - 5)+vOffset || y < 0) continue; if (y > (LINES - 5)+vOffset || y < 0) continue;
wmove(dis, y-vOffset+1, 0); wmove(dis, (y-vOffset)+1, 0);
wattron(dis, no_pair); wattron(dis, no_pair);
wprintw(dis, "%02X", y); wprintw(dis, "%02X", y+1);
wattroff(dis, no_pair); wattroff(dis, no_pair);
wclrtoeol(dis); wclrtoeol(dis);
for (int c = 0; c < mi->mod->chn; c++) { for (int c = 0; c < mi->mod->chn; c++) {
@ -654,15 +654,15 @@ void displayNoteRoll(xmp_module_info *mi, xmp_frame_info *fi) {
int note = ((cinfo.note - prMin) * (COLS - 5)) / (dynamicRoll?(prMax - prMin):96); int note = ((cinfo.note - prMin) * (COLS - 5)) / (dynamicRoll?(prMax - prMin):96);
if (cinfo.instrument != y) continue; if (cinfo.instrument != y) continue;
wmove(dis, y-vOffset+1, note+3); wmove(dis, (y-vOffset)+1, note+3);
if (cinfo.volume >= 32) if (cinfo.volume >= 32)
waddstr(dis, "#"); waddstr(dis, "#");
else if (cinfo.volume >= 16 && (char)mvwinch(dis, y-vOffset+1, note+3) != '#') else if (cinfo.volume >= 16 && (char)mvwinch(dis, (y-vOffset)+1, note+3) != '#')
waddstr(dis, "="); waddstr(dis, "=");
else if (cinfo.volume > 0 && ((char)mvwinch(dis, y-vOffset+1, note+3) != '-' || (char)mvwinch(dis, y-vOffset, note+3) != '#')) else if (cinfo.volume > 0 && ((char)mvwinch(dis, (y-vOffset)+1, note+3) != '-' || (char)mvwinch(dis, (y-vOffset)+1, note+3) != '#'))
waddstr(dis, "-"); waddstr(dis, "-");
} }
wmove(dis, y+1, COLS-4); wmove(dis, y, COLS-4);
} }
} }