region list displays actual playlist use count for each region, rather than a GUI-based count

git-svn-id: svn://localhost/ardour2/branches/3.0@7814 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 35 insertions, 0 deletions

diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 67638cf15e..2cc1f570f4 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -151,6 +151,7 @@ public:
         uint32_t                   count_regions_at (framepos_t);
 	RegionList*                regions_touched (framepos_t start, framepos_t end);
 	RegionList*                regions_to_read (framepos_t start, framepos_t end);
+	uint32_t                   region_use_count (boost::shared_ptr<Region>) const;
 	boost::shared_ptr<Region>  find_region (const PBD::ID&) const;
 	boost::shared_ptr<Region>  top_region_at (framepos_t frame);
 	boost::shared_ptr<Region>  top_unmuted_region_at (framepos_t frame);
diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h
index 4ca67bdee8..0a20c7b905 100644
--- a/libs/ardour/ardour/session_playlists.h
+++ b/libs/ardour/ardour/session_playlists.h
@@ -51,6 +51,7 @@ public:
 	boost::shared_ptr<Playlist> by_name (std::string name);
 	boost::shared_ptr<Playlist> by_id (const PBD::ID&);
 	uint32_t source_use_count (boost::shared_ptr<const Source> src) const;
+        uint32_t region_use_count (boost::shared_ptr<Region> region) const;
 	template<class T> void foreach (T *obj, void (T::*func)(boost::shared_ptr<Playlist>));
 	void get (std::vector<boost::shared_ptr<Playlist> >&);
 	void unassigned (std::list<boost::shared_ptr<Playlist> > & list);
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 334b3f163d..614c0f5e36 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -2712,6 +2712,21 @@ Playlist::find_region (const ID& id) const
 	return boost::shared_ptr<Region> ();
 }
 
+uint32_t
+Playlist::region_use_count (boost::shared_ptr<Region> r) const
+{
+	RegionLock rlock (const_cast<Playlist*> (this));
+        uint32_t cnt = 0;
+
+	for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
+		if ((*i) == r) {
+                        cnt++;
+		}
+	}
+
+	return cnt;
+}
+
 boost::shared_ptr<Region>
 Playlist::region_by_id (const ID& id) const
 {
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 4f18a300af..cda93d050f 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -4024,3 +4024,4 @@ Session::step_edit_status_change (bool yn)
         }
 }
 
+        
diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc
index b54faba97e..66b4b53b67 100644
--- a/libs/ardour/session_playlists.cc
+++ b/libs/ardour/session_playlists.cc
@@ -413,3 +413,20 @@ SessionPlaylists::find_crossfade (const PBD::ID& id)
 
 	return boost::shared_ptr<Crossfade> ();
 }
+
+uint32_t
+SessionPlaylists::region_use_count (boost::shared_ptr<Region> region) const
+{
+	Glib::Mutex::Lock lm (lock);
+        uint32_t cnt = 0;
+	
+	for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+                cnt += (*i)->region_use_count (region);
+	}
+
+	for (List::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) {
+                cnt += (*i)->region_use_count (region);
+	}
+
+	return cnt;
+}