diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-02 11:32:13 -0400 |
| commit | 8c9749e42faf7808034ed8b7afce4a2fe6dc6f33 (patch) | |
| tree | 823af8a96f4e0b2a404f5e52eadf4f46e1d10229 /libs/ardour/ardour/file_source.h | |
| parent | f6d29abfc75c460b9e35717f2907e4e61bf38058 (diff) | |
| parent | 08a1409b1f5b5558d2eccc28a3ae4cbd44391812 (diff) | |
merge with master and fix 4 conflicts by hand
Diffstat (limited to 'libs/ardour/ardour/file_source.h')
| -rw-r--r-- | libs/ardour/ardour/file_source.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index 37a7e67d2e..c0e4fba0de 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -85,6 +85,9 @@ public: void existence_check (); virtual void prevent_deletion (); + void existence_check (); + virtual void prevent_deletion (); + protected: FileSource (Session& session, DataType type, const std::string& path, |