#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>
#include "gui_thread.h"
#include "time_axis_view.h"
#include "ardour_ui.h"
+#include "tempo_lines.h"
#include "i18n.h"
}
ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
-
- redisplay_tempo (false); // redraw rulers and measures
+
+ if (tempo_lines)
+ tempo_lines->tempo_map_changed();
+
+ 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
+ redraw_measures ();
}
-/**
- * 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;
+ }
+
+ compute_current_bbt_points (leftmost_frame, leftmost_frame + current_page_frames()); // redraw rulers and measures
+
+ 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
+Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
{
if (!session) {
return;
BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
- session->bbt_time(leftmost_frame, previous_beat);
- session->bbt_time(leftmost_frame + current_page_frames(), next_beat);
+ session->bbt_time(leftmost, previous_beat);
+ session->bbt_time(rightmost, next_beat);
if (previous_beat.beats > 1) {
- previous_beat.beats -= 1;
+ previous_beat.beats -= 1;
} else if (previous_beat.bars > 1) {
- previous_beat.bars--;
+ previous_beat.bars--;
previous_beat.beats += 1;
}
previous_beat.ticks = 0;
- if (session->tempo_map().meter_at(leftmost_frame + current_page_frames()).beats_per_bar () > next_beat.beats + 1) {
+ if (session->tempo_map().meter_at(rightmost).beats_per_bar () > next_beat.beats + 1) {
next_beat.beats += 1;
} else {
next_beat.bars += 1;
}
next_beat.ticks = 0;
- if (current_bbt_points) {
- delete current_bbt_points;
- current_bbt_points = 0;
- }
-
- if (session) {
- current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat));
- update_tempo_based_rulers ();
- } else {
- current_bbt_points = 0;
- }
-
- if (immediate_redraw) {
-
- hide_measures ();
-
- if (session && current_bbt_points) {
- draw_measures ();
- }
+ delete current_bbt_points;
+ current_bbt_points = 0;
- } else {
-
- if (session && current_bbt_points) {
- Glib::signal_idle().connect (mem_fun (*this, &Editor::redraw_measures));
- } else {
- hide_measures ();
- }
- }
+ current_bbt_points = session->tempo_map().get_points (session->tempo_map().frame_time (previous_beat), session->tempo_map().frame_time (next_beat) + 1);
}
void
Editor::hide_measures ()
{
- tempo_lines->hide();
- marker_tempo_lines->hide();
+ if (tempo_lines)
+ tempo_lines->hide();
}
bool
Editor::redraw_measures ()
{
- hide_measures ();
draw_measures ();
return false;
}
void
Editor::draw_measures ()
{
- if (session == 0 || _show_measures == false
- || !current_bbt_points || current_bbt_points->empty()) {
+ if (session == 0 || _show_measures == false ||
+ !current_bbt_points || current_bbt_points->empty()) {
return;
}
- tempo_lines->draw(*current_bbt_points, frames_per_unit);
- marker_tempo_lines->draw(*current_bbt_points, frames_per_unit);
-
- /* the cursors are always on top of everything */
-
- time_line_group->raise_to_top();
- marker_time_line_group->raise_to_top();
-
- cursor_group->raise_to_top();
+ if (tempo_lines == 0) {
+ tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height);
+ }
- return;
+ tempo_lines->draw(*current_bbt_points, frames_per_unit);
}
void
-Editor::mouse_add_new_tempo_event (nframes_t frame)
+Editor::mouse_add_new_tempo_event (nframes64_t frame)
{
if (session == 0) {
return;
TempoDialog tempo_dialog (map, frame, _("add"));
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
- tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
+ //this causes compiz to display no border.
+ //tempo_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &tempo_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
ensure_float (tempo_dialog);
BBT_Time requested;
bpm = tempo_dialog.get_bpm ();
+ double nt = tempo_dialog.get_note_type();
bpm = max (0.01, bpm);
tempo_dialog.get_bbt_time (requested);
begin_reversible_command (_("add tempo mark"));
XMLNode &before = map.get_state();
- map.add_tempo (Tempo (bpm), requested);
+ map.add_tempo (Tempo (bpm,nt), requested);
XMLNode &after = map.get_state();
session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
commit_reversible_command ();
- map.dump (cerr);
+ //map.dump (cerr);
}
void
-Editor::mouse_add_new_meter_event (nframes_t frame)
+Editor::mouse_add_new_meter_event (nframes64_t frame)
{
if (session == 0) {
return;
MeterDialog meter_dialog (map, frame, _("add"));
meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
- meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
+
+ //this causes compiz to display no border..
+ //meter_dialog.signal_realize().connect (bind (sigc::ptr_fun (set_decoration), &meter_dialog, Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)));
ensure_float (meter_dialog);
double note_type = meter_dialog.get_note_type ();
BBT_Time requested;
-
+
meter_dialog.get_bbt_time (requested);
-
+
begin_reversible_command (_("add meter mark"));
XMLNode &before = map.get_state();
map.add_meter (Meter (bpb, note_type), requested);
session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
commit_reversible_command ();
- map.dump (cerr);
+ //map.dump (cerr);
}
void
tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
ensure_float (tempo_dialog);
-
+
switch (tempo_dialog.run ()) {
case RESPONSE_ACCEPT:
break;
}
double bpm = tempo_dialog.get_bpm ();
+ double nt = tempo_dialog.get_note_type ();
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();
- session->tempo_map().replace_tempo (*section, Tempo (bpm));
+ 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);
- XMLNode &after = session->tempo_map().get_state();
+ session->tempo_map().dump (cerr);
+ XMLNode &after = session->tempo_map().get_state();
session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
commit_reversible_command ();
}
projects / ardour.git / blobdiff