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

Make compress/expand preserve timing data by also adjusting BPM changes between start and end marker. The adjusting part is at TimingData::ScaleRegion.

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2011-03-19 18:58:44 +07:00
parent c300c20fea
commit a9af35d94e
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+27 -2
View File
@@ -611,12 +611,12 @@ float TimingData::GetElapsedTimeFromBeatNoOffset( float fBeat ) const
return fElapsedTime;
}
void TimingData::ScaleRegion( float fScale, int iStartIndex, int iEndIndex )
void TimingData::ScaleRegion( float fScale, int iStartIndex, int iEndIndex, bool bAdjustBPM )
{
ASSERT( fScale > 0 );
ASSERT( iStartIndex >= 0 );
ASSERT( iStartIndex < iEndIndex );
for ( unsigned i = 0; i < m_BPMSegments.size(); i++ )
{
const int iSegStart = m_BPMSegments[i].m_iStartRow;
@@ -638,6 +638,31 @@ void TimingData::ScaleRegion( float fScale, int iStartIndex, int iEndIndex )
else
m_StopSegments[i].m_iStartRow = lrintf((iSegStartRow - iStartIndex) * fScale) + iStartIndex;
}
// adjust BPM changes to preserve timing
if( bAdjustBPM )
{
int iNewEndIndex = lrintf( (iEndIndex - iStartIndex) * fScale ) + iStartIndex;
float fEndBPMBeforeScaling = GetBPMAtRow(iNewEndIndex);
// adjust BPM changes "between" iStartIndex and iNewEndIndex
for ( unsigned i = 0; i < m_BPMSegments.size(); i++ )
{
const int iSegStart = m_BPMSegments[i].m_iStartRow;
if( iSegStart <= iStartIndex )
continue;
else if( iSegStart >= iNewEndIndex )
continue;
else
m_BPMSegments[i].m_fBPS *= fScale;
}
// set BPM at iStartIndex and iNewEndIndex.
SetBPMAtRow( iStartIndex, GetBPMAtRow(iStartIndex) * fScale );
SetBPMAtRow( iNewEndIndex, fEndBPMBeforeScaling );
}
}
void TimingData::InsertRows( int iStartRow, int iRowsToAdd )