X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fpush2%2Fpush2.h;h=89982928bd09bcf09f1b078241ea05c52f7693a7;hb=3448f3151e52565197692512e92be7dc0c08a7c2;hp=3a1f33861f343efb1a355f1d226a98bb022e726a;hpb=64d390ff13cc3429dac9416f4cba0d95b838deca;p=ardour.git

diff --git a/libs/surfaces/push2/push2.h b/libs/surfaces/push2/push2.h
index 3a1f33861f..89982928bd 100644
--- a/libs/surfaces/push2/push2.h
+++ b/libs/surfaces/push2/push2.h
@@ -21,30 +21,26 @@
 
 #include <vector>
 #include <map>
+#include <stack>
 #include <list>
 #include <set>
 
 #include <libusb.h>
 
-#include <cairomm/refptr.h>
-
 #define ABSTRACT_UI_EXPORTS
 #include "pbd/abstract_ui.h"
 
 #include "midi++/types.h"
 
+#include "ardour/mode.h"
 #include "ardour/types.h"
 
 #include "control_protocol/control_protocol.h"
 #include "control_protocol/types.h"
 
-#include "midi_byte_array.h"
-#include "mode.h"
+#include "gtkmm2ext/colors.h"
 
-namespace Cairo {
-	class ImageSurface;
-	class Context;
-}
+#include "midi_byte_array.h"
 
 namespace Pango {
 	class Layout;
@@ -73,6 +69,7 @@ public:
 class P2GUI;
 class Push2Menu;
 class Push2Layout;
+class Push2Canvas;
 
 class Push2 : public ARDOUR::ControlProtocol
             , public AbstractUI<Push2Request>
@@ -281,6 +278,32 @@ class Push2 : public ARDOUR::ControlProtocol
 			: Button (bb, ex, press, release, long_press) {}
 	};
 
+	enum ColorName {
+		DarkBackground,
+		LightBackground,
+
+		ParameterName,
+		StripableName,
+		ClockText,
+
+		KnobArcBackground,
+		KnobArcStart,
+		KnobArcEnd,
+
+		KnobLine,
+		KnobLineShadow,
+
+		KnobForeground,
+		KnobBackground,
+		KnobShadow,
+		KnobBorder,
+	};
+
+	enum PressureMode {
+		AfterTouch,
+		PolyPressure,
+	};
+
   public:
 	Push2 (ARDOUR::Session&);
 	~Push2 ();
@@ -306,7 +329,10 @@ class Push2 : public ARDOUR::ControlProtocol
 	int pad_note (int row, int col) const;
 	PBD::Signal0<void> PadChange;
 
+	void update_selection_color ();
+
 	void set_pad_scale (int root, int octave, MusicalMode::Type mode, bool inkey);
+	PBD::Signal0<void> ScaleChange;
 
 	MusicalMode::Type mode() const { return  _mode; }
 	int scale_root() const { return _scale_root; }
@@ -314,6 +340,9 @@ class Push2 : public ARDOUR::ControlProtocol
 	bool in_key() const { return _in_key; }
 
 	Push2Layout* current_layout() const;
+	void         use_previous_layout ();
+
+	Push2Canvas* canvas() const { return _canvas; }
 
 	enum ModifierState {
 		None = 0,
@@ -323,55 +352,66 @@ class Push2 : public ARDOUR::ControlProtocol
 
 	ModifierState modifier_state() const { return _modifier_state; }
 
-	Button* button_by_id (ButtonID);
+	boost::shared_ptr<Button> button_by_id (ButtonID);
+	static std::string button_name_by_id (ButtonID);
+
+	void strip_buttons_off ();
 
 	void write (const MidiByteArray&);
 
-	static const int cols;
-	static const int rows;
+	uint8_t get_color_index (Gtkmm2ext::Color rgba);
+	Gtkmm2ext::Color get_color (ColorName);
+
+	PressureMode pressure_mode () const { return _pressure_mode; }
+	void set_pressure_mode (PressureMode);
+	PBD::Signal1<void,PressureMode> PressureModeChange;
+
+	libusb_device_handle* usb_handle() const { return handle; }
 
   private:
 	libusb_device_handle *handle;
-	uint8_t   frame_header[16];
-	uint16_t* device_frame_buffer;
-	int  device_buffer;
-	Cairo::RefPtr<Cairo::ImageSurface> frame_buffer;
-	sigc::connection vblank_connection;
-	sigc::connection periodic_connection;
-
+	bool in_use;
 	ModifierState _modifier_state;
 
-	static const int pixels_per_row;
-
 	void do_request (Push2Request*);
-	int stop ();
-	int open ();
-	int close ();
-	bool redraw ();
-	int blit_to_device_frame_buffer ();
-	bool vblank ();
+
+	int begin_using_device ();
+	int stop_using_device ();
+	int device_acquire ();
+	void device_release ();
+	int ports_acquire ();
+	void ports_release ();
+	void run_event_loop ();
+	void stop_event_loop ();
 
 	void relax () {}
 
 	/* map of Buttons by CC */
-	typedef std::map<int,Button*> CCButtonMap;
+	typedef std::map<int,boost::shared_ptr<Button> > CCButtonMap;
 	CCButtonMap cc_button_map;
 	/* map of Buttons by ButtonID */
-	typedef std::map<ButtonID,Button*> IDButtonMap;
+	typedef std::map<ButtonID,boost::shared_ptr<Button> > IDButtonMap;
 	IDButtonMap id_button_map;
 	std::set<ButtonID> buttons_down;
 	std::set<ButtonID> consumed;
 
 	bool button_long_press_timeout (ButtonID id);
-	void start_press_timeout (Button&, ButtonID);
+	void start_press_timeout (boost::shared_ptr<Button>, ButtonID);
 
 	void init_buttons (bool startup);
 	void init_touch_strip ();
 
-	/* map of Pads by note number */
-	typedef std::map<int,Pad*> NNPadMap;
+	/* map of Pads by note number (the "fixed" note number sent by the
+	 * hardware, not the note number generated if the pad is touched)
+	 */
+	typedef std::map<int,boost::shared_ptr<Pad> > NNPadMap;
 	NNPadMap nn_pad_map;
 
+	/* map of Pads by note number they generate (their "filtered" value)
+	 */
+	typedef std::multimap<int,boost::shared_ptr<Pad> > FNPadMap;
+	FNPadMap fn_pad_map;
+
 	void set_button_color (ButtonID, uint8_t color_index);
 	void set_button_state (ButtonID, LED::State);
 	void set_led_color (ButtonID, uint8_t color_index);
@@ -397,7 +437,6 @@ class Push2 : public ARDOUR::ControlProtocol
 	void handle_midi_sysex (MIDI::Parser&, MIDI::byte *, size_t count);
 
 	bool midi_input_handler (Glib::IOCondition ioc, MIDI::Port* port);
-	bool periodic ();
 
 	void thread_init ();
 
@@ -418,7 +457,9 @@ class Push2 : public ARDOUR::ControlProtocol
 	void button_left ();
 	void button_metronome ();
 	void button_repeat ();
+	void button_mute ();
 	void button_solo ();
+	void button_solo_long_press ();
 	void button_fixed_length ();
 	void button_new ();
 	void button_browse ();
@@ -434,6 +475,9 @@ class Push2 : public ARDOUR::ControlProtocol
 	void button_fwd4 ();
 	void button_add_track ();
 	void button_stop ();
+	void button_master ();
+	void button_quantize ();
+	void button_duplicate ();
 	void button_shift_press ();
 	void button_shift_release ();
 	void button_shift_long_press ();
@@ -446,6 +490,7 @@ class Push2 : public ARDOUR::ControlProtocol
 	void button_octave_down ();
 	void button_layout_press ();
 	void button_scale_press ();
+	void button_mix_press ();
 
 	void button_upper (uint32_t n);
 	void button_lower (uint32_t n);
@@ -475,25 +520,30 @@ class Push2 : public ARDOUR::ControlProtocol
 	void other_vpot (int, int);
 	void other_vpot_touch (int, bool);
 
-	/* special Stripables */
+	/* special Stripable */
 
 	boost::shared_ptr<ARDOUR::Stripable> master;
-	boost::shared_ptr<ARDOUR::Stripable> monitor;
 
-	/* Cairo graphics context */
-
-	Cairo::RefPtr<Cairo::Context> context;
+	sigc::connection vblank_connection;
+	bool vblank ();
 
 	void splash ();
 	ARDOUR::microseconds_t splash_start;
 
+	/* the canvas */
+
+	Push2Canvas* _canvas;
+
 	/* Layouts */
 
 	mutable Glib::Threads::Mutex layout_lock;
 	Push2Layout* _current_layout;
-	Push2Layout* drawn_layout;
+	Push2Layout* _previous_layout;
 	Push2Layout* mix_layout;
 	Push2Layout* scale_layout;
+	Push2Layout* track_mix_layout;
+	Push2Layout* splash_layout;
+	void set_current_layout (Push2Layout*);
 
 	bool pad_filter (ARDOUR::MidiBuffer& in, ARDOUR::MidiBuffer& out) const;
 
@@ -510,6 +560,7 @@ class Push2 : public ARDOUR::ControlProtocol
 	int connection_state;
 	bool connection_handler (boost::weak_ptr<ARDOUR::Port>, std::string name1, boost::weak_ptr<ARDOUR::Port>, std::string name2, bool yn);
 	PBD::ScopedConnection port_connection;
+	void connected ();
 
 	/* GUI */
 
@@ -518,8 +569,7 @@ class Push2 : public ARDOUR::ControlProtocol
 
 	/* pad mapping */
 
-	PBD::ScopedConnection selection_connection;
-	void stripable_selection_change (ARDOUR::StripableNotificationListPtr);
+	void stripable_selection_changed ();
 
 	MusicalMode::Type _mode;
 	int _scale_root;
@@ -530,92 +580,29 @@ class Push2 : public ARDOUR::ControlProtocol
 
 	bool percussion;
 	void set_percussive_mode (bool);
-};
 
-class Push2Layout
-{
-  public:
-	Push2Layout (Push2& p, ARDOUR::Session& s);
-	virtual ~Push2Layout ();
-
-	bool mapped() const;
-
-	virtual bool redraw (Cairo::RefPtr<Cairo::Context>) const = 0;
-
-	virtual void button_upper (uint32_t n) {}
-	virtual void button_lower (uint32_t n) {}
-	virtual void button_up ()  {}
-	virtual void button_down ()  {}
-	virtual void button_right ()  {}
-	virtual void button_left ()  {}
-	virtual void button_select_press () {}
-	virtual void button_select_release () {}
+	/* color map (device side) */
 
-	virtual void strip_vpot (int, int) = 0;
-	virtual void strip_vpot_touch (int, bool) = 0;
+	typedef std::map<Gtkmm2ext::Color,uint8_t> ColorMap;
+	typedef std::stack<uint8_t> ColorMapFreeList;
+	ColorMap color_map;
+	ColorMapFreeList color_map_free_list;
+	void build_color_map ();
 
-  protected:
-	Push2& p2;
-	ARDOUR::Session& session;
-};
-
-
-class MixLayout : public Push2Layout
-{
-   public:
-	MixLayout (Push2& p, ARDOUR::Session&, Cairo::RefPtr<Cairo::Context>);
-	~MixLayout ();
+	/* our own colors */
 
-	bool redraw (Cairo::RefPtr<Cairo::Context>) const;
-
-	void button_upper (uint32_t n);
-	void button_lower (uint32_t n);
-	void button_left ();
-	void button_right ();
-	void button_select_press ();
-	void button_select_release ();
+	typedef std::map<ColorName,Gtkmm2ext::Color> Colors;
+	Colors colors;
+	void fill_color_table ();
+	void reset_pad_colors ();
 
-	void strip_vpot (int, int);
-	void strip_vpot_touch (int, bool);
-
-  private:
-	Glib::RefPtr<Pango::Layout> tc_clock_layout;
-	Glib::RefPtr<Pango::Layout> bbt_clock_layout;
-	Glib::RefPtr<Pango::Layout> upper_layout[8];
-	Glib::RefPtr<Pango::Layout> mid_layout[8];
-	Glib::RefPtr<Pango::Layout> lower_layout[8];
-
-	/* stripables */
-
-	int32_t bank_start;
-	PBD::ScopedConnectionList stripable_connections;
-	boost::shared_ptr<ARDOUR::Stripable> stripable[8];
-
-	void solo_change (int);
-	void mute_change (int);
-
-	void stripable_property_change (PBD::PropertyChange const& what_changed, int which);
-
-	void switch_bank (uint32_t base);
-};
-
-class ScaleLayout : public Push2Layout
-{
-   public:
-	ScaleLayout (Push2& p, ARDOUR::Session&, Cairo::RefPtr<Cairo::Context>);
-	~ScaleLayout ();
-
-	bool redraw (Cairo::RefPtr<Cairo::Context>) const;
-
-	void button_upper (uint32_t n);
-	void button_lower (uint32_t n);
+	PressureMode _pressure_mode;
+	void request_pressure_mode ();
 
-	void strip_vpot (int, int);
-	void strip_vpot_touch (int, bool);
+	uint8_t selection_color;
+	uint8_t contrast_color;
 
-   private:
-	Push2Menu* scale_menu;
-	void build_scale_menu (Cairo::RefPtr<Cairo::Context>);
+	bool in_range_select;
 };
 
 } /* namespace */