libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 19:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Let the mixer worry about converting mono to stereo.

Browse Source 
svn-id: r26065
This commit is contained in:
Torbjörn Andersson 2007-03-10 17:39:27 +00:00
parent 06c2976fa0
commit 8d4e8adef3
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/sky/music/adlibmusic.cpp
View File

@ -47,38 +47,33 @@ AdlibMusic::~AdlibMusic(void) {
_mixer->stopHandle(_soundHandle);
}
void AdlibMusic::premixerCall(int16 *data, uint len) {
int AdlibMusic::readBuffer(int16 *data, const int numSamples) {
if (_musicData == NULL) {
// no music loaded
memset(data, 0, 2 * len * sizeof(int16));
memset(data, 0, numSamples * sizeof(int16));
} else if ((_currentMusic == 0) || (_numberOfChannels == 0)) {
// music loaded but not played as of yet
memset(data, 0, 2 * len * sizeof(int16));
memset(data, 0, numSamples * sizeof(int16));
// poll anyways as pollMusic() can activate the music
pollMusic();
_nextMusicPoll = _sampleRate/50;
_nextMusicPoll = _sampleRate / 50;
} else {
uint32 render;
int16 *origData = data;
uint origLen = len;
while (len) {
render = (len > _nextMusicPoll) ? (_nextMusicPoll) : (len);
len -= render;
int remaining = numSamples;
while (remaining) {
render = (remaining > _nextMusicPoll) ? (_nextMusicPoll) : (remaining);
remaining -= render;
_nextMusicPoll -= render;
YM3812UpdateOne(_opl, data, render);
data += render;
if (_nextMusicPoll == 0) {
pollMusic();
_nextMusicPoll = _sampleRate/50;
_nextMusicPoll = _sampleRate / 50;
}
}
// Convert mono data to stereo
for (int i = (origLen - 1); i >= 0; i--) {
origData[2 * i] = origData[2 * i + 1] = origData[i];
}
}
return numSamples;
}
void AdlibMusic::setupPointers(void) {

7
engines/sky/music/adlibmusic.h
View File

@ -36,11 +36,8 @@ public:
~AdlibMusic(void);
// AudioStream API
int readBuffer(int16 *buffer, const int numSamples) {
premixerCall(buffer, numSamples / 2);
return numSamples;
}
bool isStereo() const { return true; }
int readBuffer(int16 *buffer, const int numSamples);
bool isStereo() const { return false; }
bool endOfData() const { return false; }
int getRate() const { return _sampleRate; }