X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Ftempo_curve.cc;h=c15d58fb0907717918448515c28dc76ce5a50a61;hb=d26aac90204a87e00ea3b2cb622a7f5729bfbc4a;hp=8f19001357ff174b32a755bbea4552e6bd25f4a0;hpb=0c7ecc6cbb4baaa6d4aebcf7f4ff682b67f6b64c;p=ardour.git diff --git a/gtk2_ardour/tempo_curve.cc b/gtk2_ardour/tempo_curve.cc index 8f19001357..c15d58fb09 100644 --- a/gtk2_ardour/tempo_curve.cc +++ b/gtk2_ardour/tempo_curve.cc @@ -16,7 +16,7 @@ #include -#include "i18n.h" +#include "pbd/i18n.h" PBD::Signal1 TempoCurve::CatchDeletion; @@ -26,7 +26,7 @@ void TempoCurve::setup_sizes(const double timebar_height) { curve_height = floor (timebar_height) - 2.5; } - +/* ignores Tempo note type - only note_types_per_minute is potentially curved */ TempoCurve::TempoCurve (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, ARDOUR::TempoSection& temp, framepos_t frame, bool handle_events) : editor (ed) @@ -34,8 +34,8 @@ TempoCurve::TempoCurve (PublicEditor& ed, ArdourCanvas::Container& parent, guint , _curve (0) , _shown (false) , _color (rgba) - , _min_tempo (temp.beats_per_minute()) - , _max_tempo (temp.beats_per_minute()) + , _min_tempo (temp.note_types_per_minute()) + , _max_tempo (temp.note_types_per_minute()) , _tempo (temp) { @@ -44,22 +44,15 @@ TempoCurve::TempoCurve (PublicEditor& ed, ArdourCanvas::Container& parent, guint group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 1)); #ifdef CANVAS_DEBUG - group->name = string_compose ("Marker::group for %1", _tempo.beats_per_minute()); + group->name = string_compose ("TempoCurve::group for %1", _tempo.note_types_per_minute()); #endif _curve = new ArdourCanvas::FramedCurve (group); #ifdef CANVAS_DEBUG - _curve->name = string_compose ("TempoCurve::_curve for %1", _tempo.beats_per_minute()); + _curve->name = string_compose ("TempoCurve::curve for %1", _tempo.note_types_per_minute()); #endif - _curve->set_fill_mode (ArdourCanvas::FramedCurve::Inside); - _curve->set_points_per_segment (31); - + _curve->set_points_per_segment (3); points = new ArdourCanvas::Points (); - points->push_back (ArdourCanvas::Duple (0.0, 0.0)); - points->push_back (ArdourCanvas::Duple (1.0, 0.0)); - points->push_back (ArdourCanvas::Duple (1.0, curve_height)); - points->push_back (ArdourCanvas::Duple (0.0, curve_height)); - _curve->set (*points); set_color_rgba (rgba); @@ -76,7 +69,6 @@ TempoCurve::TempoCurve (PublicEditor& ed, ArdourCanvas::Container& parent, guint //group->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_marker_event), group, this)); } - set_position (_tempo.frame(), UINT32_MAX); _curve->Event.connect (sigc::bind (sigc::mem_fun (editor, &PublicEditor::canvas_tempo_curve_event), _curve, this)); } @@ -115,42 +107,42 @@ TempoCurve::set_position (framepos_t frame, framepos_t end_frame) frame_position = frame; _end_frame = end_frame; - const double tempo_delta = max (10.0, _max_tempo - _min_tempo); - double max_y = 0.0; - points->clear(); - points = new ArdourCanvas::Points (); - points->push_back (ArdourCanvas::Duple (0.0, curve_height)); - if (end_frame == UINT32_MAX) { - const double tempo_at = _tempo.tempo_at_frame (frame, editor.session()->frame_rate()) * _tempo.note_type(); - const double y_pos = (curve_height) - (((tempo_at - _min_tempo) / (tempo_delta)) * curve_height); + points->push_back (ArdourCanvas::Duple (0.0, curve_height)); - max_y = y_pos; + if (end_frame == (framepos_t) UINT32_MAX) { + const double tempo_at = _tempo.note_types_per_minute(); + const double y_pos = (curve_height) - (((tempo_at - _min_tempo) / (_max_tempo - _min_tempo)) * curve_height); points->push_back (ArdourCanvas::Duple (0.0, y_pos)); points->push_back (ArdourCanvas::Duple (ArdourCanvas::COORD_MAX - 5.0, y_pos)); + } else if (_tempo.type() == ARDOUR::TempoSection::Constant) { + const double tempo_at = _tempo.note_types_per_minute(); + const double y_pos = (curve_height) - (((tempo_at - _min_tempo) / (_max_tempo - _min_tempo)) * curve_height); + + points->push_back (ArdourCanvas::Duple (0.0, y_pos)); + points->push_back (ArdourCanvas::Duple (editor.sample_to_pixel (end_frame - frame), y_pos)); } else { - const framepos_t frame_step = (end_frame - frame) / 31; + + const framepos_t frame_step = max ((end_frame - frame) / 5, (framepos_t) 1); framepos_t current_frame = frame; - while (current_frame < end_frame) { - const double tempo_at = _tempo.tempo_at_frame (current_frame, editor.session()->frame_rate()) * _tempo.note_type(); - const double y_pos = (curve_height) - (((tempo_at - _min_tempo) / (tempo_delta)) * curve_height); + while (current_frame < (end_frame - frame_step)) { + const double tempo_at = _tempo.tempo_at_minute (_tempo.minute_at_frame (current_frame)).note_types_per_minute(); + const double y_pos = max ((curve_height) - (((tempo_at - _min_tempo) / (_max_tempo - _min_tempo)) * curve_height), 0.0); - points->push_back (ArdourCanvas::Duple (editor.sample_to_pixel (current_frame - frame), y_pos)); + points->push_back (ArdourCanvas::Duple (editor.sample_to_pixel (current_frame - frame), min (y_pos, curve_height))); - max_y = max (y_pos, max_y); current_frame += frame_step; } - if (current_frame != end_frame) { - const double tempo_at = _tempo.tempo_at_frame (end_frame, editor.session()->frame_rate()) * _tempo.note_type(); - const double y_pos = (curve_height) - (((tempo_at - _min_tempo) / (tempo_delta)) * curve_height); - points->push_back (ArdourCanvas::Duple (editor.sample_to_pixel (end_frame - frame), y_pos)); - } + const double tempo_at = _tempo.tempo_at_minute (_tempo.minute_at_frame (end_frame)).note_types_per_minute(); + const double y_pos = max ((curve_height) - (((tempo_at - _min_tempo) / (_max_tempo - _min_tempo)) * curve_height), 0.0); + + points->push_back (ArdourCanvas::Duple (editor.sample_to_pixel ((end_frame - 1) - frame), min (y_pos, curve_height))); } _curve->set (*points); @@ -182,7 +174,7 @@ void TempoCurve::set_color_rgba (uint32_t c) { _color = c; - _curve->set_fill_color (UIConfiguration::instance().color_mod ("selection rect", "selection rect")); + _curve->set_fill_color (UIConfiguration::instance().color_mod ("tempo curve", "selection rect")); _curve->set_outline_color (_color); }