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 9a76ec56ade89003d1432da26781c00f2e8b38a8..754e48cc25d1fbf71a2956c9e1250295b62bd71b 100644 (file)
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -31,9 +31,6 @@
 #include <sys/stat.h>
 
 #include <glib.h>
-#ifdef HAVE_GLIB_THREADS_RECMUTEX
-#include <glibmm/threads.h>
-#endif
 
 #include "pbd/undo.h"
 #include "pbd/stateful.h"
@@ -121,6 +118,7 @@ public:
        bool hidden() const { return _hidden; }
        bool empty() const;
        uint32_t n_regions() const;
+       bool all_regions_empty() const;
        std::pair<framepos_t, framepos_t> get_extent () const;
        layer_t top_layer() const;
 
@@ -134,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);
@@ -225,30 +224,39 @@ public:
        uint32_t combine_ops() const { return _combine_ops; }
 
        void set_layer (boost::shared_ptr<Region>, double);
+
+       void set_capture_insertion_in_progress (bool yn);
        
   protected:
        friend class Session;
 
   protected:
-       struct RegionLock {
-               RegionLock (Playlist *pl, bool do_block_notify = true) : playlist (pl), block_notify (do_block_notify) {
-                       if (!playlist->region_lock.trylock()) {
-                               std::cerr << "Lock for playlist " << pl->name() << " already held\n";
-                               PBD::stacktrace (std::cerr, 10);
-                       }       
-                       if (block_notify) {
-                               playlist->delay_notifications();
-                       }
-               }
-               ~RegionLock() {
-                       playlist->region_lock.unlock();
-                       if (block_notify) {
-                               playlist->release_notifications ();
-                       }
-               }
-               Playlist *playlist;
-               bool block_notify;
-       };
+    class RegionReadLock : public Glib::Threads::RWLock::ReaderLock {
+    public:
+        RegionReadLock (Playlist *pl) : Glib::Threads::RWLock::ReaderLock (pl->region_lock) {}
+        ~RegionReadLock() {}
+    };
+
+    class RegionWriteLock : public Glib::Threads::RWLock::WriterLock {
+    public:
+           RegionWriteLock (Playlist *pl, bool do_block_notify = true) 
+                    : Glib::Threads::RWLock::WriterLock (pl->region_lock)
+                    , playlist (pl)
+                    , block_notify (do_block_notify) {
+                    if (block_notify) {
+                            playlist->delay_notifications();
+                    }
+            }
+
+        ~RegionWriteLock() {
+                Glib::Threads::RWLock::WriterLock::release ();
+                if (block_notify) {
+                        playlist->release_notifications ();
+                }
+        }
+        Playlist *playlist;
+        bool block_notify;
+    };
 
        RegionListProperty   regions;  /* the current list of regions in the playlist */
        std::set<boost::shared_ptr<Region> > all_regions; /* all regions ever added to this playlist */
@@ -282,6 +290,7 @@ public:
        bool             in_flush;
        bool             in_partition;
        bool            _frozen;
+       bool            _capture_insertion_underway;
        uint32_t         subcnt;
        PBD::ID         _orig_track_id;
        uint32_t        _combine_ops;
@@ -328,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);
@@ -365,8 +373,9 @@ public:
        virtual void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>) {}
 
   private:
-       friend class RegionLock;
-       mutable Glib::Mutex region_lock;
+       friend class RegionReadLock;
+       friend class RegionWriteLock;
+       mutable Glib::Threads::RWLock region_lock;
 
   private:
        void setup_layering_indices (RegionList const &);