Merge pull request #2638 from bagnz0r/master

Audio optimization, usability fixes, sound peak blowout fix, Polish translation, bugfixes
This commit is contained in:
Henrik Rydgård
2013-07-18 02:54:03 -07:00
5 changed files with 20 additions and 6 deletions

View File

@@ -413,7 +413,7 @@ void SasInstance::Mix(u32 outAddr, u32 inAddr, int leftVol, int rightVol) {
// Resample to the correct pitch, writing exactly "grainSize" samples.
u32 sampleFrac = voice.sampleFrac;
const int MAX_CONFIG_VOLUME = 17; // 12 + 5
const int MAX_CONFIG_VOLUME = 20;
int volumeShift = (MAX_CONFIG_VOLUME - g_Config.iSEVolume);
if (volumeShift < 0) volumeShift = 0;
for (int i = 0; i < grainSize; i++) {