X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.h;h=f9b81470d086cc0d1ec6899e04ab04c63e0b3f29;hb=8505c16057a074531a99728e730408151d7aafa4;hp=87619799478f1f16a9d49f969b78c8a4650987c2;hpb=add52f1c0ef787a580c44d719bc6e4c9c5ae09a4;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 8761979947..f9b81470d0 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -19,6 +19,8 @@
 #ifndef __ardour_midi_time_axis_h__
 #define __ardour_midi_time_axis_h__
 
+#include <list>
+
 #include <gtkmm/table.h>
 #include <gtkmm/button.h>
 #include <gtkmm/box.h>
@@ -27,19 +29,24 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/checkmenuitem.h>
 
-#include <gtkmm2ext/selector.h>
-#include <list>
+#include "gtkmm2ext/selector.h"
 
 #include "ardour/types.h"
 #include "ardour/region.h"
 
 #include "ardour_dialog.h"
+#include "ardour_dropdown.h"
 #include "route_ui.h"
 #include "enums.h"
 #include "route_time_axis.h"
-#include "canvas.h"
 #include "midi_streamview.h"
-#include "midi_channel_selector.h"
+
+namespace MIDI {
+namespace Name {
+class MasterDeviceNames;
+class CustomDeviceMode;
+}
+}
 
 namespace ARDOUR {
 	class Session;
@@ -49,27 +56,29 @@ namespace ARDOUR {
 	class MidiPlaylist;
 }
 
+namespace Evoral {
+	template<typename Time> class Note;
+}
+
 class PublicEditor;
 class MidiStreamView;
 class MidiScroomer;
 class PianoRollHeader;
 class StepEntry;
 class StepEditor;
+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>);
 
 	MidiStreamView* midi_view();
 
-	void set_height (uint32_t);
-
-        void enter_internal_edit_mode ();
-        void leave_internal_edit_mode ();
+	void set_height (uint32_t, TrackHeightMode m = OnlySelf);
 
 	boost::shared_ptr<ARDOUR::MidiRegion> add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool);
 
@@ -77,35 +86,36 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	void show_existing_automation (bool apply_to_selection = false);
 	void create_automation_child (const Evoral::Parameter& param, bool show);
 
+	bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx);
+
 	ARDOUR::NoteMode  note_mode() const { return _note_mode; }
 	ARDOUR::ColorMode color_mode() const { return _color_mode; }
 
-	void update_range();
-
-	sigc::signal<void, ARDOUR::ChannelMode, uint16_t>& signal_channel_mode_changed() {
-		return _channel_selector.mode_changed;
-	}
+	boost::shared_ptr<MIDI::Name::MasterDeviceNames> get_device_names();
+	boost::shared_ptr<MIDI::Name::CustomDeviceMode> get_device_mode();
 
-	const MidiMultipleChannelSelector& channel_selector() { return _channel_selector; }
+	void update_range();
 
 	Gtk::CheckMenuItem* automation_child_menu_item (Evoral::Parameter);
 
-        StepEditor* step_editor() { return _step_editor; }
-        void check_step_edit ();
+	StepEditor* step_editor() { return _step_editor; }
+	void check_step_edit ();
 
 	void first_idle ();
 
 	uint8_t get_channel_for_add () const;
 
-  protected:
+	void get_per_region_note_selection (std::list<std::pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > >&);
+
+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);
@@ -130,10 +140,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::VBox                    _midi_controls_box;
-	MidiMultipleChannelSelector  _channel_selector;
-	Gtk::ComboBoxText            _model_selector;
-	Gtk::ComboBoxText            _custom_device_mode_selector;
+	MidiChannelSelectorWindow*   _channel_selector;
+	ArdourDropdown               _midnam_model_selector;
+	ArdourDropdown               _midnam_custom_device_mode_selector;
 
 	Gtk::CheckMenuItem*          _step_edit_item;
 	Gtk::Menu*                    default_channel_menu;
@@ -143,7 +156,12 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	void add_channel_command_menu_item (Gtk::Menu_Helpers::MenuList& items, const std::string& label, ARDOUR::AutomationType auto_type, uint8_t cmd);
 
 	Gtk::Menu* controller_menu;
+
+	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 set_channel_mode (ARDOUR::ChannelMode, uint16_t);
 
 	void set_note_selection (uint8_t note);
@@ -154,6 +172,7 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	void add_note_selection_region_view (RegionView* rv, uint8_t note, uint16_t chn_mask);
 	void extend_note_selection_region_view (RegionView*, uint8_t note, uint16_t chn_mask);
 	void toggle_note_selection_region_view (RegionView*, uint8_t note, uint16_t chn_mask);
+	void get_per_region_note_selection_region_view (RegionView*, std::list<std::pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > >&);
 
 	void ensure_step_editor ();
 
@@ -162,8 +181,10 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	/** parameter -> menu item map for the controller menu */
 	ParameterMenuMap _controller_menu_map;
 
-        StepEditor* _step_editor;
+	StepEditor* _step_editor;
+
+	void capture_channel_mode_changed();
+	void playback_channel_mode_changed();
 };
 
 #endif /* __ardour_midi_time_axis_h__ */
-