Sort BPMs and stops before processing
This commit is contained in:
@@ -363,9 +363,16 @@ void SMLoader::ProcessStops( TimingData &out, const vector< pair<float, float> >
|
|||||||
}
|
}
|
||||||
|
|
||||||
void SMLoader::ProcessBPMsAndStops(TimingData &out,
|
void SMLoader::ProcessBPMsAndStops(TimingData &out,
|
||||||
const vector< pair<float, float> > &vBPMs,
|
vector< pair<float, float> > &vBPMs,
|
||||||
const vector< pair<float, float> > &vStops)
|
vector< pair<float, float> > &vStops)
|
||||||
{
|
{
|
||||||
|
// Sort BPM changes and stops
|
||||||
|
// TODO: Make sorted lists a precondition rather than sorting them here.
|
||||||
|
// The caller may know that the lists are sorted already (e.g. if
|
||||||
|
// loaded from cache).
|
||||||
|
stable_sort(vBPMs.begin(), vBPMs.end());
|
||||||
|
stable_sort(vStops.begin(), vStops.end());
|
||||||
|
|
||||||
ProcessBPMs(out, vBPMs);
|
ProcessBPMs(out, vBPMs);
|
||||||
ProcessStops(out, vStops);
|
ProcessStops(out, vStops);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -102,8 +102,8 @@ struct SMLoader
|
|||||||
* @param vBPMs the vector of BPM changes.
|
* @param vBPMs the vector of BPM changes.
|
||||||
* @param vStops the vector of stops. */
|
* @param vStops the vector of stops. */
|
||||||
void ProcessBPMsAndStops(TimingData &out,
|
void ProcessBPMsAndStops(TimingData &out,
|
||||||
const vector< pair<float, float> > &vBPMs,
|
vector< pair<float, float> > &vBPMs,
|
||||||
const vector< pair<float, float> > &vStops);
|
vector< pair<float, float> > &vStops);
|
||||||
/**
|
/**
|
||||||
* @brief Process the Delay Segments from the string.
|
* @brief Process the Delay Segments from the string.
|
||||||
* @param out the TimingData being modified.
|
* @param out the TimingData being modified.
|
||||||
|
|||||||
Reference in New Issue
Block a user