diff options
| author | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-13 07:27:52 +0000 |
| commit | 868f557f2612903f72614a2b3a317c7a528188d1 (patch) | |
| tree | 979151d7bbb25fb633adb662d386ef4df0d46158 /libs/ardour/session_export.cc | |
| parent | edc7a146f5f3c9facd97b3e8951e1607b5e9ec31 (diff) | |
Merged with trunk (painfully)
git-svn-id: svn://localhost/ardour2/branches/midi@581 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_export.cc')
| -rw-r--r-- | libs/ardour/session_export.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc index 677b2c1258..183b6df237 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> @@ -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,7 +494,7 @@ Session::prepare_to_export (AudioExportSpecification& spec) /* get everyone to the right position */ { - RWLockMonitor lm (diskstream_lock, false, __LINE__, __FILE__); + Glib::RWLock::ReaderLock lm (diskstream_lock); for (DiskStreamList::iterator i = diskstreams.begin(); i != diskstreams.end(); ++i) { if ((*i)-> seek (spec.start_frame, true)) { error << string_compose (_("%1: cannot seek to %2 for export"), @@ -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 ... */ |