along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cstdio> // for sprintf, grrr
return;
}
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::tempo_map_changed), ignored));
+ ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
+
+ redisplay_tempo (false); // redraw rulers and measures
+ session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
+}
+
+/**
+ * This code was originally in tempo_map_changed, but this is called every time the canvas scrolls horizontally.
+ * That's why this is moved in here. The new tempo_map_changed is called when the ARDOUR::TempoMap actually changed.
+ */
+void
+Editor::redisplay_tempo (bool immediate_redraw)
+{
+ if (!session) {
+ return;
+ }
BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
current_bbt_points = 0;
}
- redisplay_tempo ();
-}
+ if (immediate_redraw) {
-void
-Editor::redisplay_tempo ()
-{
+ hide_measures ();
+
+ if (session && current_bbt_points) {
+ draw_measures ();
+ }
- if (session && current_bbt_points) {
- Glib::signal_idle().connect (mem_fun (*this, &Editor::lazy_hide_and_draw_measures));
} else {
- hide_measures ();
+
+ if (session && current_bbt_points) {
+ Glib::signal_idle().connect (mem_fun (*this, &Editor::lazy_hide_and_draw_measures));
+ } else {
+ hide_measures ();
+ }
}
}
ArdourCanvas::SimpleLine *
Editor::get_time_line ()
{
- ArdourCanvas::SimpleLine *line;
+ ArdourCanvas::SimpleLine *line;
if (free_measure_lines.empty()) {
- line = new ArdourCanvas::SimpleLine (*time_line_group);
+ line = new ArdourCanvas::SimpleLine (*time_line_group);
used_measure_lines.push_back (line);
} else {
line = free_measure_lines.front();
gdouble xpos;
double x1, x2, y1, y2, beat_density;
- uint32_t beats = 0;
- uint32_t bars = 0;
+ uint32_t beats = 0;
+ uint32_t bars = 0;
uint32_t color;
if (current_bbt_points == 0 || current_bbt_points->empty()) {
*/
return;
}
-
+
for (i = current_bbt_points->begin(); i != current_bbt_points->end(); ++i) {
switch ((*i).type) {
commit_reversible_command ();
map.dump (cerr);
-
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
commit_reversible_command ();
map.dump (cerr);
-
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
XMLNode &after = session->tempo_map().get_state();
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
-
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
XMLNode &after = session->tempo_map().get_state();
session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
-
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
}
void
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-
return FALSE;
}
session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
- session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-
return FALSE;
}