[Scummvm-cvs-logs] SF.net SVN: scummvm:[55841] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Feb 9 01:12:59 CET 2011


Revision: 55841
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55841&view=rev
Author:   fingolfin
Date:     2011-02-09 00:12:58 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
VIDEO: In overloaded methods, invoke correct parent implementation

This should not cause any code behavior changes at this time, but if any
of the intermediate VideoDecoder classes ever starts to overload stuff,
this would become important.

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/animation.cpp
    scummvm/trunk/engines/sword2/animation.cpp
    scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp
    scummvm/trunk/engines/sword25/fmv/theora_decoder.h
    scummvm/trunk/video/avi_decoder.cpp
    scummvm/trunk/video/flic_decoder.cpp
    scummvm/trunk/video/qt_decoder.cpp
    scummvm/trunk/video/smk_decoder.cpp

Modified: scummvm/trunk/engines/sword1/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword1/animation.cpp	2011-02-09 00:12:22 UTC (rev 55840)
+++ scummvm/trunk/engines/sword1/animation.cpp	2011-02-09 00:12:58 UTC (rev 55841)
@@ -77,8 +77,8 @@
 }
 
 MoviePlayer::~MoviePlayer() {
+	delete _bgSoundHandle;
 	delete _decoder;
-	delete _bgSoundHandle;
 }
 
 /**
@@ -318,7 +318,7 @@
 	if (_mixer->isSoundHandleActive(*_bgSoundHandle))
 		return _mixer->getSoundElapsedTime(*_bgSoundHandle);
 
-	return VideoDecoder::getElapsedTime();
+	return DXADecoder::getElapsedTime();
 }
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: scummvm/trunk/engines/sword2/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword2/animation.cpp	2011-02-09 00:12:22 UTC (rev 55840)
+++ scummvm/trunk/engines/sword2/animation.cpp	2011-02-09 00:12:58 UTC (rev 55841)
@@ -56,7 +56,7 @@
 	_black = 0;
 }
 
-MoviePlayer:: ~MoviePlayer() {
+MoviePlayer::~MoviePlayer() {
 	delete _bgSoundHandle;
 	delete _decoder;
 }
@@ -345,7 +345,7 @@
 	if (_mixer->isSoundHandleActive(*_bgSoundHandle))
 		return _mixer->getSoundElapsedTime(*_bgSoundHandle);
 
-	return VideoDecoder::getElapsedTime();
+	return DXADecoder::getElapsedTime();
 }
 
 ///////////////////////////////////////////////////////////////////////////////

Modified: scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp	2011-02-09 00:12:22 UTC (rev 55840)
+++ scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp	2011-02-09 00:12:58 UTC (rev 55841)
@@ -456,7 +456,7 @@
 }
 
 void TheoraDecoder::reset() {
-	VideoDecoder::reset();
+	FixedRateVideoDecoder::reset();
 
 	if (_fileStream)
 		_fileStream->seek(0);
@@ -488,7 +488,7 @@
 	if (_audStream && _mixer)
 		return _mixer->getSoundElapsedTime(*_audHandle);
 
-	return VideoDecoder::getElapsedTime();
+	return FixedRateVideoDecoder::getElapsedTime();
 }
 
 Audio::QueuingAudioStream *TheoraDecoder::createAudioStream() {

Modified: scummvm/trunk/engines/sword25/fmv/theora_decoder.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/theora_decoder.h	2011-02-09 00:12:22 UTC (rev 55840)
+++ scummvm/trunk/engines/sword25/fmv/theora_decoder.h	2011-02-09 00:12:58 UTC (rev 55841)
@@ -75,7 +75,7 @@
 		return _fileStream != 0;
 	}
 	bool isPaused() const {
-		return (VideoDecoder::isPaused() || !isVideoLoaded());
+		return (FixedRateVideoDecoder::isPaused() || !isVideoLoaded());
 	}
 
 	uint16 getWidth() const {

Modified: scummvm/trunk/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/video/avi_decoder.cpp	2011-02-09 00:12:22 UTC (rev 55840)
+++ scummvm/trunk/video/avi_decoder.cpp	2011-02-09 00:12:58 UTC (rev 55841)
@@ -313,7 +313,7 @@
 	if (_audStream)
 		return _mixer->getSoundElapsedTime(*_audHandle);
 
-	return VideoDecoder::getElapsedTime();
+	return FixedRateVideoDecoder::getElapsedTime();
 }
 
 const Graphics::Surface *AviDecoder::decodeNextFrame() {

Modified: scummvm/trunk/video/flic_decoder.cpp
===================================================================
--- scummvm/trunk/video/flic_decoder.cpp	2011-02-09 00:12:22 UTC (rev 55840)
+++ scummvm/trunk/video/flic_decoder.cpp	2011-02-09 00:12:58 UTC (rev 55841)
@@ -280,7 +280,7 @@
 }
 
 void FlicDecoder::reset() {
-	VideoDecoder::reset();
+	FixedRateVideoDecoder::reset();
 	if (_fileStream)
 		_fileStream->seek(_offsetFrame1);
 }

Modified: scummvm/trunk/video/qt_decoder.cpp
===================================================================
--- scummvm/trunk/video/qt_decoder.cpp	2011-02-09 00:12:22 UTC (rev 55840)
+++ scummvm/trunk/video/qt_decoder.cpp	2011-02-09 00:12:58 UTC (rev 55841)
@@ -59,7 +59,7 @@
 // QuickTimeDecoder
 ////////////////////////////////////////////
 
-QuickTimeDecoder::QuickTimeDecoder() : VideoDecoder() {
+QuickTimeDecoder::QuickTimeDecoder() {
 	_audStream = NULL;
 	_beginOffset = 0;
 	_curFrame = -1;
@@ -387,14 +387,14 @@
 }
 
 bool QuickTimeDecoder::endOfVideo() const {
-	return (!_audStream || _audStream->endOfData()) && (!findDefaultVideoCodec() || VideoDecoder::endOfVideo());
+	return (!_audStream || _audStream->endOfData()) && (!findDefaultVideoCodec() || SeekableVideoDecoder::endOfVideo());
 }
 
 uint32 QuickTimeDecoder::getElapsedTime() const {
 	if (_audStream)
 		return g_system->getMixer()->getSoundElapsedTime(_audHandle) + _audioStartOffset.msecs();
 
-	return VideoDecoder::getElapsedTime();
+	return SeekableVideoDecoder::getElapsedTime();
 }
 
 uint32 QuickTimeDecoder::getTimeToNextFrame() const {
@@ -1253,7 +1253,7 @@
 	// The audio stream is deleted automatically
 	_audStream = NULL;
 
-	VideoDecoder::reset();
+	SeekableVideoDecoder::reset();
 }
 
 Common::SeekableReadStream *QuickTimeDecoder::getNextFramePacket(uint32 &descId) {

Modified: scummvm/trunk/video/smk_decoder.cpp
===================================================================
--- scummvm/trunk/video/smk_decoder.cpp	2011-02-09 00:12:22 UTC (rev 55840)
+++ scummvm/trunk/video/smk_decoder.cpp	2011-02-09 00:12:58 UTC (rev 55841)
@@ -367,7 +367,7 @@
 	if (_audioStream && _audioStarted)
 		return _mixer->getSoundElapsedTime(_audioHandle);
 
-	return VideoDecoder::getElapsedTime();
+	return FixedRateVideoDecoder::getElapsedTime();
 }
 
 bool SmackerDecoder::loadStream(Common::SeekableReadStream *stream) {


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