diff options
| author | Lionel Ulmer | 2002-04-28 14:01:40 +0000 |
|---|---|---|
| committer | Lionel Ulmer | 2002-04-28 14:01:40 +0000 |
| commit | c134803976bcaccd9fe76da14b81962ebc531e81 (patch) | |
| tree | 58f7c61c478392e4577be8bee86d05779bd17f89 /sound/mixer.h | |
| parent | 9d55ab4061725b50b1549f0872d144a5f4cd2819 (diff) | |
| download | scummvm-rg350-c134803976bcaccd9fe76da14b81962ebc531e81.tar.gz scummvm-rg350-c134803976bcaccd9fe76da14b81962ebc531e81.tar.bz2 scummvm-rg350-c134803976bcaccd9fe76da14b81962ebc531e81.zip | |
MI1 CD audio should work better now. Still a bit flaky but should be
better than before :-)
svn-id: r4128
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 7986f384a6..4334dc6ea4 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -36,6 +36,9 @@ private: virtual void mix(int16 *data, uint len) = 0; void destroy() { _to_be_destroyed = true; } virtual void real_destroy() = 0; +#ifdef COMPRESSED_SOUND_FILE + virtual bool sound_finished(); +#endif }; class Channel_RAW : public Channel { @@ -91,6 +94,7 @@ private: void mix(int16 *data, uint len); Channel_MP3_CDMUSIC(SoundMixer *mixer, FILE* file, mad_timer_t duration); void real_destroy(); + bool sound_finished(); }; #endif @@ -126,7 +130,7 @@ public: int play_raw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags); #ifdef COMPRESSED_SOUND_FILE int play_mp3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags); - int play_mp3_cdtrack(PlayingSoundHandle *handle, int index, FILE* file, mad_timer_t duration); + int play_mp3_cdtrack(PlayingSoundHandle *handle, FILE* file, mad_timer_t duration); #endif /* Premix procedure, useful when using fmopl adlib */ |