Merged with trunk R874.

[ardour.git] / libs / ardour / ardour / tempo.h

diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index a365717417c834dd24ffae08b5676f5356c358e9..9111aeba681428d88477deac06ef6fa85f6d57a8 100644 (file)
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -201,7 +201,7 @@ class TempoMap : public StateManager, public PBD::StatefulDestructible
        typedef vector<BBTPoint> BBTPointList;
        
        template<class T> void apply_with_metrics (T& obj, void (T::*method)(const Metrics&)) {
-               Glib::Mutex::Lock lm (lock);
+               Glib::RWLock::ReaderLock lm (lock);
                (obj.*method)(*metrics);
        }
 
@@ -289,7 +289,7 @@ class TempoMap : public StateManager, public PBD::StatefulDestructible
        jack_nframes_t      last_bbt_when;
        bool                last_bbt_valid;
        BBT_Time            last_bbt;
-       mutable Glib::Mutex   lock;
+       mutable Glib::RWLock    lock;
        
        void timestamp_metrics ();