summaryrefslogtreecommitdiff
path: root/libs/ardour/file_source.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-04-13 10:29:07 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2014-04-14 13:05:08 -0400
commit0d5f4c553a7365612a44e1e0997a6d0e14d8b7ff (patch)
treed7031e5df3cbd6cae2b91630405e5f342d66f0e7 /libs/ardour/file_source.cc
parent384c0a9facf1bfecc783ac048dbb0bae4ad901fd (diff)
dramatic change in logic and naming for operations related to adding a MIDI region on demand and cloning/unlinking
Existing code would cause data loss due to creation of two Source objects referring the same path, one with removable flags and one without. Careful code review suggested a variety of thinkos, function naming problems and other confusion that caused this. I have tried ot extensively comment what is going on with these operations, because it is one key area in which MIDI differs from audio: with audio, capture is the only way to add a new audio region, but for MIDI there are GUI input events that can add a new region.
Diffstat (limited to 'libs/ardour/file_source.cc')
-rw-r--r--libs/ardour/file_source.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc
index de7365962f..df9fa13e3c 100644
--- a/libs/ardour/file_source.cc
+++ b/libs/ardour/file_source.cc
@@ -529,7 +529,7 @@ FileSource::set_source_name (const string& newname, bool destructive)
{
Glib::Threads::Mutex::Lock lm (_lock);
string oldpath = _path;
- string newpath = _session.change_source_path_by_name (oldpath, _name, newname, destructive);
+ string newpath = _session.generate_new_source_path_from_name (oldpath, _name, newname, destructive);
if (newpath.empty()) {
error << string_compose (_("programming error: %1"), "cannot generate a changed file path") << endmsg;