From 7decd479ee06269dc3a4c0454e7719a44373b3a6 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 19 Oct 2005 23:06:23 +0000
Subject: [PATCH] cleanups

---
 .../arch/MovieTexture/MovieTexture_FFMpeg.cpp | 32 +++++++++----------
 .../arch/MovieTexture/MovieTexture_FFMpeg.h   | 12 +++----
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
index 05f8c9a705..3d9c162ed6 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
@@ -410,10 +410,10 @@ MovieTexture_FFMpeg::MovieTexture_FFMpeg( RageTextureID ID ):
     m_State = DECODER_QUIT; /* it's quit until we call StartThread */
 	m_pSurface = NULL;
 	m_ImageWaiting = FRAME_NONE;
-	m_Rate = 1;
+	m_fRate = 1;
 	m_bWantRewind = false;
-	m_Clock = 0;
-	m_FrameSkipMode = false;
+	m_fClock = 0;
+	m_bFrameSkipMode = false;
 	m_bThreaded = PREFSMAN->m_bThreadedMovieDecode.Get();
 }
 
@@ -757,7 +757,7 @@ bool MovieTexture_FFMpeg::DecodeFrame()
 			RageException::Throw( "Error rewinding stream %s: %s", GetID().filename.c_str(), sError.c_str() );
 
 		m_pDecoder->Init();
-		m_Clock = -fDelay;
+		m_fClock = -fDelay;
 		return false;
 	}
 
@@ -778,21 +778,21 @@ float MovieTexture_FFMpeg::CheckFrameTime()
 {
 	ASSERT_M( m_ImageWaiting == FRAME_DECODED, ssprintf("%i", m_ImageWaiting) );
 
-	if( m_Rate == 0 )
+	if( m_fRate == 0 )
 		return 1;	// "a long time until the next frame"
 
-	const float Offset = (m_pDecoder->GetTimestamp() - m_Clock) / m_Rate;
+	const float fOffset = (m_pDecoder->GetTimestamp() - m_fClock) / m_fRate;
 
 	/* If we're ahead, we're decoding too fast; delay. */
-	if( Offset > 0.00001f )
+	if( fOffset > 0.00001f )
 	{
-		if( m_FrameSkipMode )
+		if( m_bFrameSkipMode )
 		{
 			/* We're caught up; stop skipping frames. */
 			LOG->Trace( "stopped skipping frames" );
-			m_FrameSkipMode = false;
+			m_bFrameSkipMode = false;
 		}
-		return Offset;
+		return fOffset;
 	}
 
 	/*
@@ -814,14 +814,14 @@ float MovieTexture_FFMpeg::CheckFrameTime()
 	 */
 	const float FrameSkipThreshold = 0.5f;
 
-	if( -Offset >= FrameSkipThreshold && !m_FrameSkipMode )
+	if( -fOffset >= FrameSkipThreshold && !m_bFrameSkipMode )
 	{
 		LOG->Trace( "(%s) Time is %f, and the movie is at %f.  Entering frame skip mode.",
-			GetID().filename.c_str(), m_Clock, m_pDecoder->GetTimestamp());
-		m_FrameSkipMode = true;
+			GetID().filename.c_str(), m_fClock, m_pDecoder->GetTimestamp());
+		m_bFrameSkipMode = true;
 	}
 
-	if( m_FrameSkipMode && m_pDecoder->m_stream->codec.frame_number % 2 )
+	if( m_bFrameSkipMode && m_pDecoder->m_stream->codec.frame_number % 2 )
 		return -1; /* skip */
 	
 	return 0;
@@ -865,7 +865,7 @@ void MovieTexture_FFMpeg::DecoderThread()
 		else if( fTime > 0 )		// not time to decode a new frame yet
 		{
 			/* This needs to be relatively short so that we wake up quickly 
-			 * from being paused or for changes in m_Rate. */
+			 * from being paused or for changes in m_fRate. */
 			usleep( 10000 );
 		}
 		else // fTime == 0
@@ -1011,7 +1011,7 @@ void MovieTexture_FFMpeg::SetPosition( float fSeconds )
 /* This is used to decode data. */
 void MovieTexture_FFMpeg::DecodeSeconds( float fSeconds )
 {
-	m_Clock += fSeconds * m_Rate;
+	m_fClock += fSeconds * m_fRate;
 
 	/* If we're not threaded, we want to be sure to decode any new frames now,
 	 * and not on the next frame.  Update() may have already been called for this
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h
index 1fdde8523c..1db5b5d6f4 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.h
@@ -6,7 +6,6 @@
 #include "RageDisplay.h"
 #include "RageTexture.h"
 #include "RageThreads.h"
-#include "RageTimer.h"
 
 /* Fix a compile problem in gcc 3.2: */
 #if defined(HAVE_INTTYPES_H)
@@ -30,7 +29,7 @@ public:
 
 	virtual void SetPosition( float fSeconds );
 	virtual void DecodeSeconds( float fSeconds );
-	virtual void SetPlaybackRate( float fRate ) { m_Rate=fRate; }
+	virtual void SetPlaybackRate( float fRate ) { m_fRate = fRate; }
 	void SetLooping( bool bLooping=true ) { m_bLoop = bLooping; }
 	unsigned GetTexHandle() const { return m_uTexHandle; }
 
@@ -39,8 +38,7 @@ public:
 private:
 	FFMpeg_Helper *m_pDecoder;
 
-	/* The time the movie is actually at: */
-	float m_Rate;
+	float m_fRate;
 	enum {
 		FRAME_NONE, /* no frame available; call GetFrame to get one */
 		FRAME_DECODED, /* frame decoded; call ConvertFrame */
@@ -70,9 +68,9 @@ private:
 
 	RageSemaphore m_BufferFinished;
 
-	RageTimer m_Timer;
-	float m_Clock;
-	bool m_FrameSkipMode;
+	/* The time the movie is actually at: */
+	float m_fClock;
+	bool m_bFrameSkipMode;
 
 	static int DecoderThread_start(void *p) { ((MovieTexture_FFMpeg *)(p))->DecoderThread(); return 0; }
 	void DecoderThread();