remove unused member variable

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

diff --git a/libs/surfaces/push2/scale.h b/libs/surfaces/push2/scale.h
index 7d7b1f870a9ae018058c1486d18b91255332f94e..b87d86986b6eb1902370481dee8bc0e7f5b8d0e1 100644 (file)
--- a/libs/surfaces/push2/scale.h
+++ b/libs/surfaces/push2/scale.h
@@ -19,31 +19,61 @@
 #ifndef __ardour_push2_scale_layout_h__
 #define __ardour_push2_scale_layout_h__
 
+#include <vector>
+
 #include "layout.h"
 
 namespace ARDOUR {
        class Stripable;
 }
 
+namespace ArdourCanvas {
+       class Rectangle;
+}
+
 namespace ArdourSurface {
 
 class ScaleLayout : public Push2Layout
 {
    public:
-       ScaleLayout (Push2& p, ARDOUR::Session&);
+       ScaleLayout (Push2& p, ARDOUR::Session&, std::string const &);
        ~ScaleLayout ();
 
        void render (ArdourCanvas::Rect const &, Cairo::RefPtr<Cairo::Context>) const;
 
+       void show ();
+
        void button_upper (uint32_t n);
        void button_lower (uint32_t n);
-
+       void button_up ();
+       void button_down ();
+       void button_left ();
+       void button_right ();
        void strip_vpot (int, int);
-       void strip_vpot_touch (int, bool);
+
+       void strip_vpot_touch (int, bool) {}
 
    private:
+       ArdourCanvas::Rectangle* bg;
+       std::vector<ArdourCanvas::Text*> upper_text;
+       std::vector<ArdourCanvas::Text*> lower_text;
+       ArdourCanvas::Text* left_scroll_text;
+       ArdourCanvas::Text* right_scroll_text;
+       ArdourCanvas::Text* inkey_text;
+       ArdourCanvas::Text* chromatic_text;
+       ArdourCanvas::Text* close_text;
        Push2Menu* scale_menu;
+       int last_vpot;
+       int vpot_delta_cnt;
+       Push2::Button* root_button;
+
        void build_scale_menu ();
+       PBD::ScopedConnectionList menu_connections;
+       PBD::ScopedConnectionList p2_connections;
+       void mode_changed ();
+       void menu_rearranged ();
+       void show_root_state ();
+       void update_cursor_buttons ();
 };
 
 } /* namespace */