debug flag for MTC; make ardour/timecode.h simply include the "authoritative" one...

[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 0d6cae9b18874cded8b36db3c6c6d1bb970deb6c..4b17881a0bbc814b736b1f7b76e13efb4ad621ac 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,12 +17,12 @@
 
 */
 
-#ifndef __ardour_filesource_h__ 
+#ifndef __ardour_filesource_h__
 #define __ardour_filesource_h__
 
 #include <exception>
 #include <time.h>
-#include <ardour/source.h>
+#include "ardour/source.h"
 
 namespace ARDOUR {
 
@@ -37,44 +37,47 @@ 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&);
+       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);
+
 protected:
        FileSource (Session& session, DataType type,
                        const Glib::ustring& path, bool embedded,
                        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; }
-       
-       bool find (DataType type, const Glib::ustring& path,
-                       bool must_exist, bool& is_new, uint16_t& chan);
-       
+
+       void set_embedded_from_name();
+
        bool removable () const;
-       
+
        Glib::ustring _path;
        Glib::ustring _take_id;
        bool          _file_is_new;
        uint16_t      _channel;
        bool          _is_embedded;
 
-       static map<DataType, Glib::ustring> search_paths;
+       static std::map<DataType, Glib::ustring> search_paths;
 };
 
 } // namespace ARDOUR