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

Merge branch 'master' into minmod

Browse source
This commit is contained in:
tildearrow 2024-03-17 15:44:38 -05:00
commit 11e492c897
29 changed files with 2369 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/gui/insEdit.cpp
View file

@ -2505,7 +2505,8 @@ void FurnaceGUI::insTabSample(DivInstrument* ins) {
ins->type==DIV_INS_AY ||
ins->type==DIV_INS_AY8930 ||
ins->type==DIV_INS_VRC6 ||
ins->type==DIV_INS_SU) {
ins->type==DIV_INS_SU ||
ins->type==DIV_INS_NDS) {
P(ImGui::Checkbox("Use sample",&ins->amiga.useSample));
if (ins->type==DIV_INS_X1_010) {
if (ImGui::InputInt("Sample bank slot##BANKSLOT",&ins->x1_010.bankSlot,1,4)) { PARAMETER
@ -6028,6 +6029,7 @@ void FurnaceGUI::drawInsEdit() {
ins->type==DIV_INS_K053260 ||
ins->type==DIV_INS_C140 ||
ins->type==DIV_INS_C219 ||
ins->type==DIV_INS_NDS ||
ins->type==DIV_INS_GBA_DMA ||
ins->type==DIV_INS_GBA_MINMOD) {
insTabSample(ins);
@ -6751,7 +6753,7 @@ void FurnaceGUI::drawInsEdit() {
if (ins->type==DIV_INS_FM || ins->type==DIV_INS_SEGAPCM || ins->type==DIV_INS_MIKEY ||
ins->type==DIV_INS_MULTIPCM || ins->type==DIV_INS_SU || ins->type==DIV_INS_OPZ ||
ins->type==DIV_INS_OPM || ins->type==DIV_INS_SNES || ins->type==DIV_INS_MSM5232 ||
ins->type==DIV_INS_K053260) {
ins->type==DIV_INS_K053260 || ins->type==DIV_INS_NDS) {
volMax=127;
}
if (ins->type==DIV_INS_GB) {
@ -6936,6 +6938,10 @@ void FurnaceGUI::drawInsEdit() {
dutyLabel="Noise Freq";
dutyMax=3;
}
if (ins->type==DIV_INS_NDS) {
dutyLabel="Duty";
dutyMax=ins->amiga.useSample?0:7;
}
const char* waveLabel="Waveform";
int waveMax=(ins->type==DIV_INS_VERA)?3:(MAX(1,e->song.waveLen-1));
@ -6974,6 +6980,7 @@ void FurnaceGUI::drawInsEdit() {
if (ins->type==DIV_INS_POWERNOISE_SLOPE) waveMax=0;
if (ins->type==DIV_INS_SU || ins->type==DIV_INS_POKEY) waveMax=7;
if (ins->type==DIV_INS_DAVE) waveMax=4;
if (ins->type==DIV_INS_NDS) waveMax=0;
if (ins->type==DIV_INS_PET) {
waveMax=8;
waveBitMode=true;
@ -7130,6 +7137,11 @@ void FurnaceGUI::drawInsEdit() {
if (ins->type==DIV_INS_DAVE) {
panMax=63;
}
if (ins->type==DIV_INS_NDS) {
panMin=-64;
panMax=63;
panSingleNoBit=true;
}
if (volMax>0) {
macroList.push_back(FurnaceGUIMacroDesc(volumeLabel,&ins->std.volMacro,volMin,volMax,160,uiColors[GUI_COLOR_MACRO_VOLUME]));
@ -7221,6 +7233,7 @@ void FurnaceGUI::drawInsEdit() {
ins->type==DIV_INS_POWERNOISE ||
ins->type==DIV_INS_POWERNOISE_SLOPE ||
ins->type==DIV_INS_DAVE ||
ins->type==DIV_INS_NDS ||
ins->type==DIV_INS_GBA_DMA) {
macroList.push_back(FurnaceGUIMacroDesc("Phase Reset",&ins->std.phaseResetMacro,0,1,32,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true));
}