diff options
| author | Max Horn | 2003-12-19 00:32:47 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-19 00:32:47 +0000 |
| commit | d21fc5845dc77dd977df22fd9ddc3206bf23a920 (patch) | |
| tree | eed9abe12e4a103c469f875cb6dfebab746c74a4 /sound/mixer.h | |
| parent | 97ee61963c896e48a0acc5b4169ce96163e76b06 (diff) | |
| download | scummvm-rg350-d21fc5845dc77dd977df22fd9ddc3206bf23a920.tar.gz scummvm-rg350-d21fc5845dc77dd977df22fd9ddc3206bf23a920.tar.bz2 scummvm-rg350-d21fc5845dc77dd977df22fd9ddc3206bf23a920.zip | |
o Moved MP3 and Vorbis input streams to mp3.* resp. vorbis.*
o Added SoundMixer::playInputStream and made some of the other play* methods use it
o Added ProcInputStream stub (not working yet) which one day may allow us to replace the premix code, and allow other fancy stuff
o Remove AudioInputStream::readBuffer default implementation (subclasses should always provide it for max. performance)
o Some minor cleanup
svn-id: r11754
Diffstat (limited to 'sound/mixer.h')
| -rw-r--r-- | sound/mixer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/mixer.h b/sound/mixer.h index dcea973826..387883ce59 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -37,6 +37,7 @@ typedef uint32 PlayingSoundHandle; +class AudioInputStream; class Channel; class File; @@ -106,6 +107,9 @@ public: int playVorbis(PlayingSoundHandle *handle, OggVorbis_File *ov_file, int duration, bool is_cd_track, byte volume = 255, int8 pan = 0); #endif + int playInputStream(PlayingSoundHandle *handle, AudioInputStream *input, bool isMusic, byte volume = 255, int8 pan = 0); + + /** Start a new stream. */ int newStream(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, uint32 buffer_size, byte volume = 255, int8 pan = 0); |