summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/file_source.h1
-rw-r--r--libs/ardour/ardour/region.h2
-rw-r--r--libs/ardour/ardour/source.h10
3 files changed, 3 insertions, 10 deletions
diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h
index 76c3c57e36..38449def26 100644
--- a/libs/ardour/ardour/file_source.h
+++ b/libs/ardour/ardour/file_source.h
@@ -41,6 +41,7 @@ public:
int move_to_trash (const Glib::ustring& trash_dir_name);
void mark_take (const Glib::ustring& id);
void mark_immutable ();
+ void mark_nonremovable ();
const Glib::ustring& take_id () const { return _take_id; }
bool within_session () const { return _within_session; }
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index a30bb8660c..9d85c5b43d 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -353,7 +353,7 @@ class Region
void register_properties ();
-private:
+protected:
void use_sources (SourceList const &);
};
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 9abf7ff8f0..6f750e6fd0 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -106,15 +106,7 @@ class Source : public SessionObject
Flag flags() const { return _flags; }
void inc_use_count () { g_atomic_int_inc (&_use_count); }
- void dec_use_count () {
-#ifndef NDEBUG
- gint oldval = g_atomic_int_exchange_and_add (&_use_count, -1);
- assert (oldval > 0);
-#else
- g_atomic_int_exchange_and_add (&_use_count, -1);
-#endif
- }
-
+ void dec_use_count ();
int use_count() const { return g_atomic_int_get (&_use_count); }
bool used() const { return use_count() > 0; }