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/ardour/smf_source.h | |
parent | 4244ea65460b865f946551aace9b74191b26be4b (diff) | |
parent | b660bc8ae92d19aedf0165815432b77a0c6170c4 (diff) |
merge with master.
Manually resolved conflicts in import.cc and session.cc
Diffstat (limited to 'libs/ardour/ardour/smf_source.h')
-rw-r--r-- | libs/ardour/ardour/smf_source.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index 93adfd71f9..84c45f9b3c 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -47,15 +47,6 @@ public: virtual ~SMFSource (); - /** Rename the file on disk referenced by this source to \param newname - * - * This method exists only for MIDI file sources, not for audio, which - * can never be renamed. It exists for MIDI so that we can get - * consistent and sane region/source numbering when regions are added - * manually (which never happens with audio). - */ - int rename (const std::string& name); - bool safe_file_extension (const std::string& path) const { return safe_midi_file_extension(path); } |