rather hacky fix for the change of the SyncSource > JACK enum to SyncSource > Engine

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

diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index d78dab00bb9a02cf3aab3b8beb9ab5db4f49c489..754e48cc25d1fbf71a2956c9e1250295b62bd71b 100644 (file)
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -118,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;
 
@@ -131,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);
@@ -222,21 +224,23 @@ 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:
-    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) {
@@ -245,7 +249,7 @@ public:
             }
 
         ~RegionWriteLock() {
-                Glib::RWLock::WriterLock::release ();
+                Glib::Threads::RWLock::WriterLock::release ();
                 if (block_notify) {
                         playlist->release_notifications ();
                 }
@@ -286,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;
@@ -332,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);
@@ -371,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 &);