From 7c332d7fdb8ae0356ab21368c4903aea4b9b8640 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 21 Jun 2003 21:17:08 +0000 Subject: modified & cleaned up the playStream/append code a bit; but this API really could stand some refinement svn-id: r8592 --- sound/mixer.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sound/mixer.h') diff --git a/sound/mixer.h b/sound/mixer.h index cb5a4f220c..1abfcc4935 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -54,7 +54,6 @@ public: _toBeDestroyed = true; } virtual void realDestroy() = 0; - virtual void append(void *sound, uint32 size); virtual bool soundFinished(); }; @@ -94,7 +93,6 @@ public: ~SoundMixer(); int insertAt(PlayingSoundHandle *handle, int index, Channel *chan); - void append(void *data, uint32 len); void unInsert(Channel *chan); void beginSlots(int index); @@ -109,7 +107,7 @@ public: FLAG_LOOP = 1 << 5 // loop the audio }; int playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, int id = -1); - int playStream(PlayingSoundHandle *handle, int index, void *sound, uint32 size, uint rate, + int playStream(int index, void *sound, uint32 size, uint rate, byte flags, int32 timeout = 3, int32 buffer_size = 2000000); #ifdef USE_MAD int playMP3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags); @@ -135,7 +133,7 @@ public: void stopID(int id); /** append to existing sound */ - int append(int index, void * sound, uint32 size, uint rate, byte flags); + int append(int index, void * sound, uint32 size); /** is any channel active? */ bool hasActiveChannel(); -- cgit v1.2.3