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/redirect.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/redirect.cc')
| -rw-r--r-- | libs/ardour/redirect.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/redirect.cc b/libs/ardour/redirect.cc index 403e6edddd..746d2790e2 100644 --- a/libs/ardour/redirect.cc +++ b/libs/ardour/redirect.cc @@ -126,7 +126,7 @@ Redirect::load_automation (string path) return 1; } - LockMonitor lm (_automation_lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (_automation_lock); set<uint32_t> tosave; parameter_automation.clear (); @@ -159,7 +159,7 @@ Redirect::load_automation (string path) int Redirect::save_automation (string path) { - LockMonitor lm (_automation_lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (_automation_lock); string fullpath; if (parameter_automation.empty()) { @@ -268,7 +268,7 @@ Redirect::state (bool full_state) void Redirect::what_has_automation (set<uint32_t>& s) const { - LockMonitor lm (_automation_lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (_automation_lock); map<uint32_t,AutomationList*>::const_iterator li; for (li = parameter_automation.begin(); li != parameter_automation.end(); ++li) { @@ -279,7 +279,7 @@ Redirect::what_has_automation (set<uint32_t>& s) const void Redirect::what_has_visible_automation (set<uint32_t>& s) const { - LockMonitor lm (_automation_lock, __LINE__, __FILE__); + Glib::Mutex::Lock lm (_automation_lock); set<uint32_t>::const_iterator li; for (li = visible_parameter_automation.begin(); li != visible_parameter_automation.end(); ++li) { |