Partial revert. Restore most delays/stops.

The only thing to fix properly
is when stops and delays share the same row.
This commit is contained in:
Jason Felds
2011-08-15 17:54:06 -04:00
parent 0dc695b247
commit 6e8137500d
+1 -2
View File
@@ -938,8 +938,7 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float
iEventType = FOUND_DELAY; iEventType = FOUND_DELAY;
} }
if (itSS != segs[SEGMENT_STOP].end() && if (itSS != segs[SEGMENT_STOP].end() &&
(*itSS)->GetRow() < iEventRow && (*itSS)->GetRow() < iEventRow ) // && iEventType != FOUND_DELAY )
iEventType != FOUND_DELAY )
{ {
iEventRow = (*itSS)->GetRow(); iEventRow = (*itSS)->GetRow();
iEventType = FOUND_STOP; iEventType = FOUND_STOP;