X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsource.cc;h=618dddc70b75808e63550b53a42b1fb945cb5d7b;hb=0d7ee3fbd36ed735b17098adb5b35d1ab2927e52;hp=c299588f3c84256002b7253e184b51ba94619388;hpb=045754c52b8de047c74df32d706b6a35dc066fa5;p=ardour.git

diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index c299588f3c..618dddc70b 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <fstream>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include "pbd/xml++.h"
@@ -53,6 +53,7 @@ Source::Source (Session& s, DataType type, const string& name, Flag flags)
 	, _flags(flags)
 	, _timeline_position(0)
         , _use_count (0)
+	, _level (0)
 {
 	_analysed = false;
 	_timestamp = 0;
@@ -65,6 +66,7 @@ Source::Source (Session& s, const XMLNode& node)
 	, _flags (Flag (Writable|CanRename))
 	, _timeline_position(0)
         , _use_count (0)
+	, _level (0)
 {
 	_timestamp = 0;
 	_analysed = false;
@@ -98,7 +100,7 @@ Source::get_state ()
 	node->add_property ("name", name());
 	node->add_property ("type", _type.to_string());
 	node->add_property (X_("flags"), enum_2_string (_flags));
-	_id.print (buf, sizeof (buf));
+	id().print (buf, sizeof (buf));
 	node->add_property ("id", buf);
 
 	if (_timestamp != 0) {
@@ -120,9 +122,7 @@ Source::set_state (const XMLNode& node, int version)
 		return -1;
 	}
 
-	if ((prop = node.property ("id")) != 0) {
-		_id = prop->value ();
-	} else {
+	if (!set_id (node)) {
 		return -1;
 	}
 
@@ -147,7 +147,7 @@ Source::set_state (const XMLNode& node, int version)
 	}
 
 	if (version < 3000) {
-		/* a source with an XML node must necessarily already exist, 
+		/* a source with an XML node must necessarily already exist,
 		   and therefore cannot be removable/writable etc. etc.; 2.X
 		   sometimes marks sources as removable which shouldn't be.
 		*/
@@ -162,7 +162,7 @@ Source::set_state (const XMLNode& node, int version)
 bool
 Source::has_been_analysed() const
 {
-	Glib::Mutex::Lock lm (_analysis_lock);
+	Glib::Threads::Mutex::Lock lm (_analysis_lock);
 	return _analysed;
 }
 
@@ -170,7 +170,7 @@ void
 Source::set_been_analysed (bool yn)
 {
 	{
-		Glib::Mutex::Lock lm (_analysis_lock);
+		Glib::Threads::Mutex::Lock lm (_analysis_lock);
 		_analysed = yn;
 	}
 
@@ -219,7 +219,7 @@ Source::get_transients_path () const
 	s = _session.analysis_dir ();
 	parts.push_back (s);
 
-	s = _id.to_s();
+	s = id().to_s();
 	s += '.';
 	s += TransientDetector::operational_identifier();
 	parts.push_back (s);
@@ -252,10 +252,10 @@ Source::mark_for_remove ()
 {
 	// This operation is not allowed for sources for destructive tracks or out-of-session files.
 
-	/* XXX need a way to detect _within_session() condition here - move it from FileSource? 
+	/* XXX need a way to detect _within_session() condition here - move it from FileSource?
 	 */
 
-	if ((_flags & Destructive)) { 
+	if ((_flags & Destructive)) {
 		return;
 	}
 
@@ -263,7 +263,7 @@ Source::mark_for_remove ()
 }
 
 void
-Source::set_timeline_position (int64_t pos)
+Source::set_timeline_position (framepos_t pos)
 {
 	_timeline_position = pos;
 }
@@ -292,13 +292,20 @@ void
 Source::dec_use_count ()
 {
 #ifndef NDEBUG
-        gint oldval = g_atomic_int_exchange_and_add (&_use_count, -1);
+        gint oldval = g_atomic_int_add (&_use_count, -1);
         if (oldval <= 0) {
                 cerr << "Bad use dec for " << name() << endl;
                 abort ();
         }
         assert (oldval > 0);
-#else 
-        g_atomic_int_exchange_and_add (&_use_count, -1);
+#else
+        g_atomic_int_add (&_use_count, -1);
 #endif
 }
+
+bool
+Source::writable () const
+{
+        return (_flags & Writable) && _session.writable();
+}
+