[Scummvm-cvs-logs] SF.net SVN: scummvm:[53302] scummvm/trunk/engines/sword25/fmv/movieplayer. cpp

[sev at users.sourceforge.net]

Revision: 53302
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53302&view=rev
Author:   sev
Date:     2010-10-12 23:23:48 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: Formatting fixes

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/fmv/movieplayer.cpp

Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.cpp	2010-10-12 23:23:29 UTC (rev 53301)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.cpp	2010-10-12 23:23:48 UTC (rev 53302)
@@ -49,8 +49,7 @@
 	return new MoviePlayer(pKernel);
 }
 
-MoviePlayer::MoviePlayer(Kernel *pKernel) : Service(pKernel),
-		_decoder(g_system->getMixer()) {
+MoviePlayer::MoviePlayer(Kernel *pKernel) : Service(pKernel), _decoder(g_system->getMixer()) {
 	if (!_RegisterScriptBindings())
 		BS_LOG_ERRORLN("Script bindings could not be registered.");
 	else
@@ -68,8 +67,7 @@
 
 	// Ausgabebitmap erstellen
 	GraphicEngine *pGfx = Kernel::GetInstance()->GetGfx();
-	_outputBitmap = pGfx->GetMainPanel()->AddDynamicBitmap(
-		_decoder.getWidth(), _decoder.getHeight());
+	_outputBitmap = pGfx->GetMainPanel()->AddDynamicBitmap(_decoder.getWidth(), _decoder.getHeight());
 	if (!_outputBitmap.IsValid()) {
 		BS_LOG_ERRORLN("Output bitmap for movie playback could not be created.");
 		return false;
@@ -79,7 +77,10 @@
 	float ScreenToVideoWidth = (float) pGfx->GetDisplayWidth() / (float) _outputBitmap->GetWidth();
 	float ScreenToVideoHeight = (float) pGfx->GetDisplayHeight() / (float) _outputBitmap->GetHeight();
 	float ScaleFactor = MIN(ScreenToVideoWidth, ScreenToVideoHeight);
-	if (abs(ScaleFactor - 1.0f) < FLT_EPSILON) ScaleFactor = 1.0f;
+
+	if (abs(ScaleFactor - 1.0f) < FLT_EPSILON)
+		ScaleFactor = 1.0f;
+
 	_outputBitmap->SetScaleFactor(ScaleFactor);
 
 	// Z-Wert setzen
@@ -135,9 +136,9 @@
 		return 0;
 }
 
-void MoviePlayer::SetScaleFactor(float ScaleFactor) {
+void MoviePlayer::SetScaleFactor(float scaleFactor) {
 	if (_decoder.isVideoLoaded()) {
-		_outputBitmap->SetScaleFactor(ScaleFactor);
+		_outputBitmap->SetScaleFactor(scaleFactor);
 
 		// Ausgabebitmap auf dem Bildschirm zentrieren
 		GraphicEngine *gfxPtr = Kernel::GetInstance()->GetGfx();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.