aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-11-27 16:18:50 +0000
committerMax Horn2004-11-27 16:18:50 +0000
commitd8406e26338a565313ee31ec8ce4814832744135 (patch)
treecf076f41f6c154cde044d2c8a370d8cb50cba8d2 /scumm
parentfbaac2e27336fb17c6ef952d41e1a408d25e7bbb (diff)
downloadscummvm-rg350-d8406e26338a565313ee31ec8ce4814832744135.tar.gz
scummvm-rg350-d8406e26338a565313ee31ec8ce4814832744135.tar.bz2
scummvm-rg350-d8406e26338a565313ee31ec8ce4814832744135.zip
cleanup
svn-id: r15917
Diffstat (limited to 'scumm')
-rw-r--r--scumm/player_mod.h3
-rw-r--r--scumm/player_v2.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/scumm/player_mod.h b/scumm/player_mod.h
index a64f15d7c0..8169ec7059 100644
--- a/scumm/player_mod.h
+++ b/scumm/player_mod.h
@@ -51,14 +51,13 @@ public:
virtual void setUpdateProc(ModUpdateProc *proc, void *param, int freq);
virtual void clearUpdateProc();
-
+ // AudioStream API
int readBuffer(int16 *buffer, const int numSamples) {
do_mix(buffer, numSamples / 2);
return numSamples;
}
bool isStereo() const { return true; }
bool endOfData() const { return false; }
-
int getRate() const { return _samplerate; }
private:
diff --git a/scumm/player_v2.h b/scumm/player_v2.h
index 00dc43b419..473df64e13 100644
--- a/scumm/player_v2.h
+++ b/scumm/player_v2.h
@@ -85,14 +85,13 @@ public:
virtual int getMusicTimer() const;
virtual int getSoundStatus(int sound) const;
-
+ // AudioStream API
int readBuffer(int16 *buffer, const int numSamples) {
do_mix(buffer, numSamples / 2);
return numSamples;
}
bool isStereo() const { return true; }
bool endOfData() const { return false; }
-
int getRate() const { return _sample_rate; }
protected: