X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_curve.cc;h=4d2ea31a46f6a9d939e577f2b0e4a9c99fcc2047;hb=ae0dcdc0c5d13483271065c360e378202d20170a;hp=c43e91c9ac9e0eda8d06fde7ecbbc1e5306d7f2b;hpb=f8a6f8918d0b7f719748bc26e4abf5d2c25174db;p=ardour.git

diff --git a/gtk2_ardour/tempo_curve.cc b/gtk2_ardour/tempo_curve.cc
index c43e91c9ac..4d2ea31a46 100644
--- a/gtk2_ardour/tempo_curve.cc
+++ b/gtk2_ardour/tempo_curve.cc
@@ -37,7 +37,8 @@ TempoCurve::TempoCurve (PublicEditor& ed, ArdourCanvas::Container& parent, guint
 	, _min_tempo (temp.note_types_per_minute())
 	, _max_tempo (temp.note_types_per_minute())
 	, _tempo (temp)
-
+	, _start_text (0)
+	, _end_text (0)
 {
 	frame_position = frame;
 	unit_position = editor.sample_to_pixel (frame);
@@ -55,6 +56,18 @@ TempoCurve::TempoCurve (PublicEditor& ed, ArdourCanvas::Container& parent, guint
 	points = new ArdourCanvas::Points ();
 	_curve->set (*points);
 
+	_start_text = new ArdourCanvas::Text (group);
+	_end_text = new ArdourCanvas::Text (group);
+	_start_text->set_font_description (ARDOUR_UI_UTILS::get_font_for_style (N_("MarkerText")));
+	_end_text->set_font_description (ARDOUR_UI_UTILS::get_font_for_style (N_("MarkerText")));
+	_start_text->set_color (RGBA_TO_UINT (255,255,255,255));
+	_end_text->set_color (RGBA_TO_UINT (255,255,255,255));
+	char buf[10];
+	snprintf (buf, sizeof (buf), "%.3f/%.0f", _tempo.note_types_per_minute(), _tempo.note_type());
+	_start_text->set (buf);
+	snprintf (buf, sizeof (buf), "%.3f", _tempo.end_note_types_per_minute());
+	_end_text->set (buf);
+
 	set_color_rgba (rgba);
 
 	editor.ZoomChanged.connect (sigc::mem_fun (*this, &TempoCurve::reposition));
@@ -69,7 +82,7 @@ TempoCurve::TempoCurve (PublicEditor& ed, ArdourCanvas::Container& parent, guint
 		//group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this));
 	}
 
-	_curve->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_curve_event), _curve, this));
+	group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_curve_event), _curve, this));
 
 }
 
@@ -147,6 +160,23 @@ TempoCurve::set_position (framepos_t frame, framepos_t end_frame)
 	}
 
 	_curve->set (*points);
+
+	char buf[10];
+	snprintf (buf, sizeof (buf), "%.3f/%.0f", _tempo.note_types_per_minute(), _tempo.note_type());
+	_start_text->set (buf);
+	snprintf (buf, sizeof (buf), "%.3f", _tempo.end_note_types_per_minute());
+	_end_text->set (buf);
+
+	_start_text->set_position (ArdourCanvas::Duple (10, .5 ));
+	_end_text->set_position (ArdourCanvas::Duple (editor.sample_to_pixel (end_frame - frame) - _end_text->text_width() - 10, .5 ));
+
+	if (_end_text->text_width() + _start_text->text_width() + 20 > editor.sample_to_pixel (end_frame - frame)) {
+		_start_text->hide();
+		_end_text->hide();
+	} else {
+		_start_text->show();
+		_end_text->show();
+	}
 }
 
 void
@@ -160,7 +190,7 @@ TempoCurve::show ()
 {
 	_shown = true;
 
-        group->show ();
+	group->show ();
 }
 
 void