libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed FlacInputStream::deleteBuffer

Browse Source 
svn-id: r25829
This commit is contained in:
Max Horn 2007-02-24 19:54:54 +00:00
parent 8fa6a1ffd5
commit ebfb2c57e1
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/flac.cpp
View File

@ -135,7 +135,6 @@ protected:
uint getChannels() const { return MIN(_streaminfo.channels, MAX_OUTPUT_CHANNELS); }
bool allocateBuffer(uint minSamples);
inline void deleteBuffer();
inline FLAC__StreamDecoderState getStreamDecoderState() const;
@ -192,7 +191,6 @@ FlacInputStream::FlacInputStream(Common::SeekableReadStream *inStream, bool disp
_preBuffer.bufFill = 0;
_preBuffer.bufSize = 0;
deleteBuffer();
_lastSampleWritten = false;
_methodConvertBuffers = &FlacInputStream::convertBuffersGeneric;
@ -385,16 +383,6 @@ inline ::FLAC__SeekableStreamDecoderReadStatus FlacInputStream::callbackRead(FLA
#endif
}
inline void FlacInputStream::deleteBuffer() {
_lastSampleWritten = _lastSampleWritten && _preBuffer.bufFill == 0;
_preBuffer.bufFill = 0;
_preBuffer.bufSize = 0;
if (_preBuffer.bufData != NULL) {
delete[] _preBuffer.bufData;
_preBuffer.bufData = NULL;
}
}
bool FlacInputStream::allocateBuffer(uint minSamples) {
uint allocateSize = minSamples / getChannels();
/** insert funky algorythm for optimum buffersize here */
@ -402,7 +390,10 @@ bool FlacInputStream::allocateBuffer(uint minSamples) {
allocateSize += 8 - (allocateSize % 8); // make sure its an nice even amount
allocateSize *= getChannels();
deleteBuffer();
_lastSampleWritten = _lastSampleWritten && _preBuffer.bufFill == 0;
_preBuffer.bufFill = 0;
_preBuffer.bufSize = 0;
delete[] _preBuffer.bufData;
_preBuffer.bufData = new SampleType[allocateSize];
if (_preBuffer.bufData != NULL) {