Remove internal edit mode and add "content" tool.

[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 fa22b431a00471b78488322c48c01889244a7b0f..ebc51b14278a53bcd83c918be5161b7ae7502c96 100644 (file)
--- 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"
@@ -64,9 +65,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<ARDOUR::Route>);
 
@@ -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<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool);
 
        void show_all_automation (bool apply_to_selection = false);
@@ -100,21 +98,21 @@ 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<void, std::string, std::string>  _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);
        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,14 +131,13 @@ 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;
-       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;
@@ -154,8 +151,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,18 +173,8 @@ class MidiTimeAxisView : public RouteTimeAxisView
 
        StepEditor* _step_editor;
 
-        void capture_channel_mode_changed();
-        void playback_channel_mode_changed();
-
-       void ensure_pan_views (bool show = true);
-
-       void update_gain_track_visibility ();
-       void update_pan_track_visibility ();
-
-       Gtk::CheckMenuItem* gain_automation_item;
-       std::list<boost::shared_ptr<AutomationTimeAxisView> > pan_tracks;
-       Gtk::CheckMenuItem* pan_automation_item;
+       void capture_channel_mode_changed();
+       void playback_channel_mode_changed();
 };
 
 #endif /* __ardour_midi_time_axis_h__ */
-