projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
string fix up
[ardour.git]
/
libs
/
ardour
/
playlist.cc
diff --git
a/libs/ardour/playlist.cc
b/libs/ardour/playlist.cc
index c5d52f73450f29197c63556d03beea40537a11d1..47462a3575be3b19274698290d9dbf861f68a3d8 100644
(file)
--- a/
libs/ardour/playlist.cc
+++ b/
libs/ardour/playlist.cc
@@
-250,7
+250,7
@@
Playlist::Playlist (boost::shared_ptr<const Playlist> other, framepos_t start, f
plist.add (Properties::layer, region->layer());
plist.add (Properties::layering_index, region->layering_index());
plist.add (Properties::layer, region->layer());
plist.add (Properties::layering_index, region->layering_index());
- new_region = RegionFactory::
RegionFactory::
create (region, plist);
+ new_region = RegionFactory::create (region, plist);
add_region_internal (new_region, position);
}
add_region_internal (new_region, position);
}
@@
-284,7
+284,7
@@
Playlist::copy_regions (RegionList& newlist) const
RegionReadLock rlock (const_cast<Playlist *> (this));
for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
RegionReadLock rlock (const_cast<Playlist *> (this));
for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
- newlist.push_back (RegionFactory::
RegionFactory::
create (*i, true));
+ newlist.push_back (RegionFactory::create (*i, true));
}
}
}
}
@@
-1997,11
+1997,11
@@
Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
freeze ();
/* add the added regions */
freeze ();
/* add the added regions */
- for (RegionListProperty::ChangeContainer::iterator i = change.added.begin(); i != change.added.end(); ++i) {
+ for (RegionListProperty::ChangeContainer::
const_
iterator i = change.added.begin(); i != change.added.end(); ++i) {
add_region_internal ((*i), (*i)->position());
}
/* remove the removed regions */
add_region_internal ((*i), (*i)->position());
}
/* remove the removed regions */
- for (RegionListProperty::ChangeContainer::iterator i = change.removed.begin(); i != change.removed.end(); ++i) {
+ for (RegionListProperty::ChangeContainer::
const_
iterator i = change.removed.begin(); i != change.removed.end(); ++i) {
remove_region (*i);
}
remove_region (*i);
}
@@
-2488,7
+2488,7
@@
Playlist::uses_source (boost::shared_ptr<const Source> src) const
{
RegionReadLock rlock (const_cast<Playlist*> (this));
{
RegionReadLock rlock (const_cast<Playlist*> (this));
- for (set<boost::shared_ptr<Region> >::iterator r = all_regions.begin(); r != all_regions.end(); ++r) {
+ for (set<boost::shared_ptr<Region> >::
const_
iterator r = all_regions.begin(); r != all_regions.end(); ++r) {
if ((*r)->uses_source (src)) {
return true;
}
if ((*r)->uses_source (src)) {
return true;
}
@@
-2533,7
+2533,7
@@
Playlist::region_by_id (const ID& id) const
{
/* searches all regions ever added to this playlist */
{
/* searches all regions ever added to this playlist */
- for (set<boost::shared_ptr<Region> >::iterator i = all_regions.begin(); i != all_regions.end(); ++i) {
+ for (set<boost::shared_ptr<Region> >::
const_
iterator i = all_regions.begin(); i != all_regions.end(); ++i) {
if ((*i)->id() == id) {
return *i;
}
if ((*i)->id() == id) {
return *i;
}