aboutsummaryrefslogtreecommitdiff
path: root/sound/mp3.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'sound/mp3.cpp')
-rw-r--r--sound/mp3.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/mp3.cpp b/sound/mp3.cpp
index 3233aa504f..e98134adc7 100644
--- a/sound/mp3.cpp
+++ b/sound/mp3.cpp
@@ -145,7 +145,6 @@ void MP3InputStream::decodeMP3Data() {
return;
do {
-
// If necessary, load more data
if (_stream.buffer == NULL || _stream.error == MAD_ERROR_BUFLEN) {
if (!readMP3Data()) {
@@ -288,6 +287,11 @@ int MP3InputStream::readBuffer(int16 *buffer, const int numSamples) {
}
+#pragma mark -
+#pragma mark --- MP3 factory functions ---
+#pragma mark -
+
+
AudioStream *makeMP3Stream(Common::File *file, uint32 size) {
assert(file);
@@ -345,7 +349,6 @@ public:
void play(Audio::Mixer *mixer, Audio::SoundHandle *handle, int startFrame, int duration);
};
-
MP3TrackInfo::MP3TrackInfo(const char *filename) :
_filename(filename),
_errorFlag(false) {
@@ -416,11 +419,6 @@ DigitalTrackInfo *getMP3Track(int track) {
return NULL;
}
-
-// Closing note: we added File::incRef and File::decRef mainly for the sake of the input streams
-// If we could but get rid of it...
-
-
} // End of namespace Audio
#endif // #ifdef USE_MAD