X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsource.cc;h=03039fea5baf5f9abc8205132e821f51fb4645ec;hb=f6d29abfc75c460b9e35717f2907e4e61bf38058;hp=55ce9f8bef2846d51c8822f444961105b285e56c;hpb=f4401c59284258c6aa56707da64e3da32756329f;p=ardour.git

diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index 55ce9f8bef..03039fea5b 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -19,8 +19,6 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
 #include <float.h>
 #include <cerrno>
 #include <ctime>
@@ -29,7 +27,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 +51,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 +64,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 +98,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) {
@@ -110,7 +110,7 @@ Source::get_state ()
 }
 
 int
-Source::set_state (const XMLNode& node, int /*version*/)
+Source::set_state (const XMLNode& node, int version)
 {
 	const XMLProperty* prop;
 
@@ -120,9 +120,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;
 	}
 
@@ -146,13 +144,23 @@ 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;
 }
 
 bool
 Source::has_been_analysed() const
 {
-	Glib::Mutex::Lock lm (_analysis_lock);
+	Glib::Threads::Mutex::Lock lm (_analysis_lock);
 	return _analysed;
 }
 
@@ -160,7 +168,7 @@ void
 Source::set_been_analysed (bool yn)
 {
 	{
-		Glib::Mutex::Lock lm (_analysis_lock);
+		Glib::Threads::Mutex::Lock lm (_analysis_lock);
 		_analysed = yn;
 	}
 
@@ -188,7 +196,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);
 		}
 	}
@@ -209,7 +217,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);
@@ -242,10 +250,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;
 	}
 
@@ -253,7 +261,7 @@ Source::mark_for_remove ()
 }
 
 void
-Source::set_timeline_position (int64_t pos)
+Source::set_timeline_position (framepos_t pos)
 {
 	_timeline_position = pos;
 }
@@ -272,3 +280,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_add (&_use_count, -1);
+        if (oldval <= 0) {
+                cerr << "Bad use dec for " << name() << endl;
+                abort ();
+        }
+        assert (oldval > 0);
+#else
+        g_atomic_int_add (&_use_count, -1);
+#endif
+}
+
+bool
+Source::writable () const
+{
+        return (_flags & Writable) && _session.writable();
+}
+