diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index f21c1343fc..6c67b4de80 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -152,8 +152,6 @@ public: void add_region (boost::shared_ptr, samplepos_t position, float times = 1, bool auto_partition = false, int32_t sub_num = 0, double quarter_note = 0.0, bool for_music = false); void remove_region (boost::shared_ptr); void get_equivalent_regions (boost::shared_ptr, std::vector >&); - void get_region_list_equivalent_regions (boost::shared_ptr, std::vector >&); - void get_source_equivalent_regions (boost::shared_ptr, std::vector >&); void replace_region (boost::shared_ptr old, boost::shared_ptr newr, samplepos_t pos); void split_region (boost::shared_ptr, const MusicSample& position); void split (const MusicSample& at); diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 13ef065b70..2ad1be7a8d 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -214,7 +214,6 @@ public: bool overlap_equivalent (boost::shared_ptr) const; bool enclosed_equivalent (boost::shared_ptr) const; bool layer_and_time_equivalent (boost::shared_ptr) const; - bool region_list_equivalent (boost::shared_ptr) const; bool source_equivalent (boost::shared_ptr) const; bool any_source_equivalent (boost::shared_ptr) const; bool uses_source (boost::shared_ptr, bool shallow = false) const; diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 14bbed0203..49d5f2c619 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -951,26 +951,6 @@ Playlist::get_equivalent_regions (boost::shared_ptr other, vector other, vector >& results) -{ - for (RegionList::iterator i = regions.begin (); i != regions.end (); ++i) { - if ((*i) && (*i)->region_list_equivalent (other)) { - results.push_back (*i); - } - } -} - -void -Playlist::get_source_equivalent_regions (boost::shared_ptr other, vector >& results) -{ - for (RegionList::iterator i = regions.begin (); i != regions.end (); ++i) { - if ((*i) && (*i)->any_source_equivalent (other)) { - results.push_back (*i); - } - } -} - void Playlist::partition (samplepos_t start, samplepos_t end, bool cut) { diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index bf09ea14f8..bda7821163 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -1549,12 +1549,6 @@ Region::size_equivalent (boost::shared_ptr other) const _length == other->_length; } -bool -Region::region_list_equivalent (boost::shared_ptr other) const -{ - return size_equivalent (other) && source_equivalent (other) && _name == other->_name; -} - void Region::source_deleted (boost::weak_ptr) { diff --git a/libs/ardour/session_playlists.cc b/libs/ardour/session_playlists.cc index bbcece4d02..122bc8a0f4 100644 --- a/libs/ardour/session_playlists.cc +++ b/libs/ardour/session_playlists.cc @@ -336,13 +336,6 @@ SessionPlaylists::destroy_region (boost::shared_ptr r) } } -void -SessionPlaylists::find_equivalent_playlist_regions (boost::shared_ptr region, vector >& result) -{ - for (List::iterator i = playlists.begin(); i != playlists.end(); ++i) - (*i)->get_region_list_equivalent_regions (region, result); -} - /** Return the number of playlists (not regions) that contain @a src * Important: this counts usage in both used and not-used playlists. */