[Scummvm-cvs-logs] SF.net SVN: scummvm:[53301] scummvm/trunk/engines/sword25/fmv
sev at users.sourceforge.net
sev at users.sourceforge.net
Wed Oct 13 01:23:30 CEST 2010
Revision: 53301
http://scummvm.svn.sourceforge.net/scummvm/?rev=53301&view=rev
Author: sev
Date: 2010-10-12 23:23:29 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
SWORD25: Put back changes accidentally removed in previous merge.
Modified Paths:
--------------
scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-12 23:23:10 UTC (rev 53300)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2010-10-12 23:23:29 UTC (rev 53301)
@@ -61,13 +61,10 @@
_decoder.close();
}
-bool MoviePlayer::LoadMovie(const Common::String &Filename, unsigned int Z) {
+bool MoviePlayer::LoadMovie(const Common::String &filename, unsigned int z) {
// Get the file and load it into the decoder
- uint dataSize;
- const byte *data = reinterpret_cast<const byte *>(Kernel::GetInstance()->GetPackage()->GetFile(Filename, &dataSize));
- Common::MemoryReadStream *stream = new Common::MemoryReadStream(
- data, dataSize, DisposeAfterUse::YES);
- _decoder.load(stream);
+ Common::SeekableReadStream *in = Kernel::GetInstance()->GetPackage()->GetStream(filename);
+ _decoder.load(in);
// Ausgabebitmap erstellen
GraphicEngine *pGfx = Kernel::GetInstance()->GetGfx();
@@ -86,7 +83,7 @@
_outputBitmap->SetScaleFactor(ScaleFactor);
// Z-Wert setzen
- _outputBitmap->SetZ(Z);
+ _outputBitmap->SetZ(z);
// Ausgabebitmap auf dem Bildschirm zentrieren
_outputBitmap->SetX((pGfx->GetDisplayWidth() - _outputBitmap->GetWidth()) / 2);
@@ -150,8 +147,7 @@
}
double MoviePlayer::GetTime() {
- // FIXME: This may need conversion
- return _decoder.getElapsedTime();
+ return _decoder.getElapsedTime() / 1000.0;
}
} // End of namespace Sword25
Modified: scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp 2010-10-12 23:23:10 UTC (rev 53300)
+++ scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp 2010-10-12 23:23:29 UTC (rev 53301)
@@ -55,6 +55,7 @@
_theoraPacket = 0;
_vorbisPacket = 0;
+ _theoraDecode = 0;
_theoraSetup = 0;
_stateFlag = false;
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