From 3dda3c073a55a61ead9917a2cca557fdf020fdca Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 10 Oct 2010 22:25:52 +0000
Subject: GRAPHICS: Turn static AviDecoder methods into local funcs

svn-id: r53141
---
 graphics/video/avi_decoder.cpp | 26 ++++++++++++++------------
 graphics/video/avi_decoder.h   |  5 -----
 2 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'graphics')

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
-- 
cgit v1.2.3