- 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 fdf7473c63fb4c847d28e71709c3c1a2407a17f5..76c3c57e36501fea37a37d7a1c8ff76442982c23 100644 (file)
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006-2009 Paul Davis 
+    Copyright (C) 2006-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 
 */
 
-#ifndef __ardour_filesource_h__ 
+#ifndef __ardour_filesource_h__
 #define __ardour_filesource_h__
 
 #include <exception>
@@ -37,43 +37,44 @@ public:
        const Glib::ustring& path() const { return _path; }
 
        virtual bool safe_file_extension (const Glib::ustring& path) const = 0;
-       
+
        int  move_to_trash (const Glib::ustring& trash_dir_name);
        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; }
 
-       int set_state (const XMLNode&);
+       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);
 
        int set_source_name (const Glib::ustring& newname, bool destructive);
-       
+
        static void set_search_path (DataType type, const Glib::ustring& path);
 
        static bool find (DataType type, const Glib::ustring& path,
-                         bool must_exist, bool& is_new, uint16_t& chan,
-                         Glib::ustring& found_path);
+                       bool must_exist, bool& is_new, uint16_t& chan,
+                       Glib::ustring& found_path);
 
 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);
 
        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;
-       
+
        Glib::ustring _path;
        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;
 };