Do not repeated audio split timestamps

zardoru · Nov 21, 2020 · 8dda1d8 · 8dda1d8
1 parent 4e50ea4
commit 8dda1d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/midi_smfin.cpp b/src/midi_smfin.cpp
@@ -85,7 +85,7 @@ class LoadSmfDialog : public wxDialog {
         auto channels_lbl = new wxStaticText(this, ID_Tracks_Text, _("Channels (&C):"));
         dlg_sizer->Add(channels_lbl);
 
-        auto chan_grid = new wxGridSizer(4, 4, 3, 3);
+        auto chan_grid = new wxGridSizer(4, 4, 5, 5);
         dlg_sizer->Add(chan_grid);
 
         for (int i = 0; i < 16; i++) {

diff --git a/src/wavsplit.cpp b/src/wavsplit.cpp
@@ -71,17 +71,16 @@ void SplitFile(
 }
 
 std::vector<double> GetSplitPoints(Division *pDivision, double bpm, double offset_ms) {
-    std::vector<double> ret;
-    ret.reserve(pDivision->notes_count());
+    std::set<double> ret;
 
     for (int i = 0; i < pDivision->notes_count(); i++) {
         auto note = pDivision->notes(i);
         auto beat = (double)note.position / (double)pDivision->get_quantize();
         auto spb = 60 / bpm;
         auto time = spb * beat + offset_ms / 1000.0;
 
-        ret.push_back(time);
+        ret.insert(time);
     }
 
-    return ret;
+    return std::vector(ret.begin(), ret.end());
 }