#include <gtkmm2ext/utils.h>
-#include "i18n.h"
+#include "pbd/i18n.h"
PBD::Signal1<void,TempoCurve*> TempoCurve::CatchDeletion;
{
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)
, _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)
{
group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 1));
#ifdef CANVAS_DEBUG
- group->name = string_compose ("TempoCurve::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 (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);
//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));
}
_end_frame = end_frame;
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();
+ 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) / 5;
+
+ const framepos_t frame_step = max ((end_frame - frame) / 5, (framepos_t) 1);
framepos_t current_frame = frame;
while (current_frame < (end_frame - frame_step)) {
- 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) / (_max_tempo - _min_tempo)) * curve_height);
+ 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)));
current_frame += frame_step;
}
- 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) / (_max_tempo - _min_tempo)) * curve_height);
+ 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), y_pos));
+ points->push_back (ArdourCanvas::Duple (editor.sample_to_pixel ((end_frame - 1) - frame), min (y_pos, curve_height)));
}
_curve->set (*points);
TempoCurve::set_color_rgba (uint32_t c)
{
_color = c;
- _curve->set_fill_color (UIConfiguration::instance().color_mod ("color 62", "selection rect"));
+ _curve->set_fill_color (UIConfiguration::instance().color_mod ("tempo curve", "selection rect"));
_curve->set_outline_color (_color);
}