merge from 2.0-ongoing by hand, minus key binding editor

git-svn-id: svn://localhost/ardour2/trunk@2539 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 2 deletions

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 78d10f9d64..4d80c8ddf5 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -61,7 +61,8 @@ class AudioFileSource : public AudioSource {
 	
 	Glib::ustring path() const { return _path; }
 	Glib::ustring peak_path (Glib::ustring audio_path);
-	Glib::ustring old_peak_path (Glib::ustring audio_path);
+	Glib::ustring find_broken_peakfile (Glib::ustring missing_peak_path,
+					     Glib::ustring audio_path);
 
 	uint16_t channel() const { return _channel; }
 
@@ -122,7 +123,7 @@ class AudioFileSource : public AudioSource {
 	   to cause issues.
 	*/
 
-	virtual void handle_header_position_change ();
+	virtual void handle_header_position_change () {}
 
   protected:
 	
@@ -166,6 +167,10 @@ class AudioFileSource : public AudioSource {
 	bool find (Glib::ustring& path, bool must_exist, bool& is_new, uint16_t& chan);
 	bool removable() const;
 	bool writable() const { return _flags & Writable; }
+
+  private:
+	Glib::ustring old_peak_path (Glib::ustring audio_path);
+	Glib::ustring broken_peak_path (Glib::ustring audio_path);
 };
 
 } // namespace ARDOUR