From 2fa17c44edf07f4f82147a6070950e7d8f7ee2f4 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 5 Aug 2011 21:09:07 +0100 Subject: JANITORIAL: Remove SVN keywords --- common/quicktime.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'common/quicktime.cpp') diff --git a/common/quicktime.cpp b/common/quicktime.cpp index ee49b092a4..1cae2f124d 100644 --- a/common/quicktime.cpp +++ b/common/quicktime.cpp @@ -8,19 +8,16 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // -- cgit v1.2.3 From 84220d2ca05707f22a0242b1745caf0b657237a3 Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Sat, 6 Aug 2011 09:47:19 +0200 Subject: COMMON: Remove superfluous Common:: qualifiers. --- common/quicktime.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'common/quicktime.cpp') diff --git a/common/quicktime.cpp b/common/quicktime.cpp index 1cae2f124d..9ea8c229ea 100644 --- a/common/quicktime.cpp +++ b/common/quicktime.cpp @@ -48,7 +48,7 @@ QuickTimeParser::QuickTimeParser() { _fd = 0; _scaleFactorX = 1; _scaleFactorY = 1; - _resFork = new Common::MacResManager(); + _resFork = new MacResManager(); _disposeFileHandle = DisposeAfterUse::YES; initParseTable(); @@ -59,7 +59,7 @@ QuickTimeParser::~QuickTimeParser() { delete _resFork; } -bool QuickTimeParser::parseFile(const Common::String &filename) { +bool QuickTimeParser::parseFile(const String &filename) { if (!_resFork->open(filename) || !_resFork->hasDataFork()) return false; @@ -70,7 +70,7 @@ bool QuickTimeParser::parseFile(const Common::String &filename) { if (_resFork->hasResFork()) { // Search for a 'moov' resource - Common::MacResIDArray idArray = _resFork->getResIDArray(MKTAG('m', 'o', 'o', 'v')); + MacResIDArray idArray = _resFork->getResIDArray(MKTAG('m', 'o', 'o', 'v')); if (!idArray.empty()) _fd = _resFork->getResource(MKTAG('m', 'o', 'o', 'v'), idArray[0]); @@ -96,7 +96,7 @@ bool QuickTimeParser::parseFile(const Common::String &filename) { return true; } -bool QuickTimeParser::parseStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeFileHandle) { +bool QuickTimeParser::parseStream(SeekableReadStream *stream, DisposeAfterUse::Flag disposeFileHandle) { _fd = stream; _foundMOOV = false; _disposeFileHandle = disposeFileHandle; @@ -274,7 +274,7 @@ int QuickTimeParser::readCMOV(Atom atom) { // Uncompress the data unsigned long dstLen = uncompressedSize; - if (!Common::uncompress(uncompressedData, &dstLen, compressedData, compressedSize)) { + if (!uncompress(uncompressedData, &dstLen, compressedData, compressedSize)) { warning ("Could not uncompress cmov chunk"); free(compressedData); free(uncompressedData); @@ -282,8 +282,8 @@ int QuickTimeParser::readCMOV(Atom atom) { } // Load data into a new MemoryReadStream and assign _fd to be that - Common::SeekableReadStream *oldStream = _fd; - _fd = new Common::MemoryReadStream(uncompressedData, uncompressedSize, DisposeAfterUse::YES); + SeekableReadStream *oldStream = _fd; + _fd = new MemoryReadStream(uncompressedData, uncompressedSize, DisposeAfterUse::YES); // Read the contents of the uncompressed data Atom a = { MKTAG('m', 'o', 'o', 'v'), 0, uncompressedSize }; @@ -333,8 +333,8 @@ int QuickTimeParser::readMVHD(Atom atom) { uint32 yMod = _fd->readUint32BE(); _fd->skip(16); - _scaleFactorX = Common::Rational(0x10000, xMod); - _scaleFactorY = Common::Rational(0x10000, yMod); + _scaleFactorX = Rational(0x10000, xMod); + _scaleFactorY = Rational(0x10000, yMod); _scaleFactorX.debugPrint(1, "readMVHD(): scaleFactorX ="); _scaleFactorY.debugPrint(1, "readMVHD(): scaleFactorY ="); @@ -403,8 +403,8 @@ int QuickTimeParser::readTKHD(Atom atom) { uint32 yMod = _fd->readUint32BE(); _fd->skip(16); - track->scaleFactorX = Common::Rational(0x10000, xMod); - track->scaleFactorY = Common::Rational(0x10000, yMod); + track->scaleFactorX = Rational(0x10000, xMod); + track->scaleFactorY = Rational(0x10000, yMod); track->scaleFactorX.debugPrint(1, "readTKHD(): scaleFactorX ="); track->scaleFactorY.debugPrint(1, "readTKHD(): scaleFactorY ="); @@ -431,7 +431,7 @@ int QuickTimeParser::readELST(Atom atom) { for (uint32 i = 0; i < track->editCount; i++){ track->editList[i].trackDuration = _fd->readUint32BE(); track->editList[i].mediaTime = _fd->readSint32BE(); - track->editList[i].mediaRate = Common::Rational(_fd->readUint32BE(), 0x10000); + track->editList[i].mediaRate = Rational(_fd->readUint32BE(), 0x10000); debugN(3, "\tDuration = %d, Media Time = %d, ", track->editList[i].trackDuration, track->editList[i].mediaTime); track->editList[i].mediaRate.debugPrint(3, "Media Rate ="); } @@ -695,7 +695,7 @@ enum { kMP4DecSpecificDescTag = 5 }; -static int readMP4DescLength(Common::SeekableReadStream *stream) { +static int readMP4DescLength(SeekableReadStream *stream) { int length = 0; int count = 4; @@ -710,7 +710,7 @@ static int readMP4DescLength(Common::SeekableReadStream *stream) { return length; } -static void readMP4Desc(Common::SeekableReadStream *stream, byte &tag, int &length) { +static void readMP4Desc(SeekableReadStream *stream, byte &tag, int &length) { tag = stream->readByte(); length = readMP4DescLength(stream); } -- cgit v1.2.3