X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fsource.cc;h=4c582f3ad741146d4af653e96ce5a5380dac5181;hb=4cd2e73732f4bc5e56ba1d3533e33597fa0d3872;hp=790b7f6c3e9cb85f2698658f71cbf4bb6b1eee0f;hpb=51693a3a5835a7c2deb16242d14d73fbb7881382;p=ardour.git

diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index 790b7f6c3e..4c582f3ad7 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -45,12 +45,15 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 
 Source::Source (Session& s, DataType type, const string& name, Flag flags)
 	: SessionObject(s, name)
 	, _type(type)
 	, _flags(flags)
 	, _timeline_position(0)
+        , _use_count (0)
+	, _level (0)
 {
 	_analysed = false;
 	_timestamp = 0;
@@ -62,6 +65,8 @@ Source::Source (Session& s, const XMLNode& node)
 	, _type(DataType::AUDIO)
 	, _flags (Flag (Writable|CanRename))
 	, _timeline_position(0)
+        , _use_count (0)
+	, _level (0)
 {
 	_timestamp = 0;
 	_analysed = false;
@@ -75,11 +80,9 @@ Source::Source (Session& s, const XMLNode& node)
 
 Source::~Source ()
 {
-	DEBUG_TRACE (DEBUG::Destruction, string_compose ("Source %1 destructor\n", _name));
-	notify_callbacks ();
+	DEBUG_TRACE (DEBUG::Destruction, string_compose ("Source %1 destructor %2\n", _name, this));
 }
 
-
 void
 Source::fix_writable_flags ()
 {
@@ -97,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) {
@@ -109,7 +112,7 @@ Source::get_state ()
 }
 
 int
-Source::set_state (const XMLNode& node, int /*version*/)
+Source::set_state (const XMLNode& node, int version)
 {
 	const XMLProperty* prop;
 
@@ -119,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;
 	}
 
@@ -145,6 +146,16 @@ Source::set_state (const XMLNode& node, int /*version*/)
 		_flags = Flag (_flags | Destructive);
 	}
 
+	if (version < 3000) {
+		/* 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.
+		*/
+		if (!(_flags & Destructive)) {
+			_flags = Flag (_flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy|CanRename));
+		}
+	}
+
 	return 0;
 }
 
@@ -187,7 +198,7 @@ Source::load_transients (const string& path)
 		file >> val;
 
 		if (!file.fail()) {
-			nframes64_t frame = (nframes64_t) floor (val * _session.frame_rate());
+			framepos_t frame = (framepos_t) floor (val * _session.frame_rate());
 			transients.push_back (frame);
 		}
 	}
@@ -208,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);
@@ -239,10 +250,12 @@ Source::check_for_analysis_data_on_disk ()
 void
 Source::mark_for_remove ()
 {
-	// This operation is not allowed for sources for destructive tracks or embedded files.
-	// Fortunately mark_for_remove() is never called for embedded files. This function
-	// must be fixed if that ever happens.
-	if (_flags & Destructive) {
+	// 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?
+	 */
+
+	if ((_flags & Destructive)) {
 		return;
 	}
 
@@ -269,3 +282,30 @@ Source::set_allow_remove_if_empty (bool yn)
 	}
 }
 
+void
+Source::inc_use_count ()
+{
+        g_atomic_int_inc (&_use_count);
+}
+
+void
+Source::dec_use_count ()
+{
+#ifndef NDEBUG
+        gint oldval = g_atomic_int_exchange_and_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);
+#endif
+}
+
+bool
+Source::writable () const
+{
+        return (_flags & Writable) && _session.writable();
+}
+