X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmidi_time_axis.h;h=ebc51b14278a53bcd83c918be5161b7ae7502c96;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=c99ab68851ac4cbe1d007e27acea6de431825d02;hpb=0f72ea4a349480cf1272571395f63c10b6152b4f;p=ardour.git diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h index c99ab68851..ebc51b1427 100644 --- a/gtk2_ardour/midi_time_axis.h +++ b/gtk2_ardour/midi_time_axis.h @@ -34,6 +34,7 @@ #include "ardour/region.h" #include "ardour_dialog.h" +#include "ardour_dropdown.h" #include "route_ui.h" #include "enums.h" #include "route_time_axis.h" @@ -74,9 +75,6 @@ class MidiTimeAxisView : public RouteTimeAxisView void set_height (uint32_t); - void enter_internal_edit_mode (); - void leave_internal_edit_mode (); - boost::shared_ptr add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool); void show_all_automation (bool apply_to_selection = false); @@ -107,8 +105,8 @@ class MidiTimeAxisView : public RouteTimeAxisView private: sigc::signal _midi_patch_settings_changed; - void model_changed(); - void custom_device_mode_changed(); + void model_changed(const std::string& model); + void custom_device_mode_changed(const std::string& mode); void append_extra_display_menu_items (); void build_automation_action_menu (bool); @@ -138,8 +136,8 @@ class MidiTimeAxisView : public RouteTimeAxisView Gtk::HBox _channel_status_box; Gtk::VBox _midi_controls_box; MidiChannelSelectorWindow* _channel_selector; - Gtk::ComboBoxText _midnam_model_selector; - Gtk::ComboBoxText _midnam_custom_device_mode_selector; + ArdourDropdown _midnam_model_selector; + ArdourDropdown _midnam_custom_device_mode_selector; Gtk::CheckMenuItem* _step_edit_item; Gtk::Menu* default_channel_menu;