3 files changed, 19 insertions, 12 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index 78a20d6e2a..ef96c2594b 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -166,7 +166,11 @@ class MP3InputStream : public AudioInputStream {
 	uint32 _posInFrame;
 public:
 	// TODO
+	MP3InputStream();
 };
+
+MP3InputStream::MP3InputStream() {
+}
 #endif
 
 
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 5f6b6629ba..0e43073213 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -122,7 +122,6 @@ public:
 class ChannelMP3Common : public Channel {
 protected:
 	byte *_ptr;
-	bool _releasePtr;
 	struct mad_stream _stream;
 	struct mad_frame _frame;
 	struct mad_synth _synth;
@@ -139,7 +138,7 @@ class ChannelMP3 : public ChannelMP3Common {
 	uint32 _position;
 
 public:
-	ChannelMP3(SoundMixer *mixer, PlayingSoundHandle *handle, void *sound, uint size, byte flags);
+	ChannelMP3(SoundMixer *mixer, PlayingSoundHandle *handle, File *file, uint size);
 
 	void mix(int16 *data, uint len);
 	bool isMusicChannel() { return false; }
@@ -283,9 +282,9 @@ int SoundMixer::playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, ui
 }
 
 #ifdef USE_MAD
-int SoundMixer::playMP3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags) {
+int SoundMixer::playMP3(PlayingSoundHandle *handle, File *file, uint32 size) {
 	StackLock lock(_mutex);
-	return insertChannel(handle, new ChannelMP3(this, handle, sound, size, flags));
+	return insertChannel(handle, new ChannelMP3(this, handle, file, size));
 }
 int SoundMixer::playMP3CDTrack(PlayingSoundHandle *handle, File *file, mad_timer_t duration) {
 	StackLock lock(_mutex);
@@ -924,8 +923,7 @@ ChannelMP3Common::ChannelMP3Common(SoundMixer *mixer, PlayingSoundHandle *handle
 }
 
 ChannelMP3Common::~ChannelMP3Common() {
-	if (_releasePtr)
-		free(_ptr);
+	free(_ptr);
 	mad_synth_finish(&_synth);
 	mad_frame_finish(&_frame);
 	mad_stream_finish(&_stream);
@@ -945,18 +943,24 @@ static inline int scale_sample(mad_fixed_t sample) {
 	return sample >> (MAD_F_FRACBITS + 1 - 16);
 }
 
-ChannelMP3::ChannelMP3(SoundMixer *mixer, PlayingSoundHandle *handle, void *sound, uint size, byte flags)
+ChannelMP3::ChannelMP3(SoundMixer *mixer, PlayingSoundHandle *handle, File *file, uint size)
 	: ChannelMP3Common(mixer, handle) {
 	_posInFrame = 0xFFFFFFFF;
 	_position = 0;
-	_size = size;
-	_ptr = (byte *)sound;
-	_releasePtr = (flags & SoundMixer::FLAG_AUTOFREE) != 0;
+	_ptr = (byte *)malloc(size + MAD_BUFFER_GUARD);
+
+	_size = file->read(_ptr, size);
 }
 
 void ChannelMP3::mix(int16 *data, uint len) {
 	const int volume = _mixer->getVolume();
 
+	// Exit if all data is used up (this also covers the case were reading from the file failed).
+	if (_position >= _size) {
+		destroy();
+		return;
+	}
+
 	while (1) {
 
 		int16 sample;
@@ -1003,7 +1007,6 @@ ChannelMP3CDMusic::ChannelMP3CDMusic(SoundMixer *mixer, PlayingSoundHandle *hand
 	_duration = duration;
 	_bufferSize = MP3CD_BUFFERING_SIZE;
 	_ptr = (byte *)malloc(MP3CD_BUFFERING_SIZE);
-	_releasePtr = true;
 }
 
 void ChannelMP3CDMusic::mix(int16 *data, uint len) {
diff --git a/sound/mixer.h b/sound/mixer.h
index 6c7e8edf97..47acf99d66 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -84,7 +84,7 @@ public:
 	// start playing a raw sound
 	int playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, uint rate, byte flags, int id = -1);
 #ifdef USE_MAD
-	int playMP3(PlayingSoundHandle *handle, void *sound, uint32 size, byte flags);
+	int playMP3(PlayingSoundHandle *handle, File *file, uint32 size);
 	int playMP3CDTrack(PlayingSoundHandle *handle, File *file, mad_timer_t duration);
 #endif
 #ifdef USE_VORBIS