mirror of
https://github.com/scummvm/scummvm.git
synced 2026-06-20 05:45:29 +00:00
TITANIC: Standardize audio rate constants
This commit is contained in:
@@ -28,10 +28,12 @@
|
||||
|
||||
namespace Titanic {
|
||||
|
||||
#define AUDIO_SAMPLING_RATE 22050
|
||||
|
||||
class CAudioBuffer {
|
||||
private:
|
||||
Common::Mutex _mutex;
|
||||
FixedQueue<int16, 88200> _data;
|
||||
FixedQueue<int16, AUDIO_SAMPLING_RATE * 4> _data;
|
||||
public:
|
||||
bool _finished;
|
||||
public:
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
|
||||
namespace Titanic {
|
||||
|
||||
const uint SAMPLING_RATE = 22050;
|
||||
const uint LATENCY = 100;
|
||||
const uint CHANNELS_COUNT = 16;
|
||||
|
||||
@@ -110,7 +109,7 @@ QSoundManager::QSoundManager(Audio::Mixer *mixer) : CSoundManager(), QMixer(mixe
|
||||
Common::fill(&_channelsVolume[0], &_channelsVolume[16], 0);
|
||||
Common::fill(&_channelsMode[0], &_channelsMode[16], 0);
|
||||
|
||||
qsWaveMixInitEx(QMIXCONFIG(SAMPLING_RATE, CHANNELS_COUNT, LATENCY));
|
||||
qsWaveMixInitEx(QMIXCONFIG(AUDIO_SAMPLING_RATE, CHANNELS_COUNT, LATENCY));
|
||||
qsWaveMixActivate(true);
|
||||
qsWaveMixOpenChannel(0, QMIX_OPENALL);
|
||||
}
|
||||
|
||||
@@ -188,7 +188,7 @@ const int16 *CWaveFile::lock() {
|
||||
switch (_loadMode) {
|
||||
case LOADMODE_SCUMMVM:
|
||||
// Sanity checking that only raw 16-bit LE 22Khz waves can be locked
|
||||
assert(_waveData && _rate == 22050);
|
||||
assert(_waveData && _rate == AUDIO_SAMPLING_RATE);
|
||||
assert(_flags == (Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_16BITS));
|
||||
assert(_wavType == kWaveFormatPCM);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user