"Combine" processing for BPMs and stops.

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
+2 -4
View File
@@ -304,8 +304,7 @@ bool SMALoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
// This should generally return song timing
TimingData &timing = (state == SMA_GETTING_STEP_INFO
? pNewNotes->m_Timing : out.m_SongTiming);
ProcessBPMs( timing, vBPMChanges );
ProcessStops( timing, vStops );
ProcessBPMsAndStops(timing, vBPMChanges, vStops);
state = SMA_GETTING_STEP_INFO;
pNewNotes = new Steps(&out);
@@ -459,8 +458,7 @@ bool SMALoader::LoadFromSimfile( const RString &sPath, Song &out, bool bFromCach
// Handle timing changes and convert negative bpms/stops
TimingData &timing = (state == SMA_GETTING_STEP_INFO
? pNewNotes->m_Timing : out.m_SongTiming);
ProcessBPMs( timing, vBPMChanges );
ProcessStops( timing, vStops );
ProcessBPMsAndStops(timing, vBPMChanges, vStops);
}
else if( sValueName=="TIMESIGNATURES" || sValueName=="LEADTRACK" )
;