Merging from trunk

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

diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index 7d479637e3e151f919f55ce6d520ef0b7ba37942..b2af52284e91bfa232e575cbcd69addc23fec91d 100644 (file)
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -36,6 +36,7 @@
 using namespace std;
 using namespace ARDOUR;
 using namespace sigc;
+using namespace PBD;
 
 Location::Location (const Location& other)
        : _name (other._name),
@@ -371,7 +372,7 @@ Locations::set_current (Location *loc, bool want_lock)
        int ret;
 
        if (want_lock) {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                ret = set_current_unlocked (loc);
        } else {
                ret = set_current_unlocked (loc);
@@ -399,7 +400,7 @@ void
 Locations::clear ()
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                LocationList::iterator tmp;
                for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
                        tmp = i;
@@ -424,7 +425,7 @@ void
 Locations::clear_markers ()
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                LocationList::iterator tmp;
 
                for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
@@ -448,7 +449,7 @@ void
 Locations::clear_ranges ()
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                LocationList::iterator tmp;
                
                for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
@@ -477,7 +478,7 @@ void
 Locations::add (Location *loc, bool make_current)
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                locations.push_back (loc);
 
                if (make_current) {
@@ -507,7 +508,7 @@ Locations::remove (Location *loc)
        }
 
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
 
                for (i = locations.begin(); i != locations.end(); ++i) {
                        if ((*i) == loc) {
@@ -547,7 +548,7 @@ Locations::get_state ()
 {
        XMLNode *node = new XMLNode ("Locations");
        LocationList::iterator iter;
-       LockMonitor lm (lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (lock);
        
        for (iter  = locations.begin(); iter != locations.end(); ++iter) {
                node->add_child_nocopy ((*iter)->get_state ());
@@ -570,7 +571,7 @@ Locations::set_state (const XMLNode& node)
        nlist = node.children();
        
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
 
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
                        Location *loc = new Location;
@@ -614,7 +615,7 @@ Locations::first_location_before (jack_nframes_t frame)
        LocationList locs;
 
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                locs = locations;
        }
 
@@ -638,7 +639,7 @@ Locations::first_location_after (jack_nframes_t frame)
        LocationList locs;
 
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                locs = locations;
        }
 
@@ -662,7 +663,7 @@ Locations::first_mark_before (jack_nframes_t frame)
        LocationList locs;
 
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+        Glib::Mutex::Lock lm (lock);
                locs = locations;
        }
 
@@ -699,7 +700,7 @@ Locations::first_mark_after (jack_nframes_t frame)
        LocationList locs;
 
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+        Glib::Mutex::Lock lm (lock);
                locs = locations;
        }
 
@@ -792,7 +793,7 @@ Change
 Locations::restore_state (StateManager::State& state) 
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                State* lstate = dynamic_cast<State*> (&state);
 
                locations = lstate->locations;
@@ -817,7 +818,7 @@ uint32_t
 Locations::num_range_markers () const
 {
        uint32_t cnt = 0;
-       LockMonitor lm (lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (lock);
        for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
                if ((*i)->is_range_marker()) {
                        ++cnt;