actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-30 01:52:12 +00:00
parent 115bad2017
commit cf6da4c2f4
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundPosMap.cpp
+15 -12
View File
@@ -3,6 +3,7 @@
#include "RageLog.h" #include "RageLog.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "RageTimer.h" #include "RageTimer.h"
#include "Foreach.h"
#include <deque> #include <deque>
@@ -101,34 +102,36 @@ int64_t pos_map_queue::Search( int64_t iSourceFrame, bool *bApproximate ) const
/* iSourceFrame is probably in pos_map. Search to figure out what position /* iSourceFrame is probably in pos_map. Search to figure out what position
* it maps to. */ * it maps to. */
int64_t iClosestPosition = 0, iClosestPositionDist = INT_MAX; int64_t iClosestPosition = 0, iClosestPositionDist = INT_MAX;
int iClosestBlock = 0; /* print only */ const pos_map_t *pClosestBlock = &*m_pImpl->m_Queue.begin(); /* print only */
for( unsigned i = 0; i < m_pImpl->m_Queue.size(); ++i ) FOREACHD_CONST( pos_map_t, m_pImpl->m_Queue, it )
{ {
if( iSourceFrame >= m_pImpl->m_Queue[i].m_iSourceFrame && const pos_map_t &pm = *it;
iSourceFrame < m_pImpl->m_Queue[i].m_iSourceFrame+m_pImpl->m_Queue[i].m_iFrames )
if( iSourceFrame >= pm.m_iSourceFrame &&
iSourceFrame < pm.m_iSourceFrame+pm.m_iFrames )
{ {
/* iSourceFrame lies in this block; it's an exact match. Figure /* iSourceFrame lies in this block; it's an exact match. Figure
* out the exact position. */ * out the exact position. */
int64_t diff = m_pImpl->m_Queue[i].m_iDestFrame - m_pImpl->m_Queue[i].m_iSourceFrame; int64_t diff = pm.m_iDestFrame - pm.m_iSourceFrame;
return iSourceFrame + diff; return iSourceFrame + diff;
} }
/* See if the current position is close to the beginning of this block. */ /* See if the current position is close to the beginning of this block. */
int64_t dist = llabs( m_pImpl->m_Queue[i].m_iSourceFrame - iSourceFrame ); int64_t dist = llabs( pm.m_iSourceFrame - iSourceFrame );
if( dist < iClosestPositionDist ) if( dist < iClosestPositionDist )
{ {
iClosestPositionDist = dist; iClosestPositionDist = dist;
iClosestBlock = i; pClosestBlock = &pm;
iClosestPosition = m_pImpl->m_Queue[i].m_iDestFrame; iClosestPosition = pm.m_iDestFrame;
} }
/* See if the current position is close to the end of this block. */ /* See if the current position is close to the end of this block. */
dist = llabs( m_pImpl->m_Queue[i].m_iSourceFrame + m_pImpl->m_Queue[i].m_iFrames - iSourceFrame ); dist = llabs( pm.m_iSourceFrame + pm.m_iFrames - iSourceFrame );
if( dist < iClosestPositionDist ) if( dist < iClosestPositionDist )
{ {
iClosestPositionDist = dist; iClosestPositionDist = dist;
iClosestBlock = i; pClosestBlock = &pm;
iClosestPosition = m_pImpl->m_Queue[i].m_iDestFrame + m_pImpl->m_Queue[i].m_iFrames; iClosestPosition = pm.m_iDestFrame + pm.m_iFrames;
} }
} }
@@ -152,7 +155,7 @@ int64_t pos_map_queue::Search( int64_t iSourceFrame, bool *bApproximate ) const
{ {
last.GetDeltaTime(); last.GetDeltaTime();
LOG->Trace( "Approximate sound time: driver frame " LI ", m_pImpl->m_Queue frame " LI ".." LI " (dist " LI "), closest position is " LI, LOG->Trace( "Approximate sound time: driver frame " LI ", m_pImpl->m_Queue frame " LI ".." LI " (dist " LI "), closest position is " LI,
iSourceFrame, m_pImpl->m_Queue[iClosestBlock].m_iSourceFrame, m_pImpl->m_Queue[iClosestBlock].m_iSourceFrame+m_pImpl->m_Queue[iClosestBlock].m_iFrames, iSourceFrame, pClosestBlock->m_iSourceFrame, pClosestBlock->m_iSourceFrame+pClosestBlock->m_iFrames,
iClosestPositionDist, iClosestPosition ); iClosestPositionDist, iClosestPosition );
} }