X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=c99ab68851ac4cbe1d007e27acea6de431825d02;hb=23c0452e052fbfb4e2711ef70912f35805f017d5;hp=e021e3876941db9089f411a0fbcc6bb367a05ef0;hpb=f00b3b7f111e36537d773daef0ae77b03d11f82f;p=ardour.git diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h index e021e38769..c99ab68851 100644 --- a/gtk2_ardour/midi_time_axis.h +++ b/gtk2_ardour/midi_time_axis.h @@ -64,9 +64,9 @@ class MidiChannelSelectorWindow; class MidiTimeAxisView : public RouteTimeAxisView { - public: - MidiTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas); - virtual ~MidiTimeAxisView (); + public: + MidiTimeAxisView (PublicEditor&, ARDOUR::Session*, ArdourCanvas::Canvas& canvas); + virtual ~MidiTimeAxisView (); void set_route (boost::shared_ptr); @@ -100,11 +100,11 @@ class MidiTimeAxisView : public RouteTimeAxisView uint8_t get_channel_for_add () const; - protected: + protected: void start_step_editing (); void stop_step_editing (); - private: + private: sigc::signal _midi_patch_settings_changed; void model_changed(); @@ -114,7 +114,7 @@ class MidiTimeAxisView : public RouteTimeAxisView void build_automation_action_menu (bool); Gtk::Menu* build_note_mode_menu(); Gtk::Menu* build_color_mode_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); @@ -133,10 +133,9 @@ class MidiTimeAxisView : public RouteTimeAxisView 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::Button _channel_selector_button; + Gtk::Label _playback_channel_status; + Gtk::Label _capture_channel_status; + Gtk::HBox _channel_status_box; Gtk::VBox _midi_controls_box; MidiChannelSelectorWindow* _channel_selector; Gtk::ComboBoxText _midnam_model_selector; @@ -154,8 +153,8 @@ class MidiTimeAxisView : public RouteTimeAxisView 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); void build_controller_menu (); - void toggle_channel_selector (); - void channel_selector_hidden (); + void toggle_channel_selector (); + void channel_selector_hidden (); void set_channel_mode (ARDOUR::ChannelMode, uint16_t); void set_note_selection (uint8_t note); @@ -176,9 +175,8 @@ class MidiTimeAxisView : public RouteTimeAxisView StepEditor* _step_editor; - void capture_channel_mode_changed(); - void playback_channel_mode_changed(); + void capture_channel_mode_changed(); + void playback_channel_mode_changed(); }; #endif /* __ardour_midi_time_axis_h__ */ -