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

diff --git a/libs/surfaces/push2/push2.h b/libs/surfaces/push2/push2.h
index b27de8704c..89982928bd 100644
--- a/libs/surfaces/push2/push2.h
+++ b/libs/surfaces/push2/push2.h
@@ -32,13 +32,15 @@
 
 #include "midi++/types.h"
 
+#include "ardour/mode.h"
 #include "ardour/types.h"
 
 #include "control_protocol/control_protocol.h"
 #include "control_protocol/types.h"
 
+#include "gtkmm2ext/colors.h"
+
 #include "midi_byte_array.h"
-#include "mode.h"
 
 namespace Pango {
 	class Layout;
@@ -327,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; }
@@ -335,6 +340,8 @@ 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 {
@@ -345,12 +352,15 @@ 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&);
 
-	uint8_t get_color_index (uint32_t rgb);
-	uint32_t get_color (ColorName);
+	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);
@@ -360,34 +370,48 @@ class Push2 : public ARDOUR::ControlProtocol
 
   private:
 	libusb_device_handle *handle;
+	bool in_use;
 	ModifierState _modifier_state;
 
 	void do_request (Push2Request*);
-	int stop ();
-	int open ();
-	int close ();
+
+	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);
@@ -414,9 +438,6 @@ class Push2 : public ARDOUR::ControlProtocol
 
 	bool midi_input_handler (Glib::IOCondition ioc, MIDI::Port* port);
 
-	sigc::connection periodic_connection;
-	bool periodic ();
-
 	void thread_init ();
 
 	PBD::ScopedConnectionList session_connections;
@@ -454,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 ();
@@ -496,10 +520,9 @@ 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;
 
 	sigc::connection vblank_connection;
 	bool vblank ();
@@ -515,6 +538,7 @@ class Push2 : public ARDOUR::ControlProtocol
 
 	mutable Glib::Threads::Mutex layout_lock;
 	Push2Layout* _current_layout;
+	Push2Layout* _previous_layout;
 	Push2Layout* mix_layout;
 	Push2Layout* scale_layout;
 	Push2Layout* track_mix_layout;
@@ -545,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;
@@ -560,7 +583,7 @@ class Push2 : public ARDOUR::ControlProtocol
 
 	/* color map (device side) */
 
-	typedef std::map<uint32_t,uint8_t> ColorMap;
+	typedef std::map<Gtkmm2ext::Color,uint8_t> ColorMap;
 	typedef std::stack<uint8_t> ColorMapFreeList;
 	ColorMap color_map;
 	ColorMapFreeList color_map_free_list;
@@ -568,12 +591,18 @@ class Push2 : public ARDOUR::ControlProtocol
 
 	/* our own colors */
 
-	typedef std::map<ColorName,uint32_t> Colors;
+	typedef std::map<ColorName,Gtkmm2ext::Color> Colors;
 	Colors colors;
 	void fill_color_table ();
+	void reset_pad_colors ();
 
 	PressureMode _pressure_mode;
 	void request_pressure_mode ();
+
+	uint8_t selection_color;
+	uint8_t contrast_color;
+
+	bool in_range_select;
 };
 
 } /* namespace */