Fix editor sizing issue introduced in 4dc65e66

[ardour.git] / gtk2_ardour / tempo_curve.cc

diff --git a/gtk2_ardour/tempo_curve.cc b/gtk2_ardour/tempo_curve.cc
index 784473fa9a5387db87ce891bfd6938416ea20430..d4b5d91a8e410df5ec6e26567e18289813264e4d 100644 (file)
--- a/gtk2_ardour/tempo_curve.cc
+++ b/gtk2_ardour/tempo_curve.cc
@@ -27,7 +27,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)
+TempoCurve::TempoCurve (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, ARDOUR::TempoSection& temp, samplepos_t sample, bool handle_events)
 
        : editor (ed)
        , _parent (&parent)
@@ -40,8 +40,8 @@ TempoCurve::TempoCurve (PublicEditor& ed, ArdourCanvas::Container& parent, guint
        , _start_text (0)
        , _end_text (0)
 {
-       frame_position = frame;
-       unit_position = editor.sample_to_pixel (frame);
+       sample_position = sample;
+       unit_position = editor.sample_to_pixel (sample);
 
        group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 1));
 #ifdef CANVAS_DEBUG
@@ -82,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));
        }
 
-       _group->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));
 
 }
 
@@ -113,19 +113,19 @@ TempoCurve::the_item() const
 }
 
 void
-TempoCurve::set_position (framepos_t frame, framepos_t end_frame)
+TempoCurve::set_position (samplepos_t sample, samplepos_t end_sample)
 {
-       unit_position = editor.sample_to_pixel (frame);
+       unit_position = editor.sample_to_pixel (sample);
        group->set_x_position (unit_position);
-       frame_position = frame;
-       _end_frame = end_frame;
+       sample_position = sample;
+       _end_sample = end_sample;
 
        points->clear();
        points = new ArdourCanvas::Points ();
 
        points->push_back (ArdourCanvas::Duple (0.0, curve_height));
 
-       if (frame >= end_frame) {
+       if (sample >= end_sample) {
                /* shouldn't happen but ..*/
                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);
@@ -138,25 +138,25 @@ TempoCurve::set_position (framepos_t frame, framepos_t end_frame)
                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));
+               points->push_back (ArdourCanvas::Duple (editor.sample_to_pixel (end_sample - sample), y_pos));
        } else {
 
-               const framepos_t frame_step = max ((end_frame - frame) / 5, (framepos_t) 1);
-               framepos_t current_frame = frame;
+               const samplepos_t sample_step = max ((end_sample - sample) / 5, (samplepos_t) 1);
+               samplepos_t current_sample = sample;
 
-               while (current_frame < end_frame) {
-                       const double tempo_at = _tempo.tempo_at_minute (_tempo.minute_at_frame (current_frame)).note_types_per_minute();
+               while (current_sample < end_sample) {
+                       const double tempo_at = _tempo.tempo_at_minute (_tempo.minute_at_sample (current_sample)).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), min (y_pos, curve_height)));
+                       points->push_back (ArdourCanvas::Duple (editor.sample_to_pixel (current_sample - sample), min (y_pos, curve_height)));
 
-                       current_frame += frame_step;
+                       current_sample += sample_step;
                }
 
-               const double tempo_at = _tempo.tempo_at_minute (_tempo.minute_at_frame (end_frame)).note_types_per_minute();
+               const double tempo_at = _tempo.tempo_at_minute (_tempo.minute_at_sample (end_sample)).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 - frame), min (y_pos, curve_height)));
+               points->push_back (ArdourCanvas::Duple (editor.sample_to_pixel (end_sample - sample), min (y_pos, curve_height)));
        }
 
        _curve->set (*points);
@@ -168,9 +168,9 @@ TempoCurve::set_position (framepos_t frame, framepos_t end_frame)
        _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 ));
+       _end_text->set_position (ArdourCanvas::Duple (editor.sample_to_pixel (end_sample - sample) - _end_text->text_width() - 10, .5 ));
 
-       if (_end_text->text_width() + _start_text->text_width() + 20 > editor.sample_to_pixel (end_frame - frame)) {
+       if (_end_text->text_width() + _start_text->text_width() + 20 > editor.sample_to_pixel (end_sample - sample)) {
                _start_text->hide();
                _end_text->hide();
        } else {
@@ -182,7 +182,7 @@ TempoCurve::set_position (framepos_t frame, framepos_t end_frame)
 void
 TempoCurve::reposition ()
 {
-       set_position (frame_position, _end_frame);
+       set_position (sample_position, _end_sample);
 }
 
 void
@@ -190,7 +190,7 @@ TempoCurve::show ()
 {
        _shown = true;
 
-        group->show ();
+       group->show ();
 }
 
 void