diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-01 09:46:18 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-01 09:46:18 -0400 |
| commit | 23e7cf10191270d70357ccf0ed9294f020c7b7ab (patch) | |
| tree | ddc1fc4d1914fe3de3de79c194c5dd859915bd2a /libs/ardour/midi_diskstream.cc | |
| parent | 4244ea65460b865f946551aace9b74191b26be4b (diff) | |
| parent | b660bc8ae92d19aedf0165815432b77a0c6170c4 (diff) | |
merge with master.
Manually resolved conflicts in import.cc and session.cc
Diffstat (limited to 'libs/ardour/midi_diskstream.cc')
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index a104d98f26..69eca996aa 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -1258,9 +1258,9 @@ MidiDiskstream::steal_write_source_name () */ try { - string new_name = _session.new_midi_source_name (name()); + string new_path = _session.new_midi_source_path (name()); - if (_write_source->rename (new_name)) { + if (_write_source->rename (new_path)) { return string(); } } catch (...) { |