merge with master.

[ardour.git] / libs / ardour / ardour / audiofilesource.h

diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 53819c1c9e0fe43162dc3cf80ce1d38ff6056c86..4831eb208166e812499b3ac8a12d4b93952fd1f0 100644 (file)
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -39,10 +39,6 @@ class LIBARDOUR_API AudioFileSource : public AudioSource, public FileSource {
 public:
        virtual ~AudioFileSource ();
 
-       bool set_name (const std::string& newname) {
-               return (set_source_name(newname, destructive()) == 0);
-       }
-
        std::string peak_path (std::string audio_path);
        std::string find_broken_peakfile (std::string missing_peak_path,
                                          std::string audio_path);
@@ -98,6 +94,12 @@ protected:
        /** Constructor to be called for existing in-session files */
        AudioFileSource (Session&, const XMLNode&, bool must_exist = true);
 
+       /** Constructor to be called for crash recovery. Final argument is not
+        * used but exists to differentiate from the external-to-session
+        * constructor above.
+        */
+       AudioFileSource (Session&, const std::string& path, Source::Flag flags, bool);
+
        int init (const std::string& idstr, bool must_exist);
 
        virtual void set_header_timeline_position () = 0;