PBD::Signal<...>::connect() is already thread safe, so drop intermediate proxy/call_s...

[ardour.git] / gtk2_ardour / tempo_curve.h

diff --git a/gtk2_ardour/tempo_curve.h b/gtk2_ardour/tempo_curve.h
index be378078c7ddc6833fe1b317e3f66ac24cf45a03..9cee2265f0bc4b7355251db2d7992ccf1b49cf1d 100644 (file)
--- a/gtk2_ardour/tempo_curve.h
+++ b/gtk2_ardour/tempo_curve.h
@@ -9,8 +9,8 @@
 #include "ardour/ardour.h"
 #include "pbd/signals.h"
 
-#include "canvas/fwd.h"
 #include "canvas/types.h"
+#include "canvas/framed_curve.h"
 
 namespace ARDOUR {
        class TempoSection;
@@ -40,7 +40,7 @@ class TempoCurve : public sigc::trackable
        void hide ();
        void show ();
 
-       ARDOUR::TempoSection& tempo () { return _tempo; }
+       ARDOUR::TempoSection& tempo () const { return _tempo; }
 
        void set_max_tempo (const double& max) { _max_tempo = max; }
        void set_min_tempo (const double& min) { _min_tempo = min; }
@@ -51,8 +51,7 @@ protected:
        ArdourCanvas::Container* _parent;
        ArdourCanvas::Container *group;
        ArdourCanvas::Points *points;
-       ArdourCanvas::Rectangle* _background;
-       ArdourCanvas::Curve* _curve;
+       ArdourCanvas::FramedCurve* _curve;
 
        double        unit_position;
        framepos_t    frame_position;
@@ -63,8 +62,8 @@ protected:
 
        void reposition ();
 private:
-       double       _max_tempo;
        double       _min_tempo;
+       double       _max_tempo;
        /* disallow copy construction */
        TempoCurve (TempoCurve const &);
        TempoCurve & operator= (TempoCurve const &);