From 0073206508544fc6a698d4c04a8d3e8d03e8a8ea Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Sat, 18 Nov 2017 15:27:37 +1100 Subject: Revert "editor_pt_import: Process wav indexes once only" This reverts commit 7422ffe6920deba396debb670c713849a64be43b. --- gtk2_ardour/editor_pt_import.cc | 8 +------- 1 file changed, 1 insertion(+), 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 indexes; - vector::iterator used_idx; - for (vector::iterator a = ptf.regions.begin(); a != ptf.regions.end(); ++a) { for (vector::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) { -- cgit v1.2.3