X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_export.cc;h=ddced9cc5f85f169169d036a6c2f25f11647747e;hb=481f7c39655afec832ac10430dd61a3bb464aa58;hp=677b2c12589f728f445a70595514ea3cb6d70560;hpb=2f53112e83ff46ed535696a940e0bd5258a4fe66;p=ardour.git

diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index 677b2c1258..ddced9cc5f 100644
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -37,7 +37,7 @@
 #include <sigc++/bind.h>
 
 #include <pbd/error.h>
-#include <pbd/lockmonitor.h>
+#include <glibmm/thread.h>
 
 #include <ardour/gdither.h>
 #include <ardour/timestamps.h>
@@ -47,14 +47,14 @@
 #include <ardour/sndfile_helpers.h>
 #include <ardour/port.h>
 #include <ardour/audioengine.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 #include <ardour/panner.h>
 
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
-//using namespace sigc;
+using namespace PBD;
 
 static int
 convert_spec_to_info (AudioExportSpecification& spec, SF_INFO& sfinfo)
@@ -485,7 +485,7 @@ Session::prepare_to_export (AudioExportSpecification& spec)
 	/* take everyone out of awrite to avoid disasters */
 
 	{
-		RWLockMonitor lm (route_lock, false, __LINE__, __FILE__);
+		Glib::RWLock::ReaderLock lm (route_lock);
 		for (RouteList::iterator i = routes.begin(); i != routes.end(); ++i) {
 			(*i)->protect_automation ();
 		}
@@ -494,8 +494,8 @@ Session::prepare_to_export (AudioExportSpecification& spec)
 	/* get everyone to the right position */
 
 	{
-		RWLockMonitor lm (diskstream_lock, false, __LINE__, __FILE__);
-		for (DiskStreamList::iterator i = diskstreams.begin(); i != diskstreams.end(); ++i) {
+		Glib::RWLock::ReaderLock lm (diskstream_lock);
+		for (AudioDiskstreamList::iterator i = audio_diskstreams.begin(); i != audio_diskstreams.end(); ++i) {
 			if ((*i)-> seek (spec.start_frame, true)) {
 				error << string_compose (_("%1: cannot seek to %2 for export"),
 						  (*i)->name(), spec.start_frame)
@@ -524,7 +524,7 @@ Session::prepare_to_export (AudioExportSpecification& spec)
 
 	set_transport_speed (1.0, false);
 	butler_transport_work ();
-	atomic_set (&butler_should_do_transport_work, 0);
+	g_atomic_int_set (&butler_should_do_transport_work, 0);
 	post_transport ();
 
 	/* we are ready to go ... */