projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove panner altogether, if necessary, when setting up PannerUI. Also reset a mixer...
[ardour.git]
/
gtk2_ardour
/
tempo_lines.cc
diff --git
a/gtk2_ardour/tempo_lines.cc
b/gtk2_ardour/tempo_lines.cc
index 5b73c877acb53281493dec49aaa0f7ac848ab495..8fe877a27cca93258d8633a623ec66fef20cbf6d 100644
(file)
--- a/
gtk2_ardour/tempo_lines.cc
+++ b/
gtk2_ardour/tempo_lines.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2002-2007 Paul Davis
+ Copyright (C) 2002-2007 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-24,13
+24,14
@@
using namespace std;
using namespace std;
-#define MAX_CACHED_LINES
512
-
-TempoLines::TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group)
+#define MAX_CACHED_LINES
128
+
+TempoLines::TempoLines(ArdourCanvas::Canvas& canvas, ArdourCanvas::Group* group
, double screen_height
)
: _canvas(canvas)
, _group(group)
, _clean_left(DBL_MAX)
, _clean_right(0.0)
: _canvas(canvas)
, _group(group)
, _clean_left(DBL_MAX)
, _clean_right(0.0)
+ , _height(screen_height)
{
}
{
}
@@
-40,15
+41,15
@@
TempoLines::tempo_map_changed()
_clean_left = DBL_MAX;
_clean_right = 0.0;
_clean_left = DBL_MAX;
_clean_right = 0.0;
-
size_t d =
0;
+
double_t d = 1.
0;
// TODO: Dirty/slow, but 'needed' for zoom :(
// TODO: Dirty/slow, but 'needed' for zoom :(
- for (Lines::iterator i = _lines.begin(); i != _lines.end();
++d
) {
+ for (Lines::iterator i = _lines.begin(); i != _lines.end();
d += 1.0
) {
Lines::iterator next = i;
++next;
Lines::iterator next = i;
++next;
-
i->second->property_x1() = DBL_MAX
- d;
-
i->second->property_x2() = DBL_MAX
- d;
+
i->second->property_x1() =
- d;
+
i->second->property_x2() =
- d;
_lines.erase(i);
_lines.erase(i);
- _lines.insert(make_pair(
DBL_MAX
- d, i->second));
+ _lines.insert(make_pair(- d, i->second));
i = next;
}
}
i = next;
}
}
@@
-57,7
+58,7
@@
void
TempoLines::show ()
{
for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
TempoLines::show ()
{
for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
- i->second->show();
+
i->second->show();
}
}
}
}
@@
-65,7
+66,7
@@
void
TempoLines::hide ()
{
for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
TempoLines::hide ()
{
for (Lines::iterator i = _lines.begin(); i != _lines.end(); ++i) {
- i->second->hide();
+
i->second->hide();
}
}
}
}
@@
-76,16
+77,15
@@
TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
ArdourCanvas::SimpleLine *line = NULL;
gdouble xpos;
double who_cares;
ArdourCanvas::SimpleLine *line = NULL;
gdouble xpos;
double who_cares;
- double x1, x2, y1,
y2,
beat_density;
+ double x1, x2, y1, beat_density;
uint32_t beats = 0;
uint32_t bars = 0;
uint32_t color;
uint32_t beats = 0;
uint32_t bars = 0;
uint32_t color;
-
+
const size_t needed = points.size();
_canvas.get_scroll_region (x1, y1, x2, who_cares);
const size_t needed = points.size();
_canvas.get_scroll_region (x1, y1, x2, who_cares);
- _canvas.root()->get_bounds(who_cares, who_cares, who_cares, y2);
/* get the first bar spacing */
/* get the first bar spacing */
@@
-98,15
+98,16
@@
TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
if (beat_density > 4.0f) {
/* if the lines are too close together, they become useless */
if (beat_density > 4.0f) {
/* if the lines are too close together, they become useless */
+ tempo_map_changed();
return;
}
return;
}
- xpos = rint(((
nframes64
_t)(*i).frame) / (double)frames_per_unit);
+ xpos = rint(((
framepos
_t)(*i).frame) / (double)frames_per_unit);
const double needed_right = xpos;
i = points.begin();
const double needed_right = xpos;
i = points.begin();
-
- xpos = rint(((
nframes64
_t)(*i).frame) / (double)frames_per_unit);
+
+ xpos = rint(((
framepos
_t)(*i).frame) / (double)frames_per_unit);
const double needed_left = xpos;
Lines::iterator left = _lines.lower_bound(xpos); // first line >= xpos
const double needed_left = xpos;
Lines::iterator left = _lines.lower_bound(xpos); // first line >= xpos
@@
-115,7
+116,7
@@
TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
Lines::iterator li = left;
if (li != _lines.end())
line = li->second;
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) {
// 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) {
@@
-127,7
+128,7
@@
TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
bool inserted_last_time = true;
bool invalidated = false;
bool inserted_last_time = true;
bool invalidated = false;
-
+
for (i = points.begin(); i != points.end(); ++i) {
switch ((*i).type) {
for (i = points.begin(); i != points.end(); ++i) {
switch ((*i).type) {
@@
-143,23
+144,23
@@
TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
break; /* only draw beat lines if the gaps between beats are large. */
}
}
break; /* only draw beat lines if the gaps between beats are large. */
}
}
-
- xpos = rint(((
nframes64
_t)(*i).frame) / (double)frames_per_unit);
+
+ xpos = rint(((
framepos
_t)(*i).frame) / (double)frames_per_unit);
if (inserted_last_time && !_lines.empty()) {
li = _lines.lower_bound(xpos); // first line >= xpos
}
if (inserted_last_time && !_lines.empty()) {
li = _lines.lower_bound(xpos); // first line >= xpos
}
-
+
line = (li != _lines.end()) ? li->second : NULL;
assert(!line || line->property_x1() == li->first);
line = (li != _lines.end()) ? li->second : NULL;
assert(!line || line->property_x1() == li->first);
-
+
Lines::iterator next = li;
if (next != _lines.end())
++next;
exhausted = (next == _lines.end());
Lines::iterator next = li;
if (next != _lines.end())
++next;
exhausted = (next == _lines.end());
-
- // Hooray, line is perfect
+
+ // Hooray, line is perfect
if (line && line->property_x1() == xpos) {
if (li != _lines.end())
++li;
if (line && line->property_x1() == xpos) {
if (li != _lines.end())
++li;
@@
-171,7
+172,7
@@
TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
} else if (!exhausted) {
Lines::iterator steal = _lines.end();
--steal;
} else if (!exhausted) {
Lines::iterator steal = _lines.end();
--steal;
-
+
// Steal from the right
if (left->first > needed_left && li != steal && steal->first > needed_right) {
//cout << "*** STEALING FROM RIGHT" << endl;
// Steal from the right
if (left->first > needed_left && li != steal && steal->first > needed_right) {
//cout << "*** STEALING FROM RIGHT" << endl;
@@
-220,7
+221,8
@@
TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
line = new ArdourCanvas::SimpleLine (*_group);
line->property_x1() = xpos;
line->property_x2() = xpos;
line = new ArdourCanvas::SimpleLine (*_group);
line->property_x1() = xpos;
line->property_x2() = xpos;
- line->property_y2() = y2;
+ line->property_y1() = 0.0;
+ line->property_y2() = _height;
line->property_color_rgba() = color;
_lines.insert(make_pair(xpos, line));
inserted_last_time = true;
line->property_color_rgba() = color;
_lines.insert(make_pair(xpos, line));
inserted_last_time = true;
@@
-238,7
+240,7
@@
TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit
_lines.insert(make_pair(xpos, line));
inserted_last_time = true; // search next time
invalidated = true;
_lines.insert(make_pair(xpos, line));
inserted_last_time = true; // search next time
invalidated = true;
-
+
// Shift clean range right
_clean_left = max(_clean_left, steal->first);
_clean_right = max(_clean_right, xpos);
// Shift clean range right
_clean_left = max(_clean_left, steal->first);
_clean_right = max(_clean_right, xpos);