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

"Combine" processing for BPMs and stops.

Browse Source 
Prep for replacing with new negative-converting algorithm.
This commit is contained in:
Devin J. Pohly
2013-05-17 16:43:53 -04:00
parent 785cff2abc
commit c04553846a
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderSM.cpp
+9 -2
View File
@@ -362,6 +362,14 @@ void SMLoader::ProcessStops( TimingData &out, const vector< pair<float, float> >
}
}
void SMLoader::ProcessBPMsAndStops(TimingData &out,
const vector< pair<float, float> > &vBPMs,
const vector< pair<float, float> > &vStops)
{
ProcessBPMs(out, vBPMs);
ProcessStops(out, vStops);
}
void SMLoader::ProcessDelays( TimingData &out, const RString line, const int rowsPerBeat )
{
vector<RString> arrayDelayExpressions;
@@ -958,8 +966,7 @@ bool SMLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCache
}
// Turn negative time changes into warps
ProcessBPMs(out.m_SongTiming, vBPMChanges);
ProcessStops(out.m_SongTiming, vStops);
ProcessBPMsAndStops(out.m_SongTiming, vBPMChanges, vStops);
out.m_SongTiming.SortSegments( SEGMENT_WARP );
TidyUpData( out, bFromCache );