X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_tempodisplay.cc;h=2bbcdf04725791df92bc8170149054e13408df9a;hb=6e0330a304e06311502f82ac1ebc969121695aa5;hp=5bec1d0f7b7f397ed9fbb93ed0e3c00c2bbd3834;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git

diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index 5bec1d0f7b..2bbcdf0472 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
 #include <cstdio> // for sprintf, grrr
 #include <cstdlib>
 #include <cmath>
@@ -45,11 +49,11 @@
 #include "time_axis_view.h"
 #include "ardour_ui.h"
 #include "tempo_lines.h"
+#include "utils.h"
 
 #include "i18n.h"
 
 using namespace std;
-using namespace sigc;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
@@ -81,11 +85,11 @@ Editor::draw_metric_marks (const Metrics& metrics)
 
 		if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) {
 			snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ());
-			metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
+			metric_marks.push_back (new MeterMarker (*this, *meter_group, *cursor_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf,
 								 *(const_cast<MeterSection*>(ms))));
 		} else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) {
 			snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute());
-			metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
+			metric_marks.push_back (new TempoMarker (*this, *tempo_group, *cursor_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf,
 								 *(const_cast<TempoSection*>(ts))));
 		}
 
@@ -94,26 +98,27 @@ Editor::draw_metric_marks (const Metrics& metrics)
 }
 
 void
-Editor::tempo_map_changed (Change ignored)
+Editor::tempo_map_changed (const PropertyChange& /*ignored*/)
 {
-	if (!session) {
+	if (!_session) {
 		return;
 	}
 
-	ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed, ignored)
+	ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed, ignored);
 
-	if (tempo_lines)
+	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
+	_session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
 	redraw_measures ();
 }
 
 void
 Editor::redisplay_tempo (bool immediate_redraw)
 {
-	if (!session) {
+	if (!_session) {
 		return;
 	}
 
@@ -133,16 +138,16 @@ Editor::redisplay_tempo (bool immediate_redraw)
 }
 
 void
-Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
+Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost)
 {
-	if (!session) {
+	if (!_session) {
 		return;
 	}
 
-	BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
+	Timecode::BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
 
-	session->bbt_time(leftmost, previous_beat);
-	session->bbt_time(rightmost, next_beat);
+	_session->bbt_time(leftmost, previous_beat);
+	_session->bbt_time(rightmost, next_beat);
 
 	if (previous_beat.beats > 1) {
 		previous_beat.beats -= 1;
@@ -152,7 +157,7 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
 	}
 	previous_beat.ticks = 0;
 
-	if (session->tempo_map().meter_at(rightmost).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;
@@ -163,7 +168,7 @@ Editor::compute_current_bbt_points (nframes_t leftmost, nframes_t rightmost)
 	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);
+	current_bbt_points = _session->tempo_map().get_points (_session->tempo_map().frame_time (previous_beat), _session->tempo_map().frame_time (next_beat) + 1);
 }
 
 void
@@ -183,26 +188,26 @@ Editor::redraw_measures ()
 void
 Editor::draw_measures ()
 {
-	if (session == 0 || _show_measures == false ||
+	if (_session == 0 || _show_measures == false ||
 	    !current_bbt_points || current_bbt_points->empty()) {
 		return;
 	}
 
 	if (tempo_lines == 0) {
-		tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height);
+		tempo_lines = new TempoLines(*track_canvas, time_line_group, physical_screen_height(get_window()));
 	}
 
 	tempo_lines->draw(*current_bbt_points, frames_per_unit);
 }
 
 void
-Editor::mouse_add_new_tempo_event (nframes64_t frame)
+Editor::mouse_add_new_tempo_event (framepos_t frame)
 {
-	if (session == 0) {
+	if (_session == 0) {
 		return;
 	}
 
-	TempoMap& map(session->tempo_map());
+	TempoMap& map(_session->tempo_map());
 	TempoDialog tempo_dialog (map, frame, _("add"));
 
 	tempo_dialog.set_position (Gtk::WIN_POS_MOUSE);
@@ -219,7 +224,7 @@ Editor::mouse_add_new_tempo_event (nframes64_t frame)
 	}
 
 	double bpm = 0;
-	BBT_Time requested;
+	Timecode::BBT_Time requested;
 
 	bpm = tempo_dialog.get_bpm ();
 	double nt = tempo_dialog.get_note_type();
@@ -231,21 +236,21 @@ Editor::mouse_add_new_tempo_event (nframes64_t frame)
         XMLNode &before = map.get_state();
 	map.add_tempo (Tempo (bpm,nt), requested);
         XMLNode &after = map.get_state();
-	session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
+	_session->add_command(new MementoCommand<TempoMap>(map, &before, &after));
 	commit_reversible_command ();
 
 	//map.dump (cerr);
 }
 
 void
-Editor::mouse_add_new_meter_event (nframes64_t frame)
+Editor::mouse_add_new_meter_event (framepos_t frame)
 {
-	if (session == 0) {
+	if (_session == 0) {
 		return;
 	}
 
 
-	TempoMap& map(session->tempo_map());
+	TempoMap& map(_session->tempo_map());
 	MeterDialog meter_dialog (map, frame, _("add"));
 
 	meter_dialog.set_position (Gtk::WIN_POS_MOUSE);
@@ -266,14 +271,14 @@ Editor::mouse_add_new_meter_event (nframes64_t frame)
 	bpb = max (1.0, bpb); // XXX is this a reasonable limit?
 
 	double note_type = meter_dialog.get_note_type ();
-	BBT_Time requested;
+	Timecode::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()));
+	_session->add_command(new MementoCommand<TempoMap>(map, &before, &map.get_state()));
 	commit_reversible_command ();
 
 	//map.dump (cerr);
@@ -296,7 +301,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item)
 	}
 
 	if (tempo_marker->tempo().movable()) {
-	  Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
+		Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::real_remove_tempo_marker), &tempo_marker->tempo()));
 	}
 }
 
@@ -322,10 +327,10 @@ Editor::edit_meter_section (MeterSection* section)
 	double note_type = meter_dialog.get_note_type ();
 
 	begin_reversible_command (_("replace tempo mark"));
-        XMLNode &before = session->tempo_map().get_state();
-	session->tempo_map().replace_meter (*section, Meter (bpb, note_type));
-        XMLNode &after = session->tempo_map().get_state();
-	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
+        XMLNode &before = _session->tempo_map().get_state();
+	_session->tempo_map().replace_meter (*section, Meter (bpb, note_type));
+        XMLNode &after = _session->tempo_map().get_state();
+	_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 }
 
@@ -347,20 +352,20 @@ Editor::edit_tempo_section (TempoSection* section)
 
 	double bpm = tempo_dialog.get_bpm ();
 	double nt = tempo_dialog.get_note_type ();
-	BBT_Time when;
+	Timecode::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);
+	_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,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();
-	session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
+	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();
+	_session->add_command (new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 }
 
@@ -406,10 +411,10 @@ gint
 Editor::real_remove_tempo_marker (TempoSection *section)
 {
 	begin_reversible_command (_("remove tempo mark"));
-	XMLNode &before = session->tempo_map().get_state();
-	session->tempo_map().remove_tempo (*section);
-	XMLNode &after = session->tempo_map().get_state();
-	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
+	XMLNode &before = _session->tempo_map().get_state();
+	_session->tempo_map().remove_tempo (*section);
+	XMLNode &after = _session->tempo_map().get_state();
+	_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 
 	return FALSE;
@@ -440,10 +445,10 @@ gint
 Editor::real_remove_meter_marker (MeterSection *section)
 {
 	begin_reversible_command (_("remove tempo mark"));
-	XMLNode &before = session->tempo_map().get_state();
-	session->tempo_map().remove_meter (*section);
-	XMLNode &after = session->tempo_map().get_state();
-	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
+	XMLNode &before = _session->tempo_map().get_state();
+	_session->tempo_map().remove_meter (*section);
+	XMLNode &after = _session->tempo_map().get_state();
+	_session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 
 	return FALSE;