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

more work that I did not push

Browse source
This commit is contained in:
tildearrow 2024-01-29 23:08:20 -05:00
parent 5fc0aa10e8
commit 5224c4666d
2 changed files with 20 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/gui/doAction.cpp
View file

@ -980,40 +980,15 @@ void FurnaceGUI::doAction(int what) {
} }
} }
if (makeInsTypeList.size()>1) { if (makeInsTypeList.empty()) {
makeInsTypeList.push_back(DIV_INS_AMIGA);
}
displayInsTypeList=true; displayInsTypeList=true;
displayInsTypeListMakeInsSample=-2; displayInsTypeListMakeInsSample=-2;
break; break;
} }
DivInstrumentType insType=DIV_INS_AMIGA;
if (!makeInsTypeList.empty()) {
insType=makeInsTypeList[0];
}
curIns=e->addInstrument(cursor.xCoarse);
if (curIns==-1) {
showError("too many instruments!");
} else {
e->song.ins[curIns]->type=insType;
e->song.ins[curIns]->name="Drum Kit";
e->song.ins[curIns]->amiga.useNoteMap=true;
if (insType!=DIV_INS_AMIGA) e->song.ins[curIns]->amiga.useSample=true;
for (int i=0; i<120; i++) {
e->song.ins[curIns]->amiga.noteMap[i].freq=48;
e->song.ins[curIns]->amiga.noteMap[i].map=i;
e->song.ins[curIns]->amiga.noteMap[i].dpcmFreq=15;
}
nextWindow=GUI_WINDOW_INS_EDIT;
MARK_MODIFIED;
wavePreviewInit=true;
updateFMPreview=true;
}
break;
}
case GUI_ACTION_SAMPLE_SELECT: case GUI_ACTION_SAMPLE_SELECT:
if (curSample<0 || curSample>=(int)e->song.sample.size()) break; if (curSample<0 || curSample>=(int)e->song.sample.size()) break;
sampleDragMode=false; sampleDragMode=false;

17
src/gui/gui.cpp
View file

@ -5901,7 +5901,22 @@ bool FurnaceGUI::loop() {
if (curIns==-1) { if (curIns==-1) {
showError("too many instruments!"); showError("too many instruments!");
} else { } else {
if (displayInsTypeListMakeInsSample>=0 && displayInsTypeListMakeInsSample<(int)e->song.sample.size()) { if (displayInsTypeListMakeInsSample==-2) {
e->song.ins[curIns]->type=i;
e->song.ins[curIns]->name="Drum Kit";
e->song.ins[curIns]->amiga.useNoteMap=true;
if (i!=DIV_INS_AMIGA) e->song.ins[curIns]->amiga.useSample=true;
for (int j=0; j<120; j++) {
e->song.ins[curIns]->amiga.noteMap[i].freq=48;
e->song.ins[curIns]->amiga.noteMap[i].map=j;
e->song.ins[curIns]->amiga.noteMap[i].dpcmFreq=15;
}
nextWindow=GUI_WINDOW_INS_EDIT;
wavePreviewInit=true;
updateFMPreview=true;
} else if (displayInsTypeListMakeInsSample>=0 && displayInsTypeListMakeInsSample<(int)e->song.sample.size()) {
e->song.ins[curIns]->type=i; e->song.ins[curIns]->type=i;
e->song.ins[curIns]->name=e->song.sample[displayInsTypeListMakeInsSample]->name; e->song.ins[curIns]->name=e->song.sample[displayInsTypeListMakeInsSample]->name;
e->song.ins[curIns]->amiga.initSample=displayInsTypeListMakeInsSample; e->song.ins[curIns]->amiga.initSample=displayInsTypeListMakeInsSample;