diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/mixer.cpp | 16 | ||||
-rw-r--r-- | sound/mixer.h | 22 | ||||
-rw-r--r-- | sound/mixer_intern.h | 8 |
3 files changed, 2 insertions, 44 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 05af10c8b9..45b65f1f36 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -217,22 +217,6 @@ void MixerImpl::insertChannel(SoundHandle *handle, Channel *chan) { *handle = chanHandle; } -void MixerImpl::playRaw( - SoundType type, - SoundHandle *handle, - void *sound, - uint32 size, - DisposeAfterUse::Flag autofreeBuffer, - uint rate, byte flags, - int id, byte volume, int8 balance) { - - // Create the audio stream - AudioStream *stream = makeRawMemoryStream((byte *)sound, size, autofreeBuffer, rate, flags, 0, 0); - - // Play it - playInputStream(type, handle, stream, id, volume, balance, DisposeAfterUse::YES, false, false); -} - void MixerImpl::playInputStream( SoundType type, SoundHandle *handle, diff --git a/sound/mixer.h b/sound/mixer.h index 381bef214d..9b75928f64 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -65,8 +65,8 @@ class Mixer { public: /** * Various flags which can be bit-ORed and then passed to - * Mixer::playRaw resp. makeRawMemoryStream to control their - * behavior. + * makeRawMemoryStream and some other AudioStream factories + * to control their behavior. * * Engine authors are advised not to rely on a certain value or * order of these flags (in particular, do not store them verbatim @@ -121,24 +121,6 @@ public: virtual bool isReady() const = 0; - - /** - * Start playing the given raw sound data. - * Internally, this simply creates an audio input stream wrapping the data - * (using the makeRawMemoryStream factory function), which is then - * passed on to playInputStream. - */ - virtual void playRaw( - SoundType type, - SoundHandle *handle, - void *sound, uint32 size, - DisposeAfterUse::Flag autofreeBuffer, - uint rate, - byte flags, - int id = -1, - byte volume = kMaxChannelVolume, - int8 balance = 0) = 0; - /** * Start playing the given audio input stream. * diff --git a/sound/mixer_intern.h b/sound/mixer_intern.h index 476d9bc28d..a1037f1107 100644 --- a/sound/mixer_intern.h +++ b/sound/mixer_intern.h @@ -74,14 +74,6 @@ public: virtual bool isReady() const { return _mixerReady; } - virtual void playRaw( - SoundType type, - SoundHandle *handle, - void *sound, uint32 size, - DisposeAfterUse::Flag autofreeBuffer, - uint rate, byte flags, - int id, byte volume, int8 balance); - virtual void playInputStream( SoundType type, SoundHandle *handle, |