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 a5abafc708068c2b783277a696d52fda3086840e..53c08ea2198b6887e6fd98a4bc1c4df7bb39e073 100644 (file)
--- a/libs/surfaces/push2/track_mix.h
+++ b/libs/surfaces/push2/track_mix.h
@@ -32,16 +32,19 @@ 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&);
+       TrackMixLayout (Push2& p, ARDOUR::Session&, std::string const &);
        ~TrackMixLayout ();
 
        void set_stripable (boost::shared_ptr<ARDOUR::Stripable>);
@@ -58,6 +61,11 @@ class TrackMixLayout : public Push2Layout
        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;
@@ -67,22 +75,25 @@ class TrackMixLayout : public Push2Layout
        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_change ();
-       void mute_change ();
+       void solo_mute_change ();
        void rec_enable_change ();
        void solo_iso_change ();
        void solo_safe_change ();