added mutable keyword to gints used in glib atomic operations to satisfy compiler...

[ardour.git] / libs / ardour / redirect.cc

diff --git a/libs/ardour/redirect.cc b/libs/ardour/redirect.cc
index d7673883631ba6118dcc0c252bc7643195e72358..746d2790e229f18c7fccb6dd8e0852df01449903 100644 (file)
--- a/libs/ardour/redirect.cc
+++ b/libs/ardour/redirect.cc
@@ -81,6 +81,12 @@ Redirect::clone (const Redirect& other)
        return 0;
 }
 
+void
+Redirect::set_sort_key (uint32_t key)
+{
+       _sort_key = key;
+}
+       
 void
 Redirect::set_placement (Placement p, void *src)
 {
@@ -120,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 ();
 
@@ -153,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()) {
@@ -262,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) {
@@ -273,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) {