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

TITANIC: Properly flag audio buffer as finished when song is done

Browse Source
This commit is contained in:
Paul Gilbert 2017-10-14 21:31:35 -04:00
parent 55947e8ae8
commit 23a6533c95
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/titanic/sound/audio_buffer.h
View File

@ -44,7 +44,7 @@ private:
* Leave a critical section
*/
void leaveCriticalSection();
public:
private:
bool _finished;
public:
CAudioBuffer(int maxSize);
@ -74,6 +74,11 @@ public:
*/
bool full() const { return _data.full(); }
/**
* Returns true if the audio buffering is finished
*/
bool isFinished() const { return _finished && empty(); }
/**
* Adds a value to the buffer
*/
@ -93,6 +98,11 @@ public:
* Reads out a specified number of samples
*/
int read(int16 *values, int count);
/**
* Marks the buffer as finishing, and that no more new data will arrive
*/
void finalize() { _finished = true; }
};
} // End of namespace Titanic

4
engines/titanic/sound/music_room_handler.cpp
View File

@ -232,6 +232,10 @@ void CMusicRoomHandler::updateAudio() {
_audioBuffer->push(audioData, size);
delete[] audioData;
}
if (_instrumentsActive == 0)
// Reaching end of music
_audioBuffer->finalize();
}
void CMusicRoomHandler::updateInstruments() {

2
engines/titanic/sound/wave_file.cpp
View File

@ -52,7 +52,7 @@ int AudioBufferStream::readBuffer(int16 *buffer, const int numSamples) {
}
bool AudioBufferStream::endOfData() const {
return _audioBuffer->_finished;
return _audioBuffer->isFinished();
}
/*------------------------------------------------------------------------*/