Return an error on bad SAS sample rate.

Also reorder the types to fit the PSP's flag values.
This commit is contained in:
Unknown W. Brackets 2013-09-01 16:59:37 -07:00
parent 63e4b1542f
commit fe1f4d53c6
2 changed files with 6 additions and 2 deletions

View File

@ -86,6 +86,10 @@ u32 sceSasInit(u32 core, u32 grainSize, u32 maxVoices, u32 outputMode, u32 sampl
ERROR_LOG_REPORT(HLE, "sceSasInit(%08x, %i, %i, %i, %i): bad output mode", core, grainSize, maxVoices, outputMode, sampleRate);
return ERROR_SAS_INVALID_OUTPUT_MODE;
}
if (sampleRate != 44100) {
ERROR_LOG_REPORT(HLE, "sceSasInit(%08x, %i, %i, %i, %i): bad sample rate", core, grainSize, maxVoices, outputMode, sampleRate);
return ERROR_SAS_INVALID_SAMPLE_RATE;
}
INFO_LOG(HLE, "sceSasInit(%08x, %i, %i, %i, %i)", core, grainSize, maxVoices, outputMode, sampleRate);
sas->SetGrainSize(grainSize);

View File

@ -66,11 +66,11 @@ struct WaveformEffect
enum VoiceType {
VOICETYPE_OFF,
VOICETYPE_VAG, // default
VOICETYPE_PCM,
VOICETYPE_NOISE,
VOICETYPE_ATRAC3,
VOICETYPE_TRIWAVE, // are these used? there are functions for them (sceSetTriangularWave)
VOICETYPE_PULSEWAVE,
VOICETYPE_PCM,
VOICETYPE_ATRAC3,
};
// VAG is a Sony ADPCM audio compression format, which goes all the way back to the PSX.