merge with master, with minor conflict fixes

[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 4b1dbf2b6cb5dd51542cc7aee9a8a73c08f57536..34e84c242811f8b1162a2e0c06673254ae21e497 100644 (file)
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -74,6 +74,7 @@ public:
 
        void inc_use_count ();
        bool removable () const;
+        bool is_stub () const;
 
        const std::string& origin() const { return _origin; }