Make ContourdesignControlProtocol::_button_actions private again ...

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

diff --git a/libs/surfaces/push2/canvas.h b/libs/surfaces/push2/canvas.h
index 853b93f778bdb4e3aabed501f702d519f91bbbac..4250003ede77e836a35e675811ac78c4e3b71e48 100644 (file)
--- a/libs/surfaces/push2/canvas.h
+++ b/libs/surfaces/push2/canvas.h
@@ -47,8 +47,6 @@ class Push2Canvas : public ArdourCanvas::Canvas
        void request_redraw (ArdourCanvas::Rect const &);
        bool vblank ();
 
-       void splash ();
-
        Cairo::RefPtr<Cairo::Context> image_context() { return context; }
 
        int rows() const { return _rows; }
@@ -71,6 +69,8 @@ class Push2Canvas : public ArdourCanvas::Canvas
        void pick_current_item (ArdourCanvas::Duple const &, int) {}
        bool get_mouse_position (ArdourCanvas::Duple&) const { return false; }
 
+       Glib::RefPtr<Pango::Context> get_pango_context ();
+
   private:
        Push2& p2;
        int _cols;
@@ -79,15 +79,16 @@ class Push2Canvas : public ArdourCanvas::Canvas
        static const int pixels_per_row;
        int pixel_area () const { return _rows * pixels_per_row; }
 
-       uint8_t   frame_header[16];
-       uint16_t* device_frame_buffer;
+       uint8_t   sample_header[16];
+       uint16_t* device_sample_buffer;
 
-       Cairo::RefPtr<Cairo::ImageSurface> frame_buffer;
+       Cairo::RefPtr<Cairo::ImageSurface> sample_buffer;
        Cairo::RefPtr<Cairo::Context> context;
        Cairo::RefPtr<Cairo::Region> expose_region;
+       Glib::RefPtr<Pango::Context> pango_context;
 
        bool expose ();
-       int blit_to_device_frame_buffer ();
+       int blit_to_device_sample_buffer ();
 };
 
 } /* namespace ArdourSurface */