aboutsummaryrefslogtreecommitdiff
path: root/sound/audiostream.cpp
diff options
context:
space:
mode:
authorMax Horn2003-08-05 18:17:26 +0000
committerMax Horn2003-08-05 18:17:26 +0000
commit7ff88ea392f430ccc78fdd0503136d8ed1aac036 (patch)
tree80e484586a99c0b55849c2be14929576771dba27 /sound/audiostream.cpp
parent79fd7ee44117f762b4253bc0e9521c38cdafbb08 (diff)
downloadscummvm-rg350-7ff88ea392f430ccc78fdd0503136d8ed1aac036.tar.gz
scummvm-rg350-7ff88ea392f430ccc78fdd0503136d8ed1aac036.tar.bz2
scummvm-rg350-7ff88ea392f430ccc78fdd0503136d8ed1aac036.zip
more cleanup
svn-id: r9513
Diffstat (limited to 'sound/audiostream.cpp')
-rw-r--r--sound/audiostream.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index 5a25d61468..3c2405a0b9 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -207,7 +207,6 @@ class MP3InputStream : public MusicStream {
int _curChannel;
File *_file;
byte *_ptr;
- int _rate;
bool init();
void refill(bool first = false);
@@ -222,7 +221,7 @@ public:
bool eos() const { return eosIntern(); }
bool isStereo() const { return _isStereo; }
- int getRate() const { return _rate; }
+ int getRate() const { return _frame.header.samplerate; }
};
@@ -251,7 +250,6 @@ MP3InputStream::MP3InputStream(File *file, mad_timer_t duration, uint size) {
_curChannel = 0;
_file = file;
_ptr = (byte *)malloc(_bufferSize + MAD_BUFFER_GUARD);
- _rate = 0;
init();
@@ -303,9 +301,6 @@ bool MP3InputStream::init() {
return false;
}
- // Determine the sample rate
- _rate = _frame.header.samplerate;
-
return true;
}