diff options
| author | Paweł Kołodziejski | 2002-09-02 20:15:14 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-09-02 20:15:14 +0000 |
| commit | 687e82c0fa0811b7217c036597befb70662c2bd3 (patch) | |
| tree | 29535eccac7795d39e003e9d5fea340f4b8114d4 | |
| parent | ca03c9b5fc58b6beb5dbc6c1307464ef9e2c9f45 (diff) | |
| download | scummvm-rg350-687e82c0fa0811b7217c036597befb70662c2bd3.tar.gz scummvm-rg350-687e82c0fa0811b7217c036597befb70662c2bd3.tar.bz2 scummvm-rg350-687e82c0fa0811b7217c036597befb70662c2bd3.zip | |
fixes
svn-id: r4897
| -rw-r--r-- | common/file.cpp | 4 | ||||
| -rw-r--r-- | sound/mixer.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/file.cpp b/common/file.cpp index 809c843ecf..0872e6ef56 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -119,11 +119,11 @@ uint32 File::read(void *ptr, uint32 size) { if (_handle == NULL) { error("File is not open!"); - return; + return 0; } if (size == 0) - return; + return 0; if ((uint32)fread(ptr2, 1, size, _handle) != size) { clearerr(_handle); diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 150e5009e5..8444c31ba0 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -873,7 +873,7 @@ void SoundMixer::ChannelMP3CDMusic::mix(int16 * data, uint len) { if (!_stream.next_frame) { memset(_ptr, 0, _bufferSize + MAD_BUFFER_GUARD); - _size = fread(_ptr, 1, _bufferSize, _file); + _size = _file->read(_ptr, _bufferSize); not_decoded = 0; } else { not_decoded = _stream.bufend - _stream.next_frame; |