smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

consistent API name for region-list

Browse source
This commit is contained in:
Robin Gareus 2016-06-08 15:20:20 +02:00
parent aeed54ed91
commit fce6ac0ef6
5 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/playlist.h
View file

@ -164,7 +164,8 @@ public:
boost::shared_ptr<Playlist> copy (std::list<AudioRange>&, bool result_is_hidden = true); boost::shared_ptr<Playlist> copy (std::list<AudioRange>&, bool result_is_hidden = true);
int paste (boost::shared_ptr<Playlist>, framepos_t position, float times); int paste (boost::shared_ptr<Playlist>, framepos_t position, float times);
const RegionListProperty& region_list () const { return regions; } const RegionListProperty& region_list_property () const { return regions; }
boost::shared_ptr<RegionList> region_list();
boost::shared_ptr<RegionList> regions_at (framepos_t frame); boost::shared_ptr<RegionList> regions_at (framepos_t frame);
uint32_t count_regions_at (framepos_t) const; uint32_t count_regions_at (framepos_t) const;

4
libs/ardour/audio_diskstream.cc
View file

@ -359,7 +359,7 @@ AudioDiskstream::use_destructive_playlist ()
boost::shared_ptr<Region> rp; boost::shared_ptr<Region> rp;
{ {
const RegionList& rl (_playlist->region_list().rlist()); const RegionList& rl (_playlist->region_list_property().rlist());
if (rl.size() > 0) { if (rl.size() > 0) {
assert((rl.size() == 1)); assert((rl.size() == 1));
rp = rl.front(); rp = rl.front();
@ -2435,7 +2435,7 @@ AudioDiskstream::can_become_destructive (bool& requires_bounce) const
boost::shared_ptr<Region> first; boost::shared_ptr<Region> first;
{ {
const RegionList& rl (_playlist->region_list().rlist()); const RegionList& rl (_playlist->region_list_property().rlist());
assert((rl.size() == 1)); assert((rl.size() == 1));
first = rl.front(); first = rl.front();

4
libs/ardour/audio_playlist_source.cc
View file

@ -188,7 +188,7 @@ AudioPlaylistSource::n_channels () const
return 1; return 1;
} }
boost::shared_ptr<Region> r = _playlist->region_list().front (); boost::shared_ptr<Region> r = _playlist->region_list_property().front ();
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r); boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
return ar->audio_source()->n_channels (); return ar->audio_source()->n_channels ();
@ -203,7 +203,7 @@ AudioPlaylistSource::sample_rate () const
_session.frame_rate (); _session.frame_rate ();
} }
boost::shared_ptr<Region> r = _playlist->region_list().front (); boost::shared_ptr<Region> r = _playlist->region_list_property().front ();
boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r); boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
return ar->audio_source()->sample_rate (); return ar->audio_source()->sample_rate ();

2
libs/ardour/luabindings.cc
View file

@ -572,7 +572,7 @@ LuaBindings::common (lua_State* L)
.addFunction ("data_type", &Playlist::data_type) .addFunction ("data_type", &Playlist::data_type)
.addFunction ("n_regions", &Playlist::n_regions) .addFunction ("n_regions", &Playlist::n_regions)
//.addFunction ("get_extent", &Playlist::get_extent) // pair<framepos_t, framepos_t> //.addFunction ("get_extent", &Playlist::get_extent) // pair<framepos_t, framepos_t>
//.addFunction ("region_list", &Playlist::region_list) // RegionListProperty& .addFunction ("region_list", &Playlist::region_list)
.addFunction ("add_region", &Playlist::add_region) .addFunction ("add_region", &Playlist::add_region)
.addFunction ("remove_region", &Playlist::remove_region) .addFunction ("remove_region", &Playlist::remove_region)
.addFunction ("regions_at", &Playlist::regions_at) .addFunction ("regions_at", &Playlist::regions_at)

9
libs/ardour/playlist.cc
View file

@ -1773,6 +1773,13 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar
FINDING THINGS FINDING THINGS
**********************************************************************/ **********************************************************************/
boost::shared_ptr<RegionList>
Playlist::region_list() {
RegionReadLock rlock (this);
boost::shared_ptr<RegionList> rlist (new RegionList (regions.rlist ()));
return rlist;
}
boost::shared_ptr<RegionList> boost::shared_ptr<RegionList>
Playlist::regions_at (framepos_t frame) Playlist::regions_at (framepos_t frame)
{ {
@ -3132,7 +3139,7 @@ Playlist::uncombine (boost::shared_ptr<Region> target)
// (2) get all the original regions // (2) get all the original regions
const RegionList& rl (pl->region_list().rlist()); const RegionList& rl (pl->region_list_property().rlist());
RegionFactory::CompoundAssociations& cassocs (RegionFactory::compound_associations()); RegionFactory::CompoundAssociations& cassocs (RegionFactory::compound_associations());
frameoffset_t move_offset = 0; frameoffset_t move_offset = 0;