diff options
| author | Max Horn | 2010-10-10 22:25:52 +0000 | 
|---|---|---|
| committer | Max Horn | 2010-10-10 22:25:52 +0000 | 
| commit | 3dda3c073a55a61ead9917a2cca557fdf020fdca (patch) | |
| tree | 6e1401b7d455ce817434a2c6b44191d3704a356f | |
| parent | 7642cd002ab8e1eb3f52d15e94d7ac03b24870c0 (diff) | |
| download | scummvm-rg350-3dda3c073a55a61ead9917a2cca557fdf020fdca.tar.gz scummvm-rg350-3dda3c073a55a61ead9917a2cca557fdf020fdca.tar.bz2 scummvm-rg350-3dda3c073a55a61ead9917a2cca557fdf020fdca.zip | |
GRAPHICS: Turn static AviDecoder methods into local funcs
svn-id: r53141
| -rw-r--r-- | graphics/video/avi_decoder.cpp | 26 | ||||
| -rw-r--r-- | graphics/video/avi_decoder.h | 5 | 
2 files changed, 14 insertions, 17 deletions
| diff --git a/graphics/video/avi_decoder.cpp b/graphics/video/avi_decoder.cpp index 4973cb3eb0..ceca89b8ee 100644 --- a/graphics/video/avi_decoder.cpp +++ b/graphics/video/avi_decoder.cpp @@ -42,6 +42,20 @@  namespace Graphics { +/* +static byte char2num(char c) { +	return (c >= 48 && c <= 57) ? c - 48 : 0; +} + +static byte getStreamNum(uint32 tag) { +	return char2num((char)(tag >> 24)) * 16 + char2num((char)(tag >> 16)); +} +*/ + +static uint16 getStreamType(uint32 tag) { +	return tag & 0xffff; +} +  AviDecoder::AviDecoder(Audio::Mixer *mixer, Audio::Mixer::SoundType soundType) : _mixer(mixer) {  	_soundType = soundType; @@ -418,16 +432,4 @@ Audio::QueuingAudioStream *AviDecoder::createAudioStream() {  	return NULL;  } -byte AviDecoder::char2num(char c) { -	return (c >= 48 && c <= 57) ? c - 48 : 0; -} - -byte AviDecoder::getStreamNum(uint32 tag) { -	return char2num((char)(tag >> 24)) * 16 + char2num((char)(tag >> 16)); -} - -uint16 AviDecoder::getStreamType(uint32 tag) { -	return tag & 0xffff; -} -  } // End of namespace Graphics diff --git a/graphics/video/avi_decoder.h b/graphics/video/avi_decoder.h index 72cf2d7ef5..68795149c0 100644 --- a/graphics/video/avi_decoder.h +++ b/graphics/video/avi_decoder.h @@ -221,11 +221,6 @@ private:  	Audio::SoundHandle *_audHandle;  	Audio::QueuingAudioStream *_audStream;  	Audio::QueuingAudioStream *createAudioStream(); - -	// Helper functions -	static byte char2num(char c); -	static byte getStreamNum(uint32 tag); -	static uint16 getStreamType(uint32 tag);  };  } // End of namespace Graphics | 
