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/NotesLoaderSSC.cpp
+4 -8
View File
@@ -565,8 +565,7 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
else if( sValueName=="NOTEDATA" )
{
// Process timings and convert negative bpms/stops
SMLoader::ProcessBPMs(out.m_SongTiming, vBPMChanges);
SMLoader::ProcessStops(out.m_SongTiming, vStops);
SMLoader::ProcessBPMsAndStops(out.m_SongTiming, vBPMChanges, vStops);
state = GETTING_STEP_INFO;
pNewNotes = out.CreateSteps();
@@ -656,8 +655,7 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
// Process timings and convert negative bpms/stops
if( !vBPMChanges.empty() )
bHasOwnTiming = true;
SMLoader::ProcessBPMs(stepsTiming, vBPMChanges);
SMLoader::ProcessStops(stepsTiming, vStops);
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
state = GETTING_SONG_INFO;
if( bHasOwnTiming )
@@ -808,8 +806,7 @@ bool SSCLoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
// Process timings and convert negative bpms/stops
if( !vBPMChanges.empty() )
bHasOwnTiming = true;
SMLoader::ProcessBPMs(stepsTiming, vBPMChanges);
SMLoader::ProcessStops(stepsTiming, vStops);
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
state = GETTING_SONG_INFO;
if( bHasOwnTiming )
@@ -1047,8 +1044,7 @@ bool SSCLoader::LoadEditFromMsd(const MsdFile &msd,
return true;
// Process timings and convert negative bpms/stops
SMLoader::ProcessBPMs(stepsTiming, vBPMChanges);
SMLoader::ProcessStops(stepsTiming, vStops);
SMLoader::ProcessBPMsAndStops(stepsTiming, vBPMChanges, vStops);
if( bSSCFormat )
{