diff options
| author | Damien Zammit <damien@zamaudio.com> | 2017-11-18 15:27:37 +1100 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2017-11-18 15:28:39 +1100 |
| commit | 0073206508544fc6a698d4c04a8d3e8d03e8a8ea (patch) | |
| tree | 697c3bd819592368620f2450277a3196194cacc4 /gtk2_ardour/editor_pt_import.cc | |
| parent | 18306f3d3771557b2087de803528f8f4258757e4 (diff) | |
Revert "editor_pt_import: Process wav indexes once only"
This reverts commit 7422ffe6920deba396debb670c713849a64be43b.
Diffstat (limited to 'gtk2_ardour/editor_pt_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_pt_import.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_pt_import.cc b/gtk2_ardour/editor_pt_import.cc index 470d0b43e1..79dfa22f3a 100644 --- a/gtk2_ardour/editor_pt_import.cc +++ b/gtk2_ardour/editor_pt_import.cc @@ -192,16 +192,11 @@ Editor::do_ptimport (std::string ptpath, return; } - vector<uint16_t> indexes; - vector<uint16_t>::iterator used_idx; - for (vector<PTFFormat::region_t>::iterator a = ptf.regions.begin(); a != ptf.regions.end(); ++a) { for (vector<ptflookup_t>::iterator p = ptfwavpair.begin(); p != ptfwavpair.end(); ++p) { - - used_idx = std::find(indexes.begin(), indexes.end(), a->wave.index); - if ((p->index1 == a->wave.index) && (strcmp(a->wave.filename.c_str(), "") != 0) && used_idx == indexes.end()) { + if ((p->index1 == a->wave.index) && (strcmp(a->wave.filename.c_str(), "") != 0)) { for (SourceList::iterator x = imported.begin(); x != imported.end(); ++x) { if ((*x)->id() == p->id) { @@ -228,7 +223,6 @@ Editor::do_ptimport (std::string ptpath, ptfregpair.push_back(rp); } } - indexes.push_back(a->wave.index); } } if (strcmp(a->wave.filename.c_str(), "") == 0) { |