#include <libgnomecanvasmm.h>
-#include <pbd/error.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/memento_command.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/gtk_ui.h>
-#include <ardour/session.h>
-#include <ardour/tempo.h>
+#include "ardour/session.h"
+#include "ardour/tempo.h"
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/utils.h>
if (tempo_lines)
tempo_lines->tempo_map_changed();
- compute_current_bbt_points(leftmost_frame, leftmost_frame + (nframes_t)(edit_packer.get_width() * frames_per_unit));
+ compute_current_bbt_points(leftmost_frame, leftmost_frame + current_page_frames());
session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
- update_tempo_based_rulers ();
redraw_measures ();
}
return;
}
- compute_current_bbt_points (leftmost_frame, leftmost_frame + (nframes_t)(edit_packer.get_width() * frames_per_unit)); // redraw rulers and measures
+ compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures
- redraw_measures();
- update_tempo_based_rulers ();
+ compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames());
+ if (immediate_redraw) {
+ redraw_measures ();
+ } else {
+#ifdef GTKOSX
+ redraw_measures ();
+#else
+ Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures));
+#endif
+ }
+ update_tempo_based_rulers (); // redraw rulers and measures
}
void
}
next_beat.ticks = 0;
- if (current_bbt_points) {
- delete current_bbt_points;
- current_bbt_points = 0;
- }
+ delete current_bbt_points;
+ current_bbt_points = 0;
current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1);
}
}
if (tempo_lines == 0) {
- tempo_lines = new TempoLines(*track_canvas, time_line_group);
+ tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height);
}
tempo_lines->draw(*current_bbt_points, frames_per_unit);
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
ensure_float (tempo_dialog);
-
+
switch (tempo_dialog.run ()) {
case RESPONSE_ACCEPT:
break;
BBT_Time when;
tempo_dialog.get_bbt_time(when);
bpm = max (0.01, bpm);
-
+
cerr << "Editing tempo section to be at " << when << endl;
session->tempo_map().dump (cerr);
begin_reversible_command (_("replace tempo mark"));
- XMLNode &before = session->tempo_map().get_state();
+ XMLNode &before = session->tempo_map().get_state();
session->tempo_map().replace_tempo (*section, Tempo (bpm,nt));
session->tempo_map().dump (cerr);
session->tempo_map().move_tempo (*section, when);
session->tempo_map().dump (cerr);
- XMLNode &after = session->tempo_map().get_state();
+ XMLNode &after = session->tempo_map().get_state();
session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
}