diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2006-06-07 14:54:12 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2006-06-07 14:54:12 +0000 |
| commit | 9fdc36bac5fa1c004751c0dd42f9ff62b9d60814 (patch) | |
| tree | 34a2d26c5cadcbe5c31b424e3e50a34a4360d87b /libs/ardour/region.cc | |
| parent | 55ba7c46c60d3cc9938abc34252fa930f1c883cb (diff) | |
Merged timbyr's win32 branch. -r 547:566.
git-svn-id: svn://localhost/ardour2/trunk@567 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/region.cc')
| -rw-r--r-- | libs/ardour/region.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 91d5704db2..08df23146b 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -26,7 +26,7 @@ #include <sigc++/bind.h> #include <sigc++/class_slot.h> -#include <pbd/lockmonitor.h> +#include <glibmm/thread.h> #include <pbd/xml++.h> #include <ardour/region.h> @@ -178,7 +178,7 @@ Region::restore_and_return_flags (RegionState& state) Change what_changed = Change (0); { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); if (_start != state._start) { what_changed = Change (what_changed|StartChanged); @@ -947,7 +947,7 @@ Region::thaw (const string& why) Change what_changed = Change (0); { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); if (_frozen && --_frozen > 0) { return; @@ -978,7 +978,7 @@ void Region::send_change (Change what_changed) { { - LockMonitor lm (lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (lock); if (_frozen) { pending_changed = Change (pending_changed|what_changed); return; |