Merge remote-tracking branch 'upstream/master' into es5506_alt

This commit is contained in:
cam900 2022-05-30 22:20:24 +09:00
commit 02dbafb728
4 changed files with 10 additions and 1 deletions

View file

@ -1852,6 +1852,9 @@ bool DivEngine::addWaveFromFile(const char* path, bool addRaw) {
// read as .dmw
reader.seek(0,SEEK_SET);
int len=reader.readI();
if (len<=0 || len>256) {
throw EndOfFileException(&reader,reader.size());
}
wave->max=(unsigned char)reader.readC();
if (wave->max==255) { // new wavetable format
unsigned char waveVersion=reader.readC();

View file

@ -208,6 +208,7 @@ int DivPlatformZXBeeper::dispatch(DivCommand c) {
chan[c.chan].duty=c.value;
break;
case DIV_CMD_SAMPLE_MODE:
if (isMuted[c.chan]) break;
curSample=c.value;
curSamplePos=0;
curSamplePeriod=0;