diff options
author | Matthew Hoops | 2011-04-14 10:25:02 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-04-14 10:25:02 -0400 |
commit | 76105b29b7f885ed873f6af7321d8e48a5b0a41e (patch) | |
tree | b83db74278baf2458acf486da49b523ea9ae3de4 /audio/decoders/quicktime.h | |
parent | 6d153f311c65fe414e31e99f8a9a6503c49a01a5 (diff) | |
download | scummvm-rg350-76105b29b7f885ed873f6af7321d8e48a5b0a41e.tar.gz scummvm-rg350-76105b29b7f885ed873f6af7321d8e48a5b0a41e.tar.bz2 scummvm-rg350-76105b29b7f885ed873f6af7321d8e48a5b0a41e.zip |
AUDIO: Split the QuickTimeAudioDecoder into a new header file
(Mirroring the new adpcm_intern.h file)
Diffstat (limited to 'audio/decoders/quicktime.h')
-rw-r--r-- | audio/decoders/quicktime.h | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/audio/decoders/quicktime.h b/audio/decoders/quicktime.h index 8a779d45a6..ff81ec9390 100644 --- a/audio/decoders/quicktime.h +++ b/audio/decoders/quicktime.h @@ -34,7 +34,6 @@ #ifndef AUDIO_QUICKTIME_H #define AUDIO_QUICKTIME_H -#include "common/quicktime.h" #include "common/scummsys.h" #include "common/types.h" @@ -45,53 +44,7 @@ namespace Common { 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 loadAudioFile(const Common::String &filename); - - /** - * Load a QuickTime audio file from a SeekableReadStream - * @param stream the stream to load - */ - bool loadAudioStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeFileHandle); - -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, byte objectTypeMP4); - void init(); - - void queueNextAudioChunk(); - uint32 getAudioChunkSampleCount(uint chunk); - int8 _audioStreamIndex; - uint _curAudioChunk; - QueuingAudioStream *_audStream; - - void setAudioStreamPos(const Timestamp &where); - bool isOldDemuxing() const; -}; +class SeekableAudioStream; /** * Try to load a QuickTime sound file from the given file name and create a SeekableAudioStream |