Merge remote branch 'upstream/master' into pegasus

1 files changed, 6 insertions, 5 deletions

diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index b2d7153f42..583b4b44b5 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -140,7 +140,7 @@ private:
 	void stopAudio();
 	void updateAudioBuffer();
 	void readNextAudioChunk();
-	Audio::SoundHandle _audHandle;
+	Common::Array<Audio::SoundHandle> _audioHandles;
 	Audio::Timestamp _audioStartOffset;
 
 	Codec *createCodec(uint32 codecTag, byte bitsPerPixel);
@@ -186,17 +186,18 @@ private:
 	};
 
 	// The AudioTrackHandler is currently just a wrapper around some
-	// QuickTimeDecoder functions. Eventually this can be made to
-	// handle multiple audio tracks, but I haven't seen a video with
-	// that yet.
+	// QuickTimeDecoder functions.
 	class AudioTrackHandler : public TrackHandler {
 	public:
-		AudioTrackHandler(QuickTimeDecoder *decoder, Track *parent);
+		AudioTrackHandler(QuickTimeDecoder *decoder, QuickTimeAudioTrack *audioTrack);
 		TrackType getTrackType() const { return kTrackTypeAudio; }
 
 		void updateBuffer();
 		void seekToTime(Audio::Timestamp time);
 		bool endOfTrack();
+
+	private:
+		QuickTimeAudioTrack *_audioTrack;
 	};
 
 	// The VideoTrackHandler is the bridge between the time of playback