diff options
author | David Robillard <d@drobilla.net> | 2012-08-14 04:23:23 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-08-14 04:23:23 +0000 |
commit | 80fee5c311fdbdeda573ec81f59158a5fc87d0a1 (patch) | |
tree | 8e7e5a6c9bda32bbe0ae8e8c9f6ab23e44c7c181 /src/ClashAvoider.cpp | |
parent | 058eaf65642268047a984a5c80d54a1f62a85130 (diff) | |
download | ingen-80fee5c311fdbdeda573ec81f59158a5fc87d0a1.tar.gz ingen-80fee5c311fdbdeda573ec81f59158a5fc87d0a1.tar.bz2 ingen-80fee5c311fdbdeda573ec81f59158a5fc87d0a1.zip |
Update for latest Raul.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4687 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/ClashAvoider.cpp')
-rw-r--r-- | src/ClashAvoider.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ClashAvoider.cpp b/src/ClashAvoider.cpp index 6a21da2c..7af132f5 100644 --- a/src/ClashAvoider.cpp +++ b/src/ClashAvoider.cpp @@ -45,7 +45,7 @@ ClashAvoider::map_path(const Raul::Path& in) unsigned offset = 0; bool has_offset = false; - const size_t pos = in.str().find_last_of('_'); + const size_t pos = in.find_last_of('_'); if (pos != string::npos && pos != (in.length()-1)) { const std::string trailing = in.substr(pos + 1); has_offset = (sscanf(trailing.c_str(), "%u", &offset) > 0); @@ -54,7 +54,7 @@ ClashAvoider::map_path(const Raul::Path& in) Raul::debug << "OFFSET: " << offset << endl; // Path without _n suffix - std::string base_path_str = in.str(); + std::string base_path_str = in; if (has_offset) { base_path_str = base_path_str.substr(0, base_path_str.find_last_of('_')); } @@ -75,8 +75,8 @@ ClashAvoider::map_path(const Raul::Path& in) Raul::debug << "CHECK: " << parent << endl; SymbolMap::iterator p = _symbol_map.find(parent); if (p != _symbol_map.end()) { - const Raul::Path mapped = p->second.base() - + in.substr(parent.base().length()); + const Raul::Path mapped = Raul::Path( + p->second.base() + in.substr(parent.base().length())); InsertRecord i = _symbol_map.insert(make_pair(in, mapped)); Raul::debug << " (2) " << i.first->second << endl; return i.first->second; @@ -110,7 +110,7 @@ ClashAvoider::map_path(const Raul::Path& in) std::stringstream ss; ss << base_path << "_" << offset; - if (!exists(ss.str())) { + if (!exists(Raul::Path(ss.str()))) { std::string name = base_path.symbol(); if (name == "") name = "_"; |