aboutsummaryrefslogtreecommitdiff
path: root/sound/audiostream.cpp
diff options
context:
space:
mode:
authorMax Horn2004-10-11 22:01:21 +0000
committerMax Horn2004-10-11 22:01:21 +0000
commit1036e88aa63adfe503a8d22d3b2df207d8e235c2 (patch)
tree32dd5125299c4bf7b234441dcaef05fede9da167 /sound/audiostream.cpp
parent0c785afd2e6e9cee5714613224025c811be29a0f (diff)
downloadscummvm-rg350-1036e88aa63adfe503a8d22d3b2df207d8e235c2.tar.gz
scummvm-rg350-1036e88aa63adfe503a8d22d3b2df207d8e235c2.tar.bz2
scummvm-rg350-1036e88aa63adfe503a8d22d3b2df207d8e235c2.zip
Implement premix proc via an AudioStream / Channel (eventually we'll remove the setupPremix method which takes a proc pointer)
svn-id: r15522
Diffstat (limited to 'sound/audiostream.cpp')
-rw-r--r--sound/audiostream.cpp36
1 files changed, 0 insertions, 36 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index 6fc99cc4f0..3f66ebfce9 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -302,42 +302,6 @@ void AppendableMemoryStream<stereo, is16Bit, isUnsigned, isLE>::append(const byt
}
}
-#pragma mark -
-#pragma mark --- Procedural stream ---
-#pragma mark -
-
-
-#if 0
-// Work in progress!!! Not yet usable/finished/working/anything :-)
-
-class ProcInputStream : public AudioStream {
-public:
- typedef void InputProc (void *refCon, int16 *data, uint len);
-
-private:
- const int _rate;
- const bool _isStereo;
- InputProc *_proc;
- void *_refCon;
-
-public:
- ProcInputStream(int rate, bool stereo, InputProc *proc, void *refCon)
- : _rate(rate), _isStereo(stereo), _proc(proc), _refCon(refCon) { }
- int readBuffer(int16 *buffer, const int numSamples) {
- (_proc)(_refCon, buffer, numSamples);
- return numSamples;
- }
- int16 read() {
- int16 sample;
- (_proc)(_refCon, &sample, 1);
- return sample;
- }
- bool isStereo() const { return _isStereo; }
- bool endOfData() const { return false; }
-
- int getRate() const { return _rate; }
-};
-#endif
#pragma mark -
#pragma mark --- Input stream factories ---