ardour/livetrax
13
0
Fork 0
Code

Revert "editor_pt_import: Process wav indexes once only"

Browse Source 
This reverts commit 7422ffe692.
This commit is contained in:
Damien Zammit 2017-11-18 15:27:37 +11:00
parent 18306f3d37
commit 0073206508
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/editor_pt_import.cc
View File

@ -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) {