aboutsummaryrefslogtreecommitdiff
path: root/sound/mp3.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sound/mp3.cpp')
-rw-r--r--sound/mp3.cpp25
1 files changed, 0 insertions, 25 deletions
diff --git a/sound/mp3.cpp b/sound/mp3.cpp
index 3d2afbcdc8..a81f2171e3 100644
--- a/sound/mp3.cpp
+++ b/sound/mp3.cpp
@@ -59,7 +59,6 @@ public:
~MP3InputStream();
int readBuffer(int16 *buffer, const int numSamples);
- int16 read();
bool endOfData() const { return eosIntern(); }
bool isStereo() const { return _isStereo; }
@@ -244,30 +243,6 @@ static inline int scale_sample(mad_fixed_t sample) {
return sample >> (MAD_F_FRACBITS + 1 - 16);
}
-inline int16 MP3InputStream::read() {
- assert(!eosIntern());
-
- int16 sample;
- if (_isStereo) {
- sample = (int16)scale_sample(_synth.pcm.samples[_curChannel][_posInFrame]);
- if (_curChannel == 0) {
- _curChannel = 1;
- } else {
- _posInFrame++;
- _curChannel = 0;
- }
- } else {
- sample = (int16)scale_sample(_synth.pcm.samples[0][_posInFrame]);
- _posInFrame++;
- }
-
- if (_posInFrame >= _synth.pcm.length) {
- refill();
- }
-
- return sample;
-}
-
int MP3InputStream::readBuffer(int16 *buffer, const int numSamples) {
int samples = 0;
assert(_curChannel == 0); // Paranoia check