aboutsummaryrefslogtreecommitdiff
path: root/sword2/driver
diff options
context:
space:
mode:
authorMax Horn2004-11-27 13:54:09 +0000
committerMax Horn2004-11-27 13:54:09 +0000
commit1a7ca2dc2a71fed65673b4e3934f2151cc8475d1 (patch)
treeb1256be8e9864aeda86ccfd77fa67353d0029859 /sword2/driver
parent1733863e711b1a9ef234416a21369b6bf713ee6f (diff)
downloadscummvm-rg350-1a7ca2dc2a71fed65673b4e3934f2151cc8475d1.tar.gz
scummvm-rg350-1a7ca2dc2a71fed65673b4e3934f2151cc8475d1.tar.bz2
scummvm-rg350-1a7ca2dc2a71fed65673b4e3934f2151cc8475d1.zip
AudioStream::read() has been removed quite some time ago, now making sure that change is reflected everywhere
svn-id: r15911
Diffstat (limited to 'sword2/driver')
-rw-r--r--sword2/driver/d_sound.cpp15
-rw-r--r--sword2/driver/d_sound.h1
2 files changed, 0 insertions, 16 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 18012f4d52..6f6d4d94d3 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -166,7 +166,6 @@ public:
int readBuffer(int16 *buffer, const int numSamples);
- int16 read();
bool endOfData() const { return eosIntern(); }
bool isStereo() const { return false; }
int getRate() const { return 22050; }
@@ -189,16 +188,6 @@ CLUInputStream::~CLUInputStream() {
_file->decRef();
}
-inline int16 CLUInputStream::read() {
- assert(!eosIntern());
-
- int16 sample = *_pos++;
- if (_pos >= _bufferEnd) {
- refill();
- }
- return sample;
-}
-
inline bool CLUInputStream::eosIntern() const {
return _pos >= _bufferEnd;
}
@@ -566,10 +555,6 @@ int Sound::readBuffer(int16 *buffer, const int numSamples) {
return numSamples;
}
-int16 Sound::read() {
- error("ProcInputStream::read not supported");
-}
-
bool Sound::isStereo() const { return false; }
bool Sound::endOfData() const { return !fpMus.isOpen(); }
int Sound::getRate() const { return 22050; }
diff --git a/sword2/driver/d_sound.h b/sword2/driver/d_sound.h
index 234abbe08b..ddea6f41f7 100644
--- a/sword2/driver/d_sound.h
+++ b/sword2/driver/d_sound.h
@@ -93,7 +93,6 @@ public:
// AudioStream API
int readBuffer(int16 *buffer, const int numSamples);
- int16 read();
bool isStereo() const;
bool endOfData() const;
int getRate() const;