diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-16 13:06:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-16 13:06:55 +0000 |
| commit | 43798a7c259660b53cd3edc7feca17cf41faf13b (patch) | |
| tree | db0b5ea102b3636680b9a9ecfaf90a1f3f0be2be /libs/ardour/ardour | |
| parent | 0a9cef7720ed9bd83442d284d18831437b80a482 (diff) | |
sane naming scheme for combined regions; fix deadlock when nesting to more than one level
git-svn-id: svn://localhost/ardour2/branches/3.0@9519 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audio_playlist_source.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/audio_playlist_source.h b/libs/ardour/ardour/audio_playlist_source.h index 868e8c743e..d6047de1fc 100644 --- a/libs/ardour/ardour/audio_playlist_source.h +++ b/libs/ardour/ardour/audio_playlist_source.h @@ -65,7 +65,6 @@ class AudioPlaylistSource : public AudioSource { framecnt_t _playlist_length; uint32_t _playlist_channel; std::string _peak_path; - uint32_t _level; /* how recursive is this? */ }; } /* namespace */ diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index e23ba264fc..3234e4c108 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -151,7 +151,8 @@ public: const RegionListProperty& region_list () const { return regions; } RegionList* regions_at (framepos_t frame); - uint32_t count_regions_at (framepos_t); + uint32_t count_regions_at (framepos_t) const; + uint32_t count_joined_regions () const; 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; |