X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=cbfc816c27e539c317e64e7c07a9cb7dc84b6d91;hb=6038ef44f9786b4b981760dcbcfd467ec8faf108;hp=fe8a464875a91b33e55d0581b0bf3cce0bd79f5d;hpb=9773cfa92645f8caf8aa524a5e7f45bb4d4d1b24;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index fe8a464875..cbfc816c27 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -29,13 +29,12 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/checkmenuitem.h>
 
-#include "gtkmm2ext/selector.h"
-
 #include "ardour/types.h"
 #include "ardour/region.h"
 
+#include "widgets/ardour_dropdown.h"
+
 #include "ardour_dialog.h"
-#include "ardour_dropdown.h"
 #include "route_ui.h"
 #include "enums.h"
 #include "route_time_axis.h"
@@ -45,6 +44,7 @@ namespace MIDI {
 namespace Name {
 class MasterDeviceNames;
 class CustomDeviceMode;
+struct PatchPrimaryKey;
 }
 }
 
@@ -82,7 +82,7 @@ public:
 
 	void set_height (uint32_t, TrackHeightMode m = OnlySelf);
 
-	boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool, const int32_t sub_num);
+	boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool);
 
 	void show_all_automation (bool apply_to_selection = false);
 	void show_existing_automation (bool apply_to_selection = false);
@@ -120,8 +120,10 @@ private:
 
 	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);
@@ -134,30 +136,26 @@ private:
 	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 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;
-	ARDOUR::NoteMode             _note_mode;
-	Gtk::RadioMenuItem*          _note_mode_item;
-	Gtk::RadioMenuItem*          _percussion_mode_item;
-	ARDOUR::ColorMode            _color_mode;
-	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;
-	ArdourDropdown               _midnam_custom_device_mode_selector;
+	bool                          _ignore_signals;
+	MidiScroomer*                 _range_scroomer;
+	PianoRollHeader*              _piano_roll_header;
+	ARDOUR::NoteMode              _note_mode;
+	Gtk::RadioMenuItem*           _note_mode_item;
+	Gtk::RadioMenuItem*           _percussion_mode_item;
+	ARDOUR::ColorMode             _color_mode;
+	Gtk::RadioMenuItem*           _meter_color_mode_item;
+	Gtk::RadioMenuItem*           _channel_color_mode_item;
+	Gtk::RadioMenuItem*           _track_color_mode_item;
+	Gtk::VBox                     _midi_controls_box;
+	MidiChannelSelectorWindow*    _channel_selector;
+	ArdourWidgets::ArdourDropdown _midnam_model_selector;
+	ArdourWidgets::ArdourDropdown _midnam_custom_device_mode_selector;
 
 	Gtk::CheckMenuItem*          _step_edit_item;
 	Gtk::Menu*                    default_channel_menu;
@@ -195,8 +193,7 @@ private:
 
 	StepEditor* _step_editor;
 
-	void capture_channel_mode_changed();
-	void playback_channel_mode_changed();
+	void immediate_patch_chnage_response (int response);
 };
 
 #endif /* __ardour_midi_time_axis_h__ */