Merge branch 'brr'
This commit is contained in:
commit
b94493dcc0
|
@ -126,6 +126,8 @@ void brrEncodeBlock(const short* buf, unsigned char* out, unsigned char range, u
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (nextDec>32767) nextDec=32767;
|
||||||
|
if (nextDec<-32768) nextDec=-32768;
|
||||||
nextDec&=0x7fff;
|
nextDec&=0x7fff;
|
||||||
if (nextDec&0x4000) nextDec|=0xffff8000;
|
if (nextDec&0x4000) nextDec|=0xffff8000;
|
||||||
|
|
||||||
|
|
|
@ -498,6 +498,7 @@ void DivPlatformSMS::setFlags(const DivConfig& flags) {
|
||||||
easyStartingPeriod=13;
|
easyStartingPeriod=13;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
CHECK_CUSTOM_CLOCK;
|
||||||
resetPhase=!flags.getBool("noPhaseReset",false);
|
resetPhase=!flags.getBool("noPhaseReset",false);
|
||||||
easyNoise=!flags.getBool("noEasyNoise",false);
|
easyNoise=!flags.getBool("noEasyNoise",false);
|
||||||
divider=16;
|
divider=16;
|
||||||
|
@ -568,7 +569,6 @@ void DivPlatformSMS::setFlags(const DivConfig& flags) {
|
||||||
stereo=false;
|
stereo=false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
CHECK_CUSTOM_CLOCK;
|
|
||||||
rate=chipClock/divider;
|
rate=chipClock/divider;
|
||||||
for (int i=0; i<4; i++) {
|
for (int i=0; i<4; i++) {
|
||||||
oscBuf[i]->rate=rate;
|
oscBuf[i]->rate=rate;
|
||||||
|
|
Loading…
Reference in New Issue