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

Fixed a 'file descriptor' leak in the MP3 tracks caching

Browse Source 
system. Rewrote a bit the call to the MAD timer API.

svn-id: r4185
This commit is contained in:
Lionel Ulmer 2002-05-03 21:11:16 +00:00
parent fe54e1caec
commit aa09cbf8fe
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound.cpp
View File

@ -825,6 +825,9 @@ int Scumm::getCachedTrack(int track) {
sprintf(track_name, "%strack%d.mp3", _gameDataPath, track);
file = fopen(track_name, "rb");
_cached_tracks[current_index] = track;
/* First, close the previous file */
if (_mp3_tracks[current_index])
fclose(_mp3_tracks[current_index]);
_mp3_tracks[current_index] = NULL;
if (!file) {
// This warning is pretty pointless.
@ -892,6 +895,7 @@ int Scumm::getCachedTrack(int track) {
error:
mad_frame_finish(&frame);
mad_stream_finish(&stream);
fclose(file);
return -1;
}
@ -918,12 +922,13 @@ int Scumm::playMP3CDTrack(int track, int num_loops, int start, int delay) {
// Calc offset
frame_size = (float)(144 * _mad_header[index].bitrate / _mad_header[index].samplerate);
offset = (long)( (float)start / (float)75 * ((float)_mad_header[index].bitrate/(float)8));
// Calc delay
if (!delay) {
mad_timer_set(&duration, 0, _mp3_size[index], (_mad_header[index].bitrate/8));
mad_timer_set(&duration, (_mp3_size[index] * 8) / _mad_header[index].bitrate,
(_mp3_size[index] * 8) % _mad_header[index].bitrate, _mad_header[index].bitrate);
} else {
mad_timer_set(&duration, 0, delay, 75);
mad_timer_set(&duration, delay / 75, delay % 75, 75);
}
// Go