From 52d7f6c68b12c240faaa019d69975e5bc2d4753e Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Mon, 15 Aug 2011 19:23:43 -0400
Subject: [PATCH] Make it better: don't duplicate code.

---
 src/TimingData.cpp | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index dd6aa80e3c..cd290de154 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -972,6 +972,7 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float
 				itBPMS ++;
 				break;
 			case FOUND_DELAY:
+			case FOUND_STOP_DELAY:
 			{
 				const DelaySegment *ss = static_cast<DelaySegment *>(*itDS);
 				fTimeToNextEvent = ss->GetPause();
@@ -986,7 +987,8 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float
 				}
 				fLastTime = fNextEventTime;
 				itDS ++;
-				break;
+				if (iEventType == FOUND_DELAY)
+					break;
 			}
 			case FOUND_STOP:
 			{
@@ -1005,34 +1007,6 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float
 				itSS ++;
 				break;
 			}
-			case FOUND_STOP_DELAY:
-			{
-				const DelaySegment *ds = static_cast<DelaySegment *>(*itDS);
-				const StopSegment *ss = static_cast<StopSegment *>(*itSS);
-				fNextEventTime = fLastTime + ds->GetPause();
-				if ( fElapsedTime < fNextEventTime )
-				{
-					bFreezeOut = false;
-					bDelayOut  = true;
-					fBeatOut   = ds->GetBeat();
-					fBPSOut    = fBPS;
-					return;
-				}
-				itDS++;
-				
-				fNextEventTime += ss->GetPause();
-				if ( fElapsedTime < fNextEventTime )
-				{
-					bFreezeOut = true;
-					bDelayOut  = false;
-					fBeatOut   = ss->GetBeat();
-					fBPSOut    = fBPS;
-					return;
-				}
-				fLastTime = fNextEventTime;
-				itSS++;
-				break;
-			}
 			case FOUND_WARP:
 			{
 				bIsWarping = true;