From 6a67194735020dc6a6ad2b83e8dd46ede0dc4dd4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 23 Sep 2010 22:55:51 +0000 Subject: [PATCH] framecnt -> framepos for extents, as I think it makes slightly more sense. git-svn-id: svn://localhost/ardour2/branches/3.0@7836 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/playlist.h | 4 ++-- libs/ardour/playlist.cc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 2cc1f570f4..27acc674b6 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -118,7 +118,7 @@ public: bool hidden() const { return _hidden; } bool empty() const; uint32_t n_regions() const; - std::pair get_extent () const; + std::pair get_extent () const; layer_t top_layer() const; EditMode get_edit_mode() const { return _edit_mode; } @@ -340,7 +340,7 @@ public: void copy_regions (RegionList&) const; void partition_internal (framepos_t start, framepos_t end, bool cutting, RegionList& thawlist); - std::pair _get_extent() const; + std::pair _get_extent() const; boost::shared_ptr cut_copy (boost::shared_ptr (Playlist::*pmf)(framepos_t, framecnt_t, bool), std::list& ranges, bool result_is_hidden); diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 4dda4f5c52..119ad280fd 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -544,7 +544,7 @@ Playlist::notify_region_added (boost::shared_ptr r) /* the length change might not be true, but we have to act as though it could be. */ - + if (holding_state()) { pending_adds.insert (r); pending_contents_change = true; @@ -2308,20 +2308,20 @@ Playlist::n_regions() const return regions.size(); } -pair +pair Playlist::get_extent () const { RegionLock rlock (const_cast(this), false); return _get_extent (); } -pair +pair Playlist::_get_extent () const { - pair ext (max_framepos, 0); + pair ext (max_framepos, 0); for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) { - pair const e ((*i)->position(), (*i)->position() + (*i)->length()); + pair const e ((*i)->position(), (*i)->position() + (*i)->length()); if (e.first < ext.first) { ext.first = e.first; }