X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fsource.cc;h=aaa50ff2973aaaa79039011f7c3e043c14dc247a;hb=8882ef79d3b4a536daa00e3a20e2c50e0c49bbe8;hp=e9e3b0014216401193dc6f64aa56761504f5d029;hpb=cc7d4db5fe9132c38b919ab073b91d442abad9b6;p=ardour.git

diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index e9e3b00142..aaa50ff297 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -19,17 +19,15 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
 #include <float.h>
 #include <cerrno>
 #include <ctime>
 #include <cmath>
 #include <iomanip>
 #include <algorithm>
-#include <fstream>
 
-#include <glibmm/thread.h>
+#include "pbd/gstdio_compat.h"
+#include <glibmm/threads.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include "pbd/xml++.h"
@@ -37,6 +35,7 @@
 #include "pbd/enumwriter.h"
 
 #include "ardour/debug.h"
+#include "ardour/profile.h"
 #include "ardour/session.h"
 #include "ardour/source.h"
 #include "ardour/transient_detector.h"
@@ -146,6 +145,11 @@ Source::set_state (const XMLNode& node, int version)
 		_flags = Flag (_flags | Destructive);
 	}
 
+	if (Profile->get_trx() && (_flags & Destructive)) {
+		error << string_compose (_("%1: this session uses destructive tracks, which are not supported"), PROGRAM_NAME) << endmsg;
+		return -1;
+	}
+
 	if (version < 3000) {
 		/* a source with an XML node must necessarily already exist,
 		   and therefore cannot be removable/writable etc. etc.; 2.X
@@ -162,48 +166,48 @@ 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;
 }
 
 void
 Source::set_been_analysed (bool yn)
 {
-	{
-		Glib::Mutex::Lock lm (_analysis_lock);
-		_analysed = yn;
-	}
-
 	if (yn) {
-		load_transients (get_transients_path());
-		AnalysisChanged(); // EMIT SIGNAL
+		if (0 == load_transients (get_transients_path())) {
+			yn = false;
+		}
 	}
+	if (yn != _analysed) {
+		Glib::Threads::Mutex::Lock lm (_analysis_lock);
+		_analysed = yn;
+	}
+	AnalysisChanged(); // EMIT SIGNAL
 }
 
 int
 Source::load_transients (const string& path)
 {
-	ifstream file (path.c_str());
-
-	if (!file) {
+	int rv = 0;
+	FILE *tf;
+	if (! (tf = g_fopen (path.c_str (), "rb"))) {
 		return -1;
 	}
 
 	transients.clear ();
-
-	stringstream strstr;
-	double val;
-
-	while (file.good()) {
-		file >> val;
-
-		if (!file.fail()) {
-			framepos_t frame = (framepos_t) floor (val * _session.frame_rate());
-			transients.push_back (frame);
+	while (!feof (tf) && !ferror(tf)) {
+		double val;
+		if (1 != fscanf (tf, "%lf", &val)) {
+			rv = -1;
+			break;
 		}
+
+		framepos_t frame = (framepos_t) floor (val * _session.frame_rate());
+		transients.push_back (frame);
 	}
 
-	return 0;
+	::fclose (tf);
+	return rv;
 }
 
 string
@@ -292,14 +296,14 @@ 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);
+        g_atomic_int_add (&_use_count, -1);
 #endif
 }