X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=a75c9654133ab4acc5c99e601bdd47770679030a;hb=d9dc2592d02924718d9f181dbbca423a5eac364f;hp=f9b81470d086cc0d1ec6899e04ab04c63e0b3f29;hpb=91fac4c96dc6210dcc056da70dc608700d7eb570;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index f9b81470d0..a75c965413 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -45,6 +45,7 @@ namespace MIDI {
 namespace Name {
 class MasterDeviceNames;
 class CustomDeviceMode;
+struct PatchPrimaryKey;
 }
 }
 
@@ -68,6 +69,8 @@ class StepEntry;
 class StepEditor;
 class MidiChannelSelectorWindow;
 
+#define NO_MIDI_NOTE 0xff
+
 class MidiTimeAxisView : public RouteTimeAxisView
 {
 public:
@@ -80,13 +83,13 @@ public:
 
 	void set_height (uint32_t, TrackHeightMode m = OnlySelf);
 
-	boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool);
+	boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool, const int32_t sub_num);
 
 	void show_all_automation (bool apply_to_selection = false);
 	void show_existing_automation (bool apply_to_selection = false);
 	void create_automation_child (const Evoral::Parameter& param, bool show);
 
-	bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx);
+	bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num);
 
 	ARDOUR::NoteMode  note_mode() const { return _note_mode; }
 	ARDOUR::ColorMode color_mode() const { return _color_mode; }
@@ -102,6 +105,7 @@ public:
 	void check_step_edit ();
 
 	void first_idle ();
+	void set_note_highlight (uint8_t note);
 
 	uint8_t get_channel_for_add () const;
 
@@ -110,10 +114,20 @@ public:
 protected:
 	void start_step_editing ();
 	void stop_step_editing ();
+	void processors_changed (ARDOUR::RouteProcessorChange);
 
 private:
 	sigc::signal<void, std::string, std::string>  _midi_patch_settings_changed;
 
+	void setup_midnam_patches ();
+	void update_patch_selector ();
+	void drop_instrument_ref ();
+	PBD::ScopedConnectionList midnam_connection;
+
+	void start_scroomer_update ();
+	void stop_scroomer_update ();
+	sigc::connection _note_range_changed_connection;
+
 	void model_changed(const std::string& model);
 	void custom_device_mode_changed(const std::string& mode);
 
@@ -121,15 +135,19 @@ private:
 	void build_automation_action_menu (bool);
 	Gtk::Menu* build_note_mode_menu();
 	Gtk::Menu* build_color_mode_menu();
+	Gtk::Menu* build_patch_menu();
 
 	void set_note_mode (ARDOUR::NoteMode mode, bool apply_to_selection = false);
 	void set_color_mode (ARDOUR::ColorMode, bool force = false, bool redisplay = true, bool apply_to_selection = false);
 	void set_note_range (MidiStreamView::VisibleNoteRange range, bool apply_to_selection = false);
+	void on_patch_menu_selected (int chn, const MIDI::Name::PatchPrimaryKey& key);
 
 	void route_active_changed ();
 	void note_range_changed ();
 	void contents_height_changed ();
 
+	void update_control_names ();
+
 	bool                         _ignore_signals;
 	MidiScroomer*                _range_scroomer;
 	PianoRollHeader*             _piano_roll_header;
@@ -140,9 +158,6 @@ private:
 	Gtk::RadioMenuItem*          _meter_color_mode_item;
 	Gtk::RadioMenuItem*          _channel_color_mode_item;
 	Gtk::RadioMenuItem*          _track_color_mode_item;
-	Gtk::Label                   _playback_channel_status;
-	Gtk::Label                   _capture_channel_status;
-	Gtk::HBox                    _channel_status_box;
 	Gtk::VBox                    _midi_controls_box;
 	MidiChannelSelectorWindow*   _channel_selector;
 	ArdourDropdown               _midnam_model_selector;
@@ -156,6 +171,7 @@ private:
 	void add_channel_command_menu_item (Gtk::Menu_Helpers::MenuList& items, const std::string& label, ARDOUR::AutomationType auto_type, uint8_t cmd);
 
 	Gtk::Menu* controller_menu;
+	Gtk::Menu* poly_pressure_menu;
 
 	void add_single_channel_controller_item (Gtk::Menu_Helpers::MenuList& ctl_items, int ctl, const std::string& name);
 	void add_multi_channel_controller_item (Gtk::Menu_Helpers::MenuList& ctl_items, int ctl, const std::string& name);
@@ -182,9 +198,6 @@ private:
 	ParameterMenuMap _controller_menu_map;
 
 	StepEditor* _step_editor;
-
-	void capture_channel_mode_changed();
-	void playback_channel_mode_changed();
 };
 
 #endif /* __ardour_midi_time_axis_h__ */