diff options
| author | Max Horn | 2002-09-08 01:08:12 +0000 |
|---|---|---|
| committer | Max Horn | 2002-09-08 01:08:12 +0000 |
| commit | 523d8e64c0bc66b75cdd7f12fc9d9d87b28a8c36 (patch) | |
| tree | 01c96c7b834d32b05cf33b15b6631614d22da187 /sound/mixer.h | |
| parent | 943de561bf51d4e553be44fe612eab94e5c00391 (diff) | |
| download | scummvm-rg350-523d8e64c0bc66b75cdd7f12fc9d9d87b28a8c36.tar.gz scummvm-rg350-523d8e64c0bc66b75cdd7f12fc9d9d87b28a8c36.tar.bz2 scummvm-rg350-523d8e64c0bc66b75cdd7f12fc9d9d87b28a8c36.zip | |
rewrote config class; cleanup; code restructuring
svn-id: r4903
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index 64ab0c7070..907e73e124 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -29,6 +29,9 @@ #include <mad.h> #endif +#include "common/scummsys.h" +#include "common/system.h" + typedef uint32 PlayingSoundHandle; class File; @@ -61,6 +64,7 @@ private: public: ChannelRaw(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags); + void mix(int16 * data, uint len); void realDestroy(); }; @@ -78,6 +82,7 @@ private: public: ChannelStream(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags); + void append(void * sound, uint32 size); void mix(int16 * data, uint len); void realDestroy(); @@ -99,6 +104,7 @@ private: public: ChannelMP3(SoundMixer * mixer, void *sound, uint size, byte flags); + void mix(int16 * data, uint len); void realDestroy(); @@ -117,8 +123,10 @@ private: File * _file; bool _initialized; + public: ChannelMP3CDMusic(SoundMixer * mixer, File * file, mad_timer_t duration); + void mix(int16 * data, uint len); void realDestroy(); bool soundFinished(); |