smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-30 08:53:08 +01:00
Code Issues Projects Releases Wiki Activity

Crapola - this is an experimental performance hack that must be reverted.

Browse source
This commit is contained in:
nick_m 2016-04-13 05:38:31 +10:00
parent c6d9d8193b
commit 4f7a4cd233
9 changed files with 88 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libs/ardour/playlist.cc
View file

@ -1822,6 +1822,7 @@ Playlist::regions_at (framepos_t frame)
for (RegionList::iterator i = rlist->begin(); i != rlist->end(); ) {
RegionList::iterator tmp = i;
++tmp;
if ((*i)->muted()) {
@ -2047,23 +2048,25 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
boost::shared_ptr<Region> r = (*i);
frameoffset_t distance;
const framepos_t first_frame = r->first_frame();
const framepos_t last_frame = r->last_frame();
if (r->first_frame() > frame) {
if (first_frame > frame) {
distance = r->first_frame() - frame;
distance = first_frame - frame;
if (distance < closest) {
ret = r->first_frame();
ret = first_frame;
closest = distance;
}
}
if (r->last_frame () > frame) {
if (last_frame > frame) {
distance = r->last_frame () - frame;
distance = last_frame - frame;
if (distance < closest) {
ret = r->last_frame ();
ret = last_frame;
closest = distance;
}
}
@ -2075,23 +2078,25 @@ Playlist::find_next_region (framepos_t frame, RegionPoint point, int dir)
boost::shared_ptr<Region> r = (*i);
frameoffset_t distance;
const framepos_t first_frame = r->first_frame();
const framepos_t last_frame = r->last_frame();
if (r->last_frame() < frame) {
if (last_frame < frame) {
distance = frame - r->last_frame();
distance = frame - last_frame;
if (distance < closest) {
ret = r->last_frame();
ret = last_frame;
closest = distance;
}
}
if (r->first_frame() < frame) {
if (first_frame < frame) {
distance = frame - r->first_frame();
distance = frame - first_frame;
if (distance < closest) {
ret = r->first_frame();
ret = first_frame;
closest = distance;
}
}
@ -2899,6 +2904,7 @@ Playlist::update_after_tempo_map_change ()
}
thaw ();
notify_contents_changed();
}
void

12
libs/canvas/text.cc
View file

@ -70,6 +70,10 @@ Text::~Text ()
void
Text::set (string const & text)
{
if (text == _text) {
return;
}
begin_change ();
_text = text;
@ -237,6 +241,10 @@ Text::compute_bounding_box () const
void
Text::set_alignment (Pango::Alignment alignment)
{
if (alignment == _alignment) {
return;
}
begin_change ();
_alignment = alignment;
@ -261,6 +269,10 @@ Text::set_font_description (Pango::FontDescription font_description)
void
Text::set_color (Color color)
{
if (color == _color) {
return;
}
begin_change ();
_color = color;