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

Merge branch 'master' into newMixer

Browse source
This commit is contained in:
tildearrow 2025-10-21 18:05:00 -05:00
commit ab2f2a0a59
8 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/editing.cpp
View file

@ -1395,7 +1395,7 @@ void FurnaceGUI::doInterpolate() {
for (int k=0, k_p=curPoint.first; k<distance; k++) {
DivPattern* pat=e->curPat[iCoarse].getPattern(e->curOrders->ord[iCoarse][(k_p>>8)&0xff],true);
int val=curPoint.second+((nextPoint.second-curPoint.second)*(double)k/(double)distance);
pat->newData[k_p&0xff][DIV_PAT_NOTE]=val%12;
pat->newData[k_p&0xff][DIV_PAT_NOTE]=val;
k_p++;
if ((k_p&0xff)>=e->curSubSong->patLen) {
k_p&=~0xff;

2
src/gui/sampleEdit.cpp
View file

@ -1144,7 +1144,7 @@ void FurnaceGUI::drawSampleEdit() {
if (resampleTarget>384000) resampleTarget=384000;
}
double factor=resampleTarget/(double)targetRate;
unsigned int targetLength=sample->samples*factor;
unsigned int targetLength=round(sample->samples*factor);
if (ImGui::InputScalar("Length##SRLen",ImGuiDataType_U32,&targetLength, &_ONE, &_SIXTEEN)) {
if (targetLength<1) targetLength=1;
resampleTarget=targetRate*targetLength/(double)sample->samples;