further code simplification and rationalization related to MIDI source/file renaming

2 files changed, 9 insertions, 2 deletions

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 07c6210833..38185a71d6 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -194,8 +194,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
 	std::string peak_path (std::string) const;
 
-	std::string generate_new_source_path_from_name (std::string oldpath, std::string oldname, std::string newname, bool destructive);
-
 	std::string peak_path_from_audio_path (std::string) const;
 	std::string new_audio_source_name (const std::string&, uint32_t nchans, uint32_t chan, bool destructive);
 	std::string new_midi_source_name (const std::string&);
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index e0c5a9c6e8..2e6ebc0650 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -45,6 +45,15 @@ 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);
 	}