[Scummvm-cvs-logs] SF.net SVN: scummvm:[53141] scummvm/trunk/graphics/video
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Oct 11 00:25:52 CEST 2010
Revision: 53141
http://scummvm.svn.sourceforge.net/scummvm/?rev=53141&view=rev
Author: fingolfin
Date: 2010-10-10 22:25:52 +0000 (Sun, 10 Oct 2010)
Log Message:
-----------
GRAPHICS: Turn static AviDecoder methods into local funcs
Modified Paths:
--------------
scummvm/trunk/graphics/video/avi_decoder.cpp
scummvm/trunk/graphics/video/avi_decoder.h
Modified: scummvm/trunk/graphics/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/avi_decoder.cpp 2010-10-10 22:25:30 UTC (rev 53140)
+++ scummvm/trunk/graphics/video/avi_decoder.cpp 2010-10-10 22:25:52 UTC (rev 53141)
@@ -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 @@
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
Modified: scummvm/trunk/graphics/video/avi_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/avi_decoder.h 2010-10-10 22:25:30 UTC (rev 53140)
+++ scummvm/trunk/graphics/video/avi_decoder.h 2010-10-10 22:25:52 UTC (rev 53141)
@@ -221,11 +221,6 @@
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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list