libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LAB: Simplify fillBuffer()

Browse Source
This commit is contained in:
Filippos Karapetis 2015-12-27 14:35:30 +02:00
parent 764d261873
commit 662649319b
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/lab/music.cpp
View File

@ -74,11 +74,6 @@ void Music::updateMusic() {
if (!_musicOn || (getPlayingBufferCount() >= MAXBUFFERS))
return;
// NOTE: We need to use malloc(), cause this will be freed with free()
// by the music code
byte *musicBuffer = (byte *)malloc(MUSICBUFSIZE);
fillbuffer(musicBuffer);
// Queue a music block, and start the music, if needed
bool startMusicFlag = false;
@ -87,7 +82,7 @@ void Music::updateMusic() {
startMusicFlag = true;
}
_queuingAudioStream->queueBuffer(musicBuffer, MUSICBUFSIZE, DisposeAfterUse::YES, getSoundFlags());
_queuingAudioStream->queueBuffer(fillBuffer(), MUSICBUFSIZE, DisposeAfterUse::YES, getSoundFlags());
if (startMusicFlag)
_vm->_mixer->playStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _queuingAudioStream);
@ -124,7 +119,11 @@ bool Music::isSoundEffectActive() const {
return _vm->_mixer->isSoundHandleActive(_sfxHandle);
}
void Music::fillbuffer(byte *musicBuffer) {
byte *Music::fillBuffer() {
// NOTE: We need to use malloc(), cause this will be freed with free()
// by the music code
byte *musicBuffer = (byte *)malloc(MUSICBUFSIZE);
if (MUSICBUFSIZE < _leftInFile) {
_file->read(musicBuffer, MUSICBUFSIZE);
_leftInFile -= MUSICBUFSIZE;
@ -136,6 +135,8 @@ void Music::fillbuffer(byte *musicBuffer) {
_file->seek(0);
_leftInFile = _file->size();
}
return musicBuffer;
}
void Music::startMusic(bool restartFl) {

2
engines/lab/music.h
View File

@ -66,7 +66,7 @@ private:
Audio::QueuingAudioStream *_queuingAudioStream;
private:
void fillbuffer(byte *musicBuffer);
byte *fillBuffer();
uint16 getPlayingBufferCount();
/**