MacOS [sic] required changes for Rect in Push 2 code

[ardour.git] / libs / surfaces / push2 / track_mix.h

diff --git a/libs/surfaces/push2/track_mix.h b/libs/surfaces/push2/track_mix.h
index 54081c115c780014939e002f85515ea249a29e8b..53c08ea2198b6887e6fd98a4bc1c4df7bb39e073 100644 (file)
--- a/libs/surfaces/push2/track_mix.h
+++ b/libs/surfaces/push2/track_mix.h
@@ -19,39 +19,85 @@
 #ifndef __ardour_push2_track_mix_layout_h__
 #define __ardour_push2_track_mix_layout_h__
 
+#include <vector>
+
 #include "layout.h"
 
 namespace ARDOUR {
        class Stripable;
+       class AutomationControl;
+}
+
+namespace ArdourCanvas {
+       class Rectangle;
+       class Text;
+       class Line;
+       class VBox;
+       class Rect;
 }
 
 namespace ArdourSurface {
 
+class Push2Knob;
+class LevelMeter;
+
 class TrackMixLayout : public Push2Layout
 {
    public:
-       TrackMixLayout (Push2& p, ARDOUR::Session&, Cairo::RefPtr<Cairo::Context>);
+       TrackMixLayout (Push2& p, ARDOUR::Session&, std::string const &);
        ~TrackMixLayout ();
 
        void set_stripable (boost::shared_ptr<ARDOUR::Stripable>);
 
-       bool redraw (Cairo::RefPtr<Cairo::Context>) const;
+       void render (ArdourCanvas::Rect const &, Cairo::RefPtr<Cairo::Context>) const;
 
+       void show ();
+       void hide ();
        void button_upper (uint32_t n);
        void button_lower (uint32_t n);
+       void button_left ();
+       void button_right ();
 
        void strip_vpot (int, int);
        void strip_vpot_touch (int, bool);
 
+       void update_meters ();
+       void update_clocks ();
+
+       boost::shared_ptr<ARDOUR::Stripable> current_stripable() const { return stripable; }
+
    private:
        boost::shared_ptr<ARDOUR::Stripable> stripable;
        PBD::ScopedConnectionList stripable_connections;
-       bool _dirty;
 
-       Glib::RefPtr<Pango::Layout> name_layout;
+       ArdourCanvas::Rectangle* bg;
+       ArdourCanvas::Line* upper_line;
+       std::vector<ArdourCanvas::Text*> upper_text;
+       std::vector<ArdourCanvas::Text*> lower_text;
+       ArdourCanvas::Text* name_text;
+       ArdourCanvas::Text* bbt_text;
+       ArdourCanvas::Text* minsec_text;
+       uint8_t selection_color;
+
+       Push2Knob* knobs[8];
+       LevelMeter* meter;
+
+       void stripable_property_change (PBD::PropertyChange const& what_changed);
+       void simple_control_change (boost::shared_ptr<ARDOUR::AutomationControl> ac, Push2::ButtonID bid);
+
+       PBD::ScopedConnection selection_connection;
+       void selection_changed ();
+       void show_state ();
 
        void drop_stripable ();
        void name_changed ();
+       void color_changed ();
+
+       void solo_mute_change ();
+       void rec_enable_change ();
+       void solo_iso_change ();
+       void solo_safe_change ();
+       void monitoring_change ();
 };
 
 } /* namespace */