valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Allow the code to describe the return value

Browse source
This commit is contained in:
krcroft 2020-02-29 12:47:12 -08:00 • committed by Patryk Obara
parent 9bebfdabd3
commit c7eebacde9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/dos/cdrom_image.cpp
View file

@ -134,7 +134,15 @@ uint32_t CDROM_Interface_Image::BinaryFile::decode(int16_t *buffer,
"Requested number of frames exceeds the maximum for a CDROM [Bug]");
file->read((char*)buffer, desired_track_frames * BYTES_PER_REDBOOK_PCM_FRAME);
return (file->gcount() + BYTES_PER_REDBOOK_PCM_FRAME - 1) / BYTES_PER_REDBOOK_PCM_FRAME;
/**
* Note: gcount returns a signed type, but according to specification:
* "Except in the constructors of std::strstreambuf, negative values of
* std::streamsize are never used."; so we store it as unsigned.
*/
const uint32_t bytes_read = static_cast<uint32_t>(file->gcount());
// Return the number of decoded Redbook frames
return ceil_divide(bytes_read, BYTES_PER_REDBOOK_PCM_FRAME);
}
CDROM_Interface_Image::AudioFile::AudioFile(const char *filename, bool &error)