on session-load: skip output-change-handler until IOs are restored

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

diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index a64ebdd727c5602420a6c828811fe6fe0b10e89c..754e48cc25d1fbf71a2956c9e1250295b62bd71b 100644 (file)
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -132,6 +132,7 @@ public:
        void remove_region_by_source (boost::shared_ptr<Source>);
        void get_equivalent_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >&);
        void get_region_list_equivalent_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >&);
+       void get_source_equivalent_regions (boost::shared_ptr<Region>, std::vector<boost::shared_ptr<Region> >&);
        void replace_region (boost::shared_ptr<Region> old, boost::shared_ptr<Region> newr, framepos_t pos);
        void split_region (boost::shared_ptr<Region>, framepos_t position);
        void split (framepos_t at);
@@ -230,16 +231,16 @@ public:
        friend class Session;
 
   protected:
-    class RegionReadLock : public Glib::RWLock::ReaderLock {
+    class RegionReadLock : public Glib::Threads::RWLock::ReaderLock {
     public:
-        RegionReadLock (Playlist *pl) : Glib::RWLock::ReaderLock (pl->region_lock) {}
+        RegionReadLock (Playlist *pl) : Glib::Threads::RWLock::ReaderLock (pl->region_lock) {}
         ~RegionReadLock() {}
     };
 
-    class RegionWriteLock : public Glib::RWLock::WriterLock {
+    class RegionWriteLock : public Glib::Threads::RWLock::WriterLock {
     public:
            RegionWriteLock (Playlist *pl, bool do_block_notify = true) 
-                    : Glib::RWLock::WriterLock (pl->region_lock)
+                    : Glib::Threads::RWLock::WriterLock (pl->region_lock)
                     , playlist (pl)
                     , block_notify (do_block_notify) {
                     if (block_notify) {
@@ -248,7 +249,7 @@ public:
             }
 
         ~RegionWriteLock() {
-                Glib::RWLock::WriterLock::release ();
+                Glib::Threads::RWLock::WriterLock::release ();
                 if (block_notify) {
                         playlist->release_notifications ();
                 }
@@ -336,7 +337,6 @@ public:
        void splice_locked (framepos_t at, framecnt_t distance, boost::shared_ptr<Region> exclude);
        void splice_unlocked (framepos_t at, framecnt_t distance, boost::shared_ptr<Region> exclude);
 
-       virtual void check_crossfades (Evoral::Range<framepos_t>) {}
        virtual void remove_dependents (boost::shared_ptr<Region> /*region*/) {}
 
        virtual XMLNode& state (bool);
@@ -375,7 +375,7 @@ public:
   private:
        friend class RegionReadLock;
        friend class RegionWriteLock;
-       mutable Glib::RWLock region_lock;
+       mutable Glib::Threads::RWLock region_lock;
 
   private:
        void setup_layering_indices (RegionList const &);