Merge branch 'master' of https://github.com/tildearrow/furnace into k007232

src/engine/platform/qsound.cpp

@@ -783,7 +783,7 @@ void DivPlatformQSound::renderSamples(int sysID) {
       for (int i=0; i<length; i++) {
         sampleMem[(memPos+i)]=s->dataQSoundA[i];
       }
-      sampleLoaded[i]=true;
+      sampleLoadedBS[i]=true;
     }
     offBS[i]=memPos;
     memPos+=length+16;

src/engine/platform/sms.cpp

@@ -125,6 +125,9 @@ double DivPlatformSMS::NOTE_SN(int ch, int note) {
   if (parent->song.linearPitch==2 || !easyNoise) {
     return NOTE_PERIODIC(note);
   }
+  int easyStartingPeriod=16;
+  //int easyThreshold=round(CHIP_CLOCK/(parent->song.tuning*0.0625*pow(2.0,(float)(nbase+384)/(128.0*12.0)))/CHIP_DIVIDER);
+  int easyThreshold=round(log((chipClock/(easyStartingPeriod*CHIP_DIVIDER))/parent->song.tuning)/log(2.0));
   if (note>easyThreshold) {
     return MAX(0,easyStartingPeriod-(note-easyThreshold));
   }
@@ -132,12 +135,16 @@ double DivPlatformSMS::NOTE_SN(int ch, int note) {
 }
 
 int DivPlatformSMS::snCalcFreq(int ch) {
-  if (parent->song.linearPitch==2 && easyNoise && chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2>(easyThreshold<<7)) {
-    int ret=(((easyStartingPeriod<<7)+0x40)-(chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2-(easyThreshold<<7)))>>7;
+  double CHIP_DIVIDER=toneDivider;
+  if (ch==3) CHIP_DIVIDER=noiseDivider;
+  int easyStartingPeriod=16;
+  int easyThreshold=round(128.0*log((chipClock/(easyStartingPeriod*CHIP_DIVIDER))/parent->song.tuning)/log(2.0));
+  if (parent->song.linearPitch==2 && easyNoise && chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2>(easyThreshold)) {
+    int ret=(((easyStartingPeriod<<7))-(chan[ch].baseFreq+chan[ch].pitch+chan[ch].pitch2-(easyThreshold)))>>7;
     if (ret<0) ret=0;
     return ret;
   }
-  return parent->calcFreq(chan[ch].baseFreq,chan[ch].pitch,true,0,chan[ch].pitch2,chipClock,ch==3?noiseDivider:toneDivider);
+  return parent->calcFreq(chan[ch].baseFreq,chan[ch].pitch,true,0,chan[ch].pitch2,chipClock,CHIP_DIVIDER);
 }
 
 void DivPlatformSMS::tick(bool sysTick) {
@@ -464,40 +471,27 @@ void DivPlatformSMS::setFlags(const DivConfig& flags) {
   switch (flags.getInt("clockSel",0)) {
     case 1:
       chipClock=COLOR_PAL*4.0/5.0;
-      easyThreshold=84;
-      easyStartingPeriod=13;
       break;
     case 2:
       chipClock=4000000;
-      easyThreshold=86;
-      easyStartingPeriod=13;
       break;
     case 3:
       chipClock=COLOR_NTSC/2.0;
-      easyThreshold=72;
-      easyStartingPeriod=13;
       break;
     case 4:
       chipClock=3000000;
-      easyThreshold=81;
-      easyStartingPeriod=13;
       break;
     case 5:
       chipClock=2000000;
-      easyThreshold=74;
-      easyStartingPeriod=13;
       break;
     case 6:
       chipClock=COLOR_NTSC/8.0;
-      easyThreshold=48;
-      easyStartingPeriod=13;
       break;
     default:
       chipClock=COLOR_NTSC;
-      easyThreshold=84;
-      easyStartingPeriod=13;
       break;
   }
+  CHECK_CUSTOM_CLOCK;
   resetPhase=!flags.getBool("noPhaseReset",false);
   easyNoise=!flags.getBool("noEasyNoise",false);
   divider=16;
@@ -568,7 +562,7 @@ void DivPlatformSMS::setFlags(const DivConfig& flags) {
       stereo=false;
       break;
   }
-  CHECK_CUSTOM_CLOCK;
+
   rate=chipClock/divider;
   for (int i=0; i<4; i++) {
     oscBuf[i]->rate=rate;

src/engine/platform/sms.h

@@ -65,8 +65,6 @@ class DivPlatformSMS: public DivDispatch {
   int divider=16;
   double toneDivider=64.0;
   double noiseDivider=64.0;
-  int easyThreshold;
-  int easyStartingPeriod;
   bool updateSNMode;
   bool resetPhase;
   bool isRealSN;

src/engine/platform/snes.cpp

@@ -214,13 +214,13 @@ void DivPlatformSNES::tick(bool sysTick) {
           loop=start;
         } else if (chan[i].sample>=0 && chan[i].sample<parent->song.sampleLen) {
           start=sampleOff[chan[i].sample];
-          end=MIN(start+MAX(s->lengthBRR,1),getSampleMemCapacity());
+          end=MIN(start+MAX(s->lengthBRR+((s->loop && s->depth!=DIV_SAMPLE_DEPTH_BRR)?9:0),1),getSampleMemCapacity());
           loop=MAX(start,end-1);
           if (chan[i].audPos>0) {
             start=start+MIN(chan[i].audPos,s->lengthBRR-1)/16*9;
           }
           if (s->loopStart>=0) {
-            loop=start+s->loopStart/16*9;
+            loop=((s->depth!=DIV_SAMPLE_DEPTH_BRR)?9:0)+start+((s->loopStart/16)*9);
           }
         } else {
           start=0;
@@ -817,7 +817,7 @@ void DivPlatformSNES::renderSamples(int sysID) {
       continue;
     }
 
-    int length=s->lengthBRR;
+    int length=s->lengthBRR+((s->loop && s->depth!=DIV_SAMPLE_DEPTH_BRR)?9:0);
     int actualLength=MIN((int)(getSampleMemCapacity()-memPos)/9*9,length);
     if (actualLength>0) {
       sampleOff[i]=memPos;

src/engine/platform/vic20.cpp

@@ -80,7 +80,7 @@ void DivPlatformVIC20::calcAndWriteOutVol(int ch, int env) {
 }
 
 void DivPlatformVIC20::writeOutVol(int ch) {
-  if (!isMuted[ch]) {
+  if (!isMuted[ch] && chan[ch].active) {
     rWrite(14,chan[ch].outVol);
   }
 }