diff options
| author | Max Horn | 2002-05-04 00:10:01 +0000 |
|---|---|---|
| committer | Max Horn | 2002-05-04 00:10:01 +0000 |
| commit | 4e76591ba61ef544f137e080e552a49a2d5b54fb (patch) | |
| tree | 75bb6f86a1176cceda630b7b40ed73b47367ab80 /sound | |
| parent | 88a407fc1ff4ae5b6bc750b203d47e2721144fc6 (diff) | |
| download | scummvm-rg350-4e76591ba61ef544f137e080e552a49a2d5b54fb.tar.gz scummvm-rg350-4e76591ba61ef544f137e080e552a49a2d5b54fb.tar.bz2 scummvm-rg350-4e76591ba61ef544f137e080e552a49a2d5b54fb.zip | |
my version of MAD (0.14.2b) has no MAD_ERROR_NONE; where did that come from?
svn-id: r4191
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index e332b22103..0f0de7e201 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -448,7 +448,7 @@ void SoundMixer::Channel_MP3_CDMUSIC::mix(int16 *data, uint len) { memcpy(_ptr, _stream.next_frame, not_decoded); _size = fread((unsigned char *)_ptr + not_decoded, 1, _buffer_size - not_decoded, _file); } - _stream.error = MAD_ERROR_NONE; + _stream.error = (enum mad_error)0; // Restream mad_stream_buffer(&_stream, (unsigned char *)_ptr, _size + not_decoded); if (mad_frame_decode(&_frame, &_stream) == -1) { |