summaryrefslogtreecommitdiff
path: root/gtk2_ardour/midi_time_axis.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-20 00:46:55 +0000
committerDavid Robillard <d@drobilla.net>2013-01-20 00:46:55 +0000
commit88de45b7ccc933ee46a13d4e4e21caf9e5fb379e (patch)
tree5e72e7caa7b88b8d29e8dad226c317fc8e31d3bb /gtk2_ardour/midi_time_axis.h
parent448c156b4bac6204dd6b627b07b226f63f1301b4 (diff)
Support note names from midnam files (tested with the DM5).
Do this via a simple MasterDeviceNames::note_name() function. The same really needs to be done for program names, this stuff is absolutely brutal to use. Store note names in a vector indexed by number instead of a list with string "numbers" for reasonable lookup time. Make some references const that should be. git-svn-id: svn://localhost/ardour2/branches/3.0@13908 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_time_axis.h')
-rw-r--r--gtk2_ardour/midi_time_axis.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 635d529d34..d61b64f36c 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -80,6 +80,9 @@ class MidiTimeAxisView : public RouteTimeAxisView
ARDOUR::NoteMode note_mode() const { return _note_mode; }
ARDOUR::ColorMode color_mode() const { return _color_mode; }
+ boost::shared_ptr<MIDI::Name::MasterDeviceNames> get_device_names();
+ boost::shared_ptr<MIDI::Name::CustomDeviceMode> get_device_mode();
+
void update_range();
sigc::signal<void, ARDOUR::ChannelMode, uint16_t>& signal_channel_mode_changed() {
@@ -112,8 +115,6 @@ class MidiTimeAxisView : public RouteTimeAxisView
Gtk::Menu* build_note_mode_menu();
Gtk::Menu* build_color_mode_menu();
- boost::shared_ptr<MIDI::Name::MasterDeviceNames> get_device_names(const std::string& model);
-
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);