ardour/livetrax
13
0
Fork 0
Code

Bug fixes to find_next_region_boundary (), unless I'm missing something.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4362 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2008-12-31 18:43:38 +00:00
parent ca21a5ac7b
commit 538cf8609a
1 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libs/ardour/playlist.cc
View File

@ -266,7 +266,7 @@ Playlist::Playlist (Playlist& pl)
Playlist::~Playlist ()
{
{
{
RegionLock rl (this);
for (set<boost::shared_ptr<Region> >::iterator i = all_regions.begin(); i != all_regions.end(); ++i) {
@ -489,7 +489,7 @@ Playlist::flush_notifications ()
void
Playlist::add_region (boost::shared_ptr<Region> region, nframes_t position, float times)
{
{
RegionLock rlock (this);
times = fabs (times);
@ -1346,7 +1346,7 @@ Playlist::drop_regions ()
void
Playlist::clear (bool with_signals)
{
{
{
RegionLock rl (this);
for (
@ -1662,14 +1662,10 @@ Playlist::find_next_region_boundary (nframes64_t frame, int dir)
if (dir > 0) {
for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
boost::shared_ptr<Region> r = (*i);
nframes64_t distance;
nframes64_t end = r->position() + r->length();
bool reset;
reset = false;
if (r->first_frame() > frame) {
distance = r->first_frame() - frame;
@ -1677,24 +1673,18 @@ Playlist::find_next_region_boundary (nframes64_t frame, int dir)
if (distance < closest) {
ret = r->first_frame();
closest = distance;
reset = true;
}
}
if (end > frame) {
if (r->last_frame () > frame) {
distance = end - frame;
distance = r->last_frame () - frame;
if (distance < closest) {
ret = end;
ret = r->last_frame ();
closest = distance;
reset = true;
}
}
if (reset) {
break;
}
}
} else {
@ -1703,9 +1693,6 @@ Playlist::find_next_region_boundary (nframes64_t frame, int dir)
boost::shared_ptr<Region> r = (*i);
nframes64_t distance;
bool reset;
reset = false;
if (r->last_frame() < frame) {
@ -1714,23 +1701,18 @@ Playlist::find_next_region_boundary (nframes64_t frame, int dir)
if (distance < closest) {
ret = r->last_frame();
closest = distance;
reset = true;
}
}
if (r->first_frame() < frame) {
distance = frame - r->last_frame();
distance = frame - r->first_frame();
if (distance < closest) {
ret = r->first_frame();
closest = distance;
reset = true;
}
}
if (reset) {
break;
}
}
}
@ -1933,7 +1915,7 @@ Playlist::bump_name (string name, Session &session)
layer_t
Playlist::top_layer() const
{
RegionLock rlock (const_cast<Playlist *> (this));
RegionLock rlock (const_cast<Playlist *> (this));
layer_t top = 0;
for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {