From 3c826a660df8491c60823ceb876fa24281ce39ac Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Wed, 19 Jan 2011 01:15:44 -0500 Subject: [PATCH] Add the other segments for consistency sake. --- src/TimingData.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/TimingData.cpp b/src/TimingData.cpp index 73ed97634e..5ae23baa02 100644 --- a/src/TimingData.cpp +++ b/src/TimingData.cpp @@ -488,12 +488,18 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float vector vBPMS = m_BPMSegments; vector vSS = m_StopSegments; vector vWS = m_WarpSegments; + vector vTSS = m_vTimeSignatureSegments; + vector vTS = m_TickcountSegments; sort( vBPMS.begin(), vBPMS.end() ); sort( vSS.begin(), vSS.end() ); sort( vWS.begin(), vWS.end() ); + sort( vTTS.begin(), vTTS.end() ); + sort( vTS.begin(), vTS.end() ); ASSERT_M( vBPMS == m_BPMSegments, "The BPM segments were not sorted!" ); ASSERT_M( vSS == m_StopSegments, "The Stop segments were not sorted!" ); ASSERT_M( vWS == m_WarpSegments, "The Warp segments were not sorted!" ); + ASSERT_M( vTTS == m_vTimeSignatureSegments, "The Time Signature segments were not sorted!" ); + ASSERT_M( vTS == m_TickcountSegments, "The Tickcount segments were not sorted!" ); FAIL_M( ssprintf("Failed to find the appropriate segment for elapsed time %f.", fTime) ); }