diff options
author | Eugene Sandulenko | 2013-05-15 09:19:34 -0700 |
---|---|---|
committer | Eugene Sandulenko | 2013-05-15 09:19:34 -0700 |
commit | 0638308ef13727b4b359d98d54bc09156752aaaa (patch) | |
tree | e6f6b131566c593f6731ffa058e396931afc2525 /video | |
parent | bf9db9e20d75cc18cb711f148814a5d3aae79483 (diff) | |
parent | 32c21754e20afd589556ea862876c6e304b3326b (diff) | |
download | scummvm-rg350-0638308ef13727b4b359d98d54bc09156752aaaa.tar.gz scummvm-rg350-0638308ef13727b4b359d98d54bc09156752aaaa.tar.bz2 scummvm-rg350-0638308ef13727b4b359d98d54bc09156752aaaa.zip |
Merge pull request #330 from johndoe123/neverhood
NEVERHOOD: Neverhood engine
Diffstat (limited to 'video')
-rw-r--r-- | video/smk_decoder.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/video/smk_decoder.h b/video/smk_decoder.h index 7227238373..e4bc9bab42 100644 --- a/video/smk_decoder.h +++ b/video/smk_decoder.h @@ -122,7 +122,6 @@ protected: Common::SeekableReadStream *_fileStream; -private: enum AudioCompression { kCompressionNone, kCompressionDPCM, @@ -151,6 +150,10 @@ private: uint32 dummy; } _header; + uint32 *_frameSizes; + +private: + class SmackerAudioTrack : public AudioTrack { public: SmackerAudioTrack(const AudioInfo &audioInfo, Audio::Mixer::SoundType soundType); @@ -173,7 +176,6 @@ private: AudioInfo _audioInfo; }; - uint32 *_frameSizes; // The FrameTypes section of a Smacker file contains an array of bytes, where // the 8 bits of each byte describe the contents of the corresponding frame. // The highest 7 bits correspond to audio frames (bit 7 is track 6, bit 6 track 5 |