diff options
| author | Paweł Kołodziejski | 2002-10-15 07:01:34 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-10-15 07:01:34 +0000 |
| commit | dc87eff416e9fc0b642226bd8520437a70b56bd2 (patch) | |
| tree | 70ecc940b92fc9ee45fce7f50d327cb5f1966d27 /sound/mixer.h | |
| parent | 45b1a8ea4563536b221c75c260b2b83b43bf3737 (diff) | |
| download | scummvm-rg350-dc87eff416e9fc0b642226bd8520437a70b56bd2.tar.gz scummvm-rg350-dc87eff416e9fc0b642226bd8520437a70b56bd2.tar.bz2 scummvm-rg350-dc87eff416e9fc0b642226bd8520437a70b56bd2.zip | |
changes to soundmixer - added timeout param to stream
svn-id: r5149
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 8182430582..e5d7b4aeaa 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -80,11 +80,12 @@ private: uint32 _fpPos; uint32 _bufferSize; uint32 _rate; - uint32 _timeOut; + int32 _timeOut; + int32 _setTimeOut; byte _flags; public: - ChannelStream(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags); + ChannelStream(SoundMixer * mixer, void * sound, uint32 size, uint rate, byte flags, int32 timout); void append(void * sound, uint32 size); void mix(int16 * data, uint len); @@ -182,7 +183,8 @@ 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); + byte flags, int32 timeout = 3); + void stopChannel(int index); #ifdef COMPRESSED_SOUND_FILE int playMP3(PlayingSoundHandle * handle, void * sound, uint32 size, byte flags); int playMP3CDTrack(PlayingSoundHandle * handle, File * file, mad_timer_t duration); |