diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-16 08:39:28 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-27 14:59:31 -0500 |
| commit | 7c9f3acc60fb29a562d28d1f43a9e22298545bf1 (patch) | |
| tree | 7418a4922ff7670d6ffc08dce39432afd1e5669c /libs/surfaces/push2/track_mix.h | |
| parent | 2810e5619a1926a286c6192143ada4973066efd8 (diff) | |
first compiling and theoretically correct version of Push2 canvas display.
Not tested with device at this point
Diffstat (limited to 'libs/surfaces/push2/track_mix.h')
| -rw-r--r-- | libs/surfaces/push2/track_mix.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libs/surfaces/push2/track_mix.h b/libs/surfaces/push2/track_mix.h index 102b9940da..e2f3d8707c 100644 --- a/libs/surfaces/push2/track_mix.h +++ b/libs/surfaces/push2/track_mix.h @@ -27,6 +27,10 @@ namespace ARDOUR { class Stripable; } +namespace ArdourCanvas { + class Text; +} + namespace ArdourSurface { class Push2Knob; @@ -34,13 +38,14 @@ class Push2Knob; class TrackMixLayout : public Push2Layout { public: - TrackMixLayout (Push2& p, ARDOUR::Session&, Cairo::RefPtr<Cairo::Context>); + TrackMixLayout (Push2& p, ARDOUR::Session&); ~TrackMixLayout (); void set_stripable (boost::shared_ptr<ARDOUR::Stripable>); - bool redraw (Cairo::RefPtr<Cairo::Context>, bool force) const; - void on_show (); + void render (ArdourCanvas::Rect const &, Cairo::RefPtr<Cairo::Context>) const; + + void show (); void button_upper (uint32_t n); void button_lower (uint32_t n); @@ -53,8 +58,8 @@ class TrackMixLayout : public Push2Layout PBD::ScopedConnectionList stripable_connections; bool _dirty; - Glib::RefPtr<Pango::Layout> upper_layout[8]; - Glib::RefPtr<Pango::Layout> lower_layout[8]; + std::vector<ArdourCanvas::Text*> upper_text; + std::vector<ArdourCanvas::Text*> lower_text; Push2Knob* knobs[8]; |