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

remove probably premature-or-no-longer-necessary optimization of measure line drawing

Browse source
This commit is contained in:
Paul Davis 2013-04-21 15:06:09 -04:00
parent eb23bd8102
commit 0a2a876248
2 changed files with 33 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

176
gtk2_ardour/tempo_lines.cc
View file

@ -25,42 +25,30 @@
using namespace std; using namespace std;
#define MAX_CACHED_LINES 128
TempoLines::TempoLines (ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height) TempoLines::TempoLines (ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height)
: _canvas (canvas) : _canvas (canvas)
, _group(group) , _group (group)
, _clean_left(DBL_MAX) , _height (screen_height)
, _clean_right(0.0)
, _height(screen_height)
{ {
} }
void void
TempoLines::tempo_map_changed() TempoLines::tempo_map_changed()
{ {
_clean_left = DBL_MAX; /* remove all lines from the group, put them in the cache (to avoid
_clean_right = 0.0; * unnecessary object destruction+construction later), and clear _lines
*/
double_t d = 1.0; _group->clear ();
// TODO: Dirty/slow, but 'needed' for zoom :( _cache.insert (_cache.end(), _lines.begin(), _lines.end());
for (Lines::iterator i = _lines.begin(); i != _lines.end(); d += 1.0) { _lines.clear ();
Lines::iterator next = i;
++next;
i->second->set_x0 (-d);
i->second->set_x1 (-d);
ArdourCanvas::Line* f = i->second;
_lines.erase(i);
_lines.insert(make_pair(- d, f));
i = next;
}
} }
void void
TempoLines::show () TempoLines::show ()
{ {
for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) { for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
i->second->show(); (*i)->show();
} }
} }
@ -68,7 +56,7 @@ void
TempoLines::hide () TempoLines::hide ()
{ {
for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) { for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
i->second->hide(); (*i)->hide();
} }
} }
@ -78,18 +66,13 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
double samples_per_pixel) double samples_per_pixel)
{ {
ARDOUR::TempoMap::BBTPointList::const_iterator i; ARDOUR::TempoMap::BBTPointList::const_iterator i;
ArdourCanvas::Line *line = 0; ArdourCanvas::Rect const visible = _canvas.visible_area ();
gdouble xpos;
double beat_density; double beat_density;
uint32_t beats = 0; uint32_t beats = 0;
uint32_t bars = 0; uint32_t bars = 0;
uint32_t color; uint32_t color;
const size_t needed = distance (begin, end);
ArdourCanvas::Rect const visible = _canvas.visible_area ();
/* get the first bar spacing */ /* get the first bar spacing */
i = end; i = end;
@ -105,31 +88,7 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
return; return;
} }
xpos = rint(((framepos_t)(*i).frame) / (double)samples_per_pixel); tempo_map_changed ();
const double needed_right = xpos;
i = begin;
xpos = rint(((framepos_t)(*i).frame) / (double)samples_per_pixel);
const double needed_left = xpos;
Lines::iterator left = _lines.lower_bound(xpos); // first line >= xpos
bool exhausted = (left == _lines.end());
Lines::iterator li = left;
if (li != _lines.end())
line = li->second;
// Tempo map hasn't changed and we're entirely within a clean
// range, don't need to do anything. Yay.
if (needed_left >= _clean_left && needed_right <= _clean_right) {
// cerr << endl << "*** LINE CACHE PERFECT HIT" << endl;
return;
}
// cerr << endl << "*** LINE CACHE MISS" << endl;
bool invalidated = false;
for (i = begin; i != end; ++i) { for (i = begin; i != end; ++i) {
@ -142,109 +101,24 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBeat(); color = ARDOUR_UI::config()->get_canvasvar_MeasureLineBeat();
} }
xpos = rint(((framepos_t)(*i).frame) / (double)samples_per_pixel); ArdourCanvas::Coord xpos = rint(((framepos_t)(*i).frame) / (double)samples_per_pixel);
li = _lines.lower_bound(xpos); // first line >= xpos ArdourCanvas::Line* line;
line = (li != _lines.end()) ? li->second : 0; if (!_cache.empty()) {
assert(!line || line->x0() == li->first); line = _cache.back ();
_cache.pop_back ();
Lines::iterator next = li; line->reparent (_group);
if (next != _lines.end())
++next;
exhausted = (next == _lines.end());
// Hooray, line is perfect
if (line && line->x0() == xpos) {
if (li != _lines.end())
++li;
line->set_outline_color (color);
// Use existing line, moving if necessary
} else if (!exhausted) {
Lines::iterator steal = _lines.end();
--steal;
// Steal from the right
if (left->first > needed_left && li != steal && steal->first > needed_right) {
// cerr << "*** STEALING FROM RIGHT" << endl;
double const x = steal->first;
line = steal->second;
_lines.erase(steal);
line->set_x0 (xpos);
line->set_x1 (xpos);
line->set_outline_color (color);
_lines.insert(make_pair(xpos, line));
invalidated = true;
// Shift clean range left
_clean_left = min(_clean_left, xpos);
_clean_right = min(_clean_right, x);
// Move this line to where we need it
} else {
Lines::iterator existing = _lines.find(xpos);
if (existing != _lines.end()) {
//cout << "*** EXISTING LINE" << endl;
li = existing;
li->second->set_outline_color (color);
} else {
//cout << "*** MOVING LINE" << endl;
const double x1 = line->x0();
const bool was_clean = x1 >= _clean_left && x1 <= _clean_right;
invalidated = invalidated || was_clean;
// Invalidate clean portion (XXX: too harsh?)
_clean_left = needed_left;
_clean_right = needed_right;
_lines.erase(li);
line->set_outline_color (color);
line->set_x0 (xpos);
line->set_x1 (xpos);
_lines.insert(make_pair(xpos, line));
}
}
// Create a new line
} else if (_lines.size() < needed || _lines.size() < MAX_CACHED_LINES) {
// cerr << "*** CREATING LINE" << endl;
/* if we already have a line there ... don't sweat it */
if (_lines.find (xpos) == _lines.end()) {
line = new ArdourCanvas::Line (_group);
line->set_x0 (xpos);
line->set_x1 (xpos);
line->set_y0 (0.0);
line->set_y1 (ArdourCanvas::COORD_MAX);
line->set_outline_color (color);
_lines.insert(make_pair(xpos, line));
}
// Steal from the left
} else { } else {
// cerr << "*** STEALING FROM LEFT" << endl; line = new ArdourCanvas::Line (_group);
if (_lines.find (xpos) == _lines.end()) {
Lines::iterator steal = _lines.begin();
double const x = steal->first;
line = steal->second;
_lines.erase(steal);
line->set_outline_color (color);
line->set_x0 (xpos);
line->set_x1 (xpos);
_lines.insert(make_pair(xpos, line));
invalidated = true;
// Shift clean range right
_clean_left = max(_clean_left, x);
_clean_right = max(_clean_right, xpos);
}
} }
}
// Extend range to what we've 'fixed' line->set_x0 (xpos);
if (!invalidated) { line->set_x1 (xpos);
_clean_left = min(_clean_left, needed_left); line->set_y0 (0.0);
_clean_right = max(_clean_right, needed_right); line->set_y1 (_height);
line->set_outline_color (color);
line->show ();
} }
} }

22
gtk2_ardour/tempo_lines.h
View file

@ -19,39 +19,29 @@
#ifndef __ardour_tempo_lines_h__ #ifndef __ardour_tempo_lines_h__
#define __ardour_tempo_lines_h__ #define __ardour_tempo_lines_h__
#include <map> #include <list>
#include <boost/pool/pool.hpp>
#include <boost/pool/pool_alloc.hpp>
#include "ardour/tempo.h" #include "ardour/tempo.h"
typedef boost::fast_pool_allocator<
std::pair<const double, ArdourCanvas::Line*>,
boost::default_user_allocator_new_delete,
boost::details::pool::null_mutex,
8192>
MapAllocator;
class TempoLines { class TempoLines {
public: public:
TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height); TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group, double screen_height);
void tempo_map_changed(); void tempo_map_changed();
void draw(const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, void draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
const ARDOUR::TempoMap::BBTPointList::const_iterator& end, const ARDOUR::TempoMap::BBTPointList::const_iterator& end,
double frames_per_unit); double frames_per_unit);
void show(); void show();
void hide(); void hide();
private: private:
typedef std::map<double, ArdourCanvas::Line*, std::less<double>, MapAllocator> Lines; typedef std::list<ArdourCanvas::Line*> Lines;
Lines _lines; Lines _lines;
Lines _cache;
ArdourCanvas::Canvas& _canvas; ArdourCanvas::Canvas& _canvas;
ArdourCanvas::Group* _group; ArdourCanvas::Group* _group;
double _clean_left;
double _clean_right;
double _height; double _height;
}; };