- Fix process callbakc handling during export

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

diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index 5a9c2a9c56ff4529b3afd82d85f638b209a89bdc..76c3c57e36501fea37a37d7a1c8ff76442982c23 100644 (file)
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -42,11 +42,11 @@ public:
        void mark_take (const Glib::ustring& id);
        void mark_immutable ();
 
-       const Glib::ustring& take_id ()     const { return _take_id; }
-       bool                 is_embedded () const { return _is_embedded; }
-       uint16_t             channel()      const { return _channel; }
+       const Glib::ustring& take_id ()        const { return _take_id; }
+       bool                 within_session () const { return _within_session; }
+       uint16_t             channel()         const { return _channel; }
 
-       int set_state (const XMLNode&, int version = 3000);
+       int set_state (const XMLNode&, int version);
 
        int set_source_name (const Glib::ustring& newname, bool destructive);
 
@@ -58,7 +58,7 @@ public:
 
 protected:
        FileSource (Session& session, DataType type,
-                       const Glib::ustring& path, bool embedded,
+                       const Glib::ustring& path, 
                        Source::Flag flags = Source::Flag(0));
 
        FileSource (Session& session, const XMLNode& node, bool must_exist);
@@ -66,6 +66,7 @@ protected:
        virtual int init (const Glib::ustring& idstr, bool must_exist);
 
        virtual int move_dependents_to_trash() { return 0; }
+       void set_within_session_from_path (const std::string&);
 
        bool removable () const;
 
@@ -73,7 +74,7 @@ protected:
        Glib::ustring _take_id;
        bool          _file_is_new;
        uint16_t      _channel;
-       bool          _is_embedded;
+       bool          _within_session;
 
        static std::map<DataType, Glib::ustring> search_paths;
 };