diff options
| author | Paweł Kołodziejski | 2002-10-15 21:55:04 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-10-15 21:55:04 +0000 |
| commit | 09225027f1f8b87360952904b6f55f69976b040a (patch) | |
| tree | 4cca795d9594cdfbb3b6d4ba53ed090e6e41fae3 /sound/mixer.h | |
| parent | 15ac1c1ee9292073fb8dead67111e31c8f328690 (diff) | |
| download | scummvm-rg350-09225027f1f8b87360952904b6f55f69976b040a.tar.gz scummvm-rg350-09225027f1f8b87360952904b6f55f69976b040a.tar.bz2 scummvm-rg350-09225027f1f8b87360952904b6f55f69976b040a.zip | |
changes to imuse
svn-id: r5157
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index e5d7b4aeaa..491ee5fccb 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -85,7 +85,7 @@ private: byte _flags; public: - ChannelStream(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags, int32 timout); + ChannelStream(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags, int32 timout, int32 buffer_size); void append(void * sound, uint32 size); void mix(int16 * data, uint len); @@ -163,12 +163,15 @@ public: Channel * _channels[NUM_CHANNELS]; PlayingSoundHandle * _handles[NUM_CHANNELS]; + int _beginSlots; + SoundMixer(); ~SoundMixer(); int insertAt(PlayingSoundHandle * handle, int index, Channel * chan); void append(void * data, uint32 len); void unInsert(Channel * chan); + void beginSlots(int index); /* start playing a raw sound */ enum { @@ -183,8 +186,7 @@ public: int playRaw(PlayingSoundHandle * handle, void * sound, uint32 size, uint rate, byte flags); int playRaw(PlayingSoundHandle * handle, void * sound, uint32 size, uint rate, byte flags, int id); int playStream(PlayingSoundHandle * handle, int index, void * sound, uint32 size, uint rate, - byte flags, int32 timeout = 3); - void stopChannel(int index); + byte flags, int32 timeout = 3, int32 buffer_size = 2000000); #ifdef COMPRESSED_SOUND_FILE int playMP3(PlayingSoundHandle * handle, void * sound, uint32 size, byte flags); int playMP3CDTrack(PlayingSoundHandle * handle, File * file, mad_timer_t duration); |