X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.cc;h=57cde4af0dd43f57ae6e6dc8cb41fe7e6b7f0b99;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=304593227cc6de9aa5ff23cebaab3cbdeab7828f;hpb=51f4e33dd105ace7035ace239abed78a86919020;p=ardour.git diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 304593227c..57cde4af0d 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -60,7 +60,6 @@ #include "ardour/track.h" #include "ardour/types.h" -#include "ardour_ui.h" #include "ardour_button.h" #include "automation_line.h" #include "automation_time_axis.h" @@ -84,12 +83,13 @@ #include "rgb_macros.h" #include "selection.h" #include "step_editor.h" +#include "tooltips.h" #include "utils.h" #include "note_base.h" #include "ardour/midi_track.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; @@ -104,8 +104,8 @@ static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 160; static const uint32_t KEYBOARD_MIN_HEIGHT = 130; MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas) - : AxisView(sess) // virtually inherited - , RouteTimeAxisView(ed, sess, canvas) + : SessionHandlePtr (sess) + , RouteTimeAxisView (ed, sess, canvas) , _ignore_signals(false) , _range_scroomer(0) , _piano_roll_header(0) @@ -121,13 +121,20 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanva , controller_menu (0) , _step_editor (0) { + _midnam_model_selector.disable_scrolling(); + _midnam_custom_device_mode_selector.disable_scrolling(); +} + +void +MidiTimeAxisView::set_note_highlight (uint8_t note) { + _piano_roll_header->set_note_highlight (note); } void MidiTimeAxisView::set_route (boost::shared_ptr rt) { _route = rt; - + _view = new MidiStreamView (*this); if (is_track ()) { @@ -162,12 +169,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) ignore_toggle = false; if (is_midi_track()) { - controls_ebox.set_name ("MidiTimeAxisViewControlsBaseUnselected"); - time_axis_frame.set_name ("MidiTimeAxisViewControlsBaseUnselected"); _note_mode = midi_track()->note_mode(); - } else { // MIDI bus (which doesn't exist yet..) - controls_ebox.set_name ("MidiBusControlsBaseUnselected"); - time_axis_frame.set_name ("MidiBusControlsBaseUnselected"); } /* if set_state above didn't create a gain automation child, we need to make one */ @@ -186,7 +188,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) /* map current state of the route */ ensure_pan_views (false); - + update_control_names(); processors_changed (RouteProcessorChange ()); _route->processors_changed.connect (*this, invalidator (*this), @@ -231,11 +233,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) time_axis_hbox.pack_end(*v, false, false, 0); midi_scroomer_size_group->add_widget (*v); - controls_ebox.set_name ("MidiTrackControlsBaseUnselected"); - time_axis_frame.set_name ("MidiTrackControlsBaseUnselected"); - controls_base_selected_name = "MidiTrackControlsBaseSelected"; - controls_base_unselected_name = "MidiTrackControlsBaseUnselected"; - midi_view()->NoteRangeChanged.connect ( sigc::mem_fun(*this, &MidiTimeAxisView::update_range)); @@ -243,18 +240,22 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) _view->RegionViewAdded.connect ( sigc::mem_fun(*this, &MidiTimeAxisView::region_view_added)); - midi_track()->PlaybackChannelModeChanged.connect (*this, invalidator (*this), - boost::bind (&MidiTimeAxisView::playback_channel_mode_changed, this), - gui_context()); - midi_track()->PlaybackChannelMaskChanged.connect (*this, invalidator (*this), - boost::bind (&MidiTimeAxisView::playback_channel_mode_changed, this), - gui_context()); - midi_track()->CaptureChannelModeChanged.connect (*this, invalidator (*this), - boost::bind (&MidiTimeAxisView::capture_channel_mode_changed, this), - gui_context()); - midi_track()->CaptureChannelMaskChanged.connect (*this, invalidator (*this), - boost::bind (&MidiTimeAxisView::capture_channel_mode_changed, this), - gui_context()); + midi_track()->playback_filter().ChannelModeChanged.connect ( + *this, invalidator (*this), + boost::bind (&MidiTimeAxisView::playback_channel_mode_changed, this), + gui_context()); + midi_track()->playback_filter().ChannelMaskChanged.connect ( + *this, invalidator (*this), + boost::bind (&MidiTimeAxisView::playback_channel_mode_changed, this), + gui_context()); + midi_track()->capture_filter().ChannelModeChanged.connect ( + *this, invalidator (*this), + boost::bind (&MidiTimeAxisView::capture_channel_mode_changed, this), + gui_context()); + midi_track()->capture_filter().ChannelMaskChanged.connect ( + *this, invalidator (*this), + boost::bind (&MidiTimeAxisView::capture_channel_mode_changed, this), + gui_context()); playback_channel_mode_changed (); capture_channel_mode_changed (); @@ -302,19 +303,19 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) } } - ARDOUR_UI::instance()->set_tip (_midnam_model_selector, _("External MIDI Device")); - ARDOUR_UI::instance()->set_tip (_midnam_custom_device_mode_selector, _("External Device Mode")); + set_tooltip (_midnam_model_selector, _("External MIDI Device")); + set_tooltip (_midnam_custom_device_mode_selector, _("External Device Mode")); _midi_controls_box.set_homogeneous(false); _midi_controls_box.set_border_width (2); _channel_status_box.set_homogeneous (false); _channel_status_box.set_spacing (4); - + ArdourButton *channel_selector_button = manage (new ArdourButton(_("Chns"))); channel_selector_button->set_name ("route button"); - ARDOUR_UI::instance()->set_tip (channel_selector_button, _("Click to edit channel settings")); - + set_tooltip (channel_selector_button, _("Click to edit channel settings")); + // Insert expanding space labels to get full width justification _channel_status_box.pack_start (_playback_channel_status, false, false, 2); _channel_status_box.pack_start (*Gtk::manage(new Gtk::Label(" ")), true, true); @@ -324,7 +325,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) _channel_status_box.show_all (); channel_selector_button->signal_clicked.connect (sigc::mem_fun (*this, &MidiTimeAxisView::toggle_channel_selector)); - + _midi_controls_box.pack_start (_channel_status_box, false, false, 10); if (!patch_manager.all_models().empty()) { @@ -335,7 +336,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) _midnam_custom_device_mode_selector.show (); _midi_controls_box.pack_start (_midnam_custom_device_mode_selector, false, false, 2); - } + } model_changed(gui_property(X_("midnam-model-name"))); custom_device_mode_changed(gui_property(X_("midnam-custom-device-mode"))); @@ -467,14 +468,14 @@ MidiTimeAxisView::midi_view() } void -MidiTimeAxisView::set_height (uint32_t h) +MidiTimeAxisView::set_height (uint32_t h, TrackHeightMode m) { if (h >= MIDI_CONTROLS_BOX_MIN_HEIGHT) { _midi_controls_box.show (); } else { _midi_controls_box.hide(); } - + if (h >= KEYBOARD_MIN_HEIGHT) { if (is_track() && _range_scroomer) { _range_scroomer->show(); @@ -496,7 +497,7 @@ MidiTimeAxisView::set_height (uint32_t h) which needs to know if we have just shown or hidden a scroomer / piano roll. */ - RouteTimeAxisView::set_height (h); + RouteTimeAxisView::set_height (h, m); } void @@ -513,7 +514,7 @@ MidiTimeAxisView::append_extra_display_menu_items () range_items.push_back ( MenuElem (_("Show Full Range"), - sigc::bind (sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range), + sigc::bind (sigc::mem_fun(*this, &MidiTimeAxisView::set_note_range), MidiStreamView::FullRange, true))); range_items.push_back ( @@ -530,7 +531,7 @@ MidiTimeAxisView::append_extra_display_menu_items () if (color_mode_menu) { items.push_back (MenuElem (_("Color Mode"), *color_mode_menu)); } - + items.push_back (SeparatorElem ()); } @@ -912,7 +913,7 @@ MidiTimeAxisView::build_controller_menu () l != device_names->controls().end(); ++l) { boost::shared_ptr name_list = l->second; Menu* ctl_menu = NULL; - + for (ControlNameList::Controls::const_iterator c = name_list->controls().begin(); c != name_list->controls().end();) { const uint16_t ctl = c->second->number(); @@ -922,7 +923,7 @@ MidiTimeAxisView::build_controller_menu () /* Create a new submenu */ ctl_menu = manage (new Menu); } - + MenuList& ctl_items (ctl_menu->items()); if (chn_cnt > 1) { add_multi_channel_controller_item(ctl_items, ctl, c->second->name()); @@ -1060,7 +1061,7 @@ MidiTimeAxisView::set_color_mode (ColorMode mode, bool force, bool redisplay, bo if (_color_mode == mode && !force) { return; } - + if (_channel_selector) { if (mode == ChannelColors) { _channel_selector->set_channel_colors(NoteBase::midi_channel_colors); @@ -1068,7 +1069,7 @@ MidiTimeAxisView::set_color_mode (ColorMode mode, bool force, bool redisplay, bo _channel_selector->set_default_channel_color(); } } - + _color_mode = mode; set_gui_property ("color-mode", enum_2_string(_color_mode)); if (redisplay) { @@ -1276,32 +1277,37 @@ void MidiTimeAxisView::route_active_changed () { RouteUI::route_active_changed (); + update_control_names(); +} +void +MidiTimeAxisView::update_control_names () +{ if (is_track()) { if (_route->active()) { - controls_ebox.set_name ("MidiTrackControlsBaseUnselected"); - time_axis_frame.set_name ("MidiTrackControlsBaseUnselected"); controls_base_selected_name = "MidiTrackControlsBaseSelected"; controls_base_unselected_name = "MidiTrackControlsBaseUnselected"; } else { - controls_ebox.set_name ("MidiTrackControlsBaseInactiveUnselected"); - time_axis_frame.set_name ("MidiTrackControlsBaseInactiveUnselected"); controls_base_selected_name = "MidiTrackControlsBaseInactiveSelected"; controls_base_unselected_name = "MidiTrackControlsBaseInactiveUnselected"; } - } else { + } else { // MIDI bus (which doesn't exist yet..) if (_route->active()) { - controls_ebox.set_name ("BusControlsBaseUnselected"); - time_axis_frame.set_name ("BusControlsBaseUnselected"); controls_base_selected_name = "BusControlsBaseSelected"; controls_base_unselected_name = "BusControlsBaseUnselected"; } else { - controls_ebox.set_name ("BusControlsBaseInactiveUnselected"); - time_axis_frame.set_name ("BusControlsBaseInactiveUnselected"); controls_base_selected_name = "BusControlsBaseInactiveSelected"; controls_base_unselected_name = "BusControlsBaseInactiveUnselected"; } } + + if (selected()) { + controls_ebox.set_name (controls_base_selected_name); + time_axis_frame.set_name (controls_base_selected_name); + } else { + controls_ebox.set_name (controls_base_unselected_name); + time_axis_frame.set_name (controls_base_unselected_name); + } } void @@ -1309,7 +1315,7 @@ MidiTimeAxisView::set_note_selection (uint8_t note) { uint16_t chn_mask = midi_track()->get_playback_channel_mask(); - _editor.begin_reversible_selection_op(_("Set Note Selection")); + _editor.begin_reversible_selection_op (X_("Set Note Selection")); if (_view->num_selected_regionviews() == 0) { _view->foreach_regionview ( @@ -1329,7 +1335,7 @@ MidiTimeAxisView::add_note_selection (uint8_t note) { const uint16_t chn_mask = midi_track()->get_playback_channel_mask(); - _editor.begin_reversible_selection_op(_("Add Note Selection")); + _editor.begin_reversible_selection_op (X_("Add Note Selection")); if (_view->num_selected_regionviews() == 0) { _view->foreach_regionview ( @@ -1349,7 +1355,7 @@ MidiTimeAxisView::extend_note_selection (uint8_t note) { const uint16_t chn_mask = midi_track()->get_playback_channel_mask(); - _editor.begin_reversible_selection_op(_("Extend Note Selection")); + _editor.begin_reversible_selection_op (X_("Extend Note Selection")); if (_view->num_selected_regionviews() == 0) { _view->foreach_regionview ( @@ -1369,7 +1375,7 @@ MidiTimeAxisView::toggle_note_selection (uint8_t note) { const uint16_t chn_mask = midi_track()->get_playback_channel_mask(); - _editor.begin_reversible_selection_op(_("Toggle Note Selection")); + _editor.begin_reversible_selection_op (X_("Toggle Note Selection")); if (_view->num_selected_regionviews() == 0) { _view->foreach_regionview ( @@ -1502,11 +1508,12 @@ MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param) } boost::shared_ptr -MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit) +MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit, const int32_t sub_num) { Editor* real_editor = dynamic_cast (&_editor); - - real_editor->begin_reversible_command (Operations::create_region); + if (commit) { + real_editor->begin_reversible_command (Operations::create_region); + } playlist()->clear_changes (); real_editor->snap_to (pos, RoundNearest); @@ -1519,8 +1526,9 @@ MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit) plist.add (ARDOUR::Properties::name, PBD::basename_nosuffix(src->name())); boost::shared_ptr region = (RegionFactory::create (src, plist)); - - playlist()->add_region (region, pos); + /* sets beat position */ + region->set_position (pos, sub_num); + playlist()->add_region (region, pos, 1.0, false, sub_num); _session->add_command (new StatefulDiffCommand (playlist())); if (commit) { @@ -1627,12 +1635,12 @@ MidiTimeAxisView::capture_channel_mode_changed () } bool -MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx) +MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { if (!_editor.internal_editing()) { // Non-internal paste, paste regions like any other route - return RouteTimeAxisView::paste(pos, selection, ctx); + return RouteTimeAxisView::paste(pos, selection, ctx, sub_num); } - return midi_view()->paste(pos, selection, ctx); + return midi_view()->paste(pos, selection, ctx, sub_num); }