AUDIO: Split QuickTime audio into a new class

Standalone QuickTime files can now be played as an AudioStream

1 files changed, 96 insertions, 0 deletions

diff --git a/audio/decoders/quicktime.h b/audio/decoders/quicktime.h
new file mode 100644
index 0000000000..eb0f791748
--- /dev/null
+++ b/audio/decoders/quicktime.h
@@ -0,0 +1,96 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef AUDIO_QUICKTIME_H
+#define AUDIO_QUICKTIME_H
+
+#include "common/quicktime.h"
+#include "common/scummsys.h"
+#include "common/types.h"
+
+namespace Common {
+	class SeekableReadStream;
+	class String;
+}
+
+namespace Audio {
+
+class AudioStream;
+class RewindableAudioStream;
+class QueuingAudioStream;
+
+class QuickTimeAudioDecoder : public Common::QuickTimeParser {
+public:
+	QuickTimeAudioDecoder();
+	virtual ~QuickTimeAudioDecoder();
+
+	/**
+	 * Load a QuickTime audio file
+	 * @param filename	the filename to load
+	 */
+	bool loadFile(const Common::String &filename);
+
+	/**
+	 * Load a QuickTime audio file from a SeekableReadStream
+	 * @param stream	the stream to load
+	 */
+	bool loadStream(Common::SeekableReadStream *stream);
+
+protected:
+	struct AudioSampleDesc : public Common::QuickTimeParser::SampleDesc {
+		AudioSampleDesc();
+
+		uint16 channels;
+		uint32 sampleRate;
+		uint32 samplesPerFrame;
+		uint32 bytesPerFrame;
+	};
+
+	// Common::QuickTimeParser API
+	virtual Common::QuickTimeParser::SampleDesc *readSampleDesc(MOVStreamContext *st, uint32 format);
+
+	AudioStream *createAudioStream(Common::SeekableReadStream *stream);
+	bool checkAudioCodecSupport(uint32 tag);
+	void init();
+
+	void queueNextAudioChunk();
+	uint32 getAudioChunkSampleCount(uint chunk);
+	int8 _audioStreamIndex;
+	uint _curAudioChunk;
+	QueuingAudioStream *_audStream;
+};
+	
+/**
+ * Try to load a QuickTime sound file from the given file name and create a RewindableAudioStream
+ * from that data.
+ *
+ * @param filename			the filename of the file from which to read the data
+ * @return	a new RewindableAudioStream, or NULL, if an error occurred
+ */
+RewindableAudioStream *makeQuickTimeStream(const Common::String &filename);
+
+} // End of namespace Audio
+
+#endif