amend be62d335ee

[ardour.git] / gtk2_ardour / midi_time_axis.h

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index fe8a464875a91b33e55d0581b0bf3cce0bd79f5d..c5627188539b06c53eca8f9e107a92164ada05c6 100644 (file)
--- 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;
 }
 }
 
@@ -82,7 +83,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);
@@ -123,6 +124,10 @@ private:
        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,6 +139,7 @@ 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 send_patch_change ();
 
        void route_active_changed ();
        void note_range_changed ();
@@ -151,9 +157,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;
@@ -194,9 +197,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__ */