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

prepare for supporting channel count in user syste

Browse source 
ms
This commit is contained in:
tildearrow 2025-11-24 20:48:22 -05:00
parent 4e2477e8ba
commit eca315b99a
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/engine/engine.cpp
View file

@ -516,9 +516,11 @@ void DivEngine::initSongWithDesc(const char* description, bool inBase64, bool ol
if (song.system[index]==DIV_SYSTEM_NULL) {
break;
}
chanCount+=getChannelCount(song.system[index]);
if (chanCount>=DIV_MAX_CHANS) {
song.systemChans[index]=c.getInt(fmt::sprintf("chans%d",index),getChannelCount(song.system[index]));
chanCount+=song.systemChans[index];
if (chanCount>DIV_MAX_CHANS) {
song.system[index]=DIV_SYSTEM_NULL;
song.systemChans[index]=1;
break;
}
song.systemVol[index]=c.getFloat(fmt::sprintf("vol%d",index),1.0f);
@ -535,7 +537,6 @@ void DivEngine::initSongWithDesc(const char* description, bool inBase64, bool ol
song.systemFlags[index].loadFromBase64(flags.c_str());
}
song.systemLen=index;
song.initDefaultSystemChans();
// extra attributes
song.subsong[0]->hz=c.getDouble("tickRate",60.0);
@ -543,7 +544,7 @@ void DivEngine::initSongWithDesc(const char* description, bool inBase64, bool ol
if (song.subsong[0]->hz>999.0) song.subsong[0]->hz=999.0;
curChanMask=c.getIntList("chanMask",{});
for (unsigned char i:curChanMask) {
for (unsigned char i: curChanMask) {
int j=i-1;
if (j<0) j=0;
if (j>DIV_MAX_CHANS) j=DIV_MAX_CHANS-1;