Merge pull request #293 from clone2727/qtmidi

Add support for QuickTime Music playback
scummvm · Dec 13, 2012 · 91317c3 · 91317c3
2 parents a0863df + 17f9235
commit 91317c3
Show file tree

Hide file tree

Showing 19 changed files with 1,433 additions and 45 deletions.
diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp
@@ -134,7 +134,7 @@ void QuickTimeAudioDecoder::init() {
 			_audioTracks.push_back(new QuickTimeAudioTrack(this, _tracks[i]));
 }
 
-Common::QuickTimeParser::SampleDesc *QuickTimeAudioDecoder::readSampleDesc(Track *track, uint32 format) {
+Common::QuickTimeParser::SampleDesc *QuickTimeAudioDecoder::readSampleDesc(Track *track, uint32 format, uint32 descSize) {
 	if (track->codecType == CODEC_TYPE_AUDIO) {
 		debug(0, "Audio Codec FourCC: \'%s\'", tag2str(format));
 

diff --git a/audio/decoders/quicktime_intern.h b/audio/decoders/quicktime_intern.h
@@ -131,7 +131,7 @@ class QuickTimeAudioDecoder : public Common::QuickTimeParser {
 	};
 
 	// Common::QuickTimeParser API
-	virtual Common::QuickTimeParser::SampleDesc *readSampleDesc(Track *track, uint32 format);
+	virtual Common::QuickTimeParser::SampleDesc *readSampleDesc(Track *track, uint32 format, uint32 descSize);
 
 	void init();
 

diff --git a/audio/midiparser.h b/audio/midiparser.h
@@ -394,6 +394,7 @@ class MidiParser {
 
 	static MidiParser *createParser_SMF();
 	static MidiParser *createParser_XMIDI(XMidiCallbackProc proc = defaultXMidiCallback, void *refCon = 0);
+	static MidiParser *createParser_QT();
 	static void timerCallback(void *data) { ((MidiParser *) data)->onTimer(); }
 };