X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.cc;h=e04f86aa95679e7f81afd43f61f82540ef22068b;hb=2e27e21d3a09889311e18a8efe11abcaa6d9c8b3;hp=3da5f11f1062f2c2227b398f767a269425eb8283;hpb=5f15bc9f9fe8decfab02db7821b7b15e1d7d95ac;p=ardour.git diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 3da5f11f10..e04f86aa95 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -46,6 +46,9 @@ #include "ardour/midi_source.h" #include "ardour/midi_track.h" #include "ardour/operations.h" +#include "ardour/pannable.h" +#include "ardour/panner.h" +#include "ardour/panner_shell.h" #include "ardour/playlist.h" #include "ardour/region.h" #include "ardour/region_factory.h" @@ -60,8 +63,6 @@ #include "ardour_button.h" #include "automation_line.h" #include "automation_time_axis.h" -#include "canvas-note-event.h" -#include "canvas_impl.h" #include "editor.h" #include "enums.h" #include "ghostregion.h" @@ -82,8 +83,8 @@ #include "rgb_macros.h" #include "selection.h" #include "step_editor.h" -#include "simplerect.h" #include "utils.h" +#include "note_base.h" #include "ardour/midi_track.h" @@ -99,7 +100,7 @@ using namespace Editing; static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 140; static const uint32_t KEYBOARD_MIN_HEIGHT = 130; -MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, Canvas& canvas) +MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas) : AxisView(sess) // virtually inherited , RouteTimeAxisView(ed, sess, canvas) , _ignore_signals(false) @@ -164,7 +165,17 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) controls_ebox.set_name ("MidiBusControlsBaseUnselected"); } + /* if set_state above didn't create a gain automation child, we need to make one */ + if (automation_child (GainAutomation) == 0) { + create_automation_child (GainAutomation, false); + } + + if (_route->panner_shell()) { + _route->panner_shell()->Changed.connect (*this, invalidator (*this), boost::bind (&MidiTimeAxisView::ensure_pan_views, this, false), gui_context()); + } + /* map current state of the route */ + ensure_pan_views (false); processors_changed (RouteProcessorChange ()); @@ -314,7 +325,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) if (!color_mode.empty()) { _color_mode = ColorMode (string_2_enum(color_mode, _color_mode)); if (_channel_selector && _color_mode == ChannelColors) { - _channel_selector->set_channel_colors(CanvasNoteEvent::midi_channel_colors); + _channel_selector->set_channel_colors(NoteBase::midi_channel_colors); } } @@ -511,7 +522,7 @@ MidiTimeAxisView::toggle_channel_selector () _channel_selector = new MidiChannelSelectorWindow (midi_track()); if (_color_mode == ChannelColors) { - _channel_selector->set_channel_colors(CanvasNoteEvent::midi_channel_colors); + _channel_selector->set_channel_colors(NoteBase::midi_channel_colors); } else { _channel_selector->set_default_channel_color (); } @@ -582,6 +593,27 @@ MidiTimeAxisView::build_automation_action_menu (bool for_selection) MenuElem (string_compose ("%1", _("No MIDI Channels selected")))); dynamic_cast (automation_items.back().get_child())->set_use_markup (true); } + + automation_items.push_back (SeparatorElem()); + automation_items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &MidiTimeAxisView::update_gain_track_visibility))); + gain_automation_item = dynamic_cast (&automation_items.back ()); + gain_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && + (gain_track && string_is_affirmative (gain_track->gui_property ("visible")))); + + _main_automation_menu_map[Evoral::Parameter(GainAutomation)] = gain_automation_item; + + if (!pan_tracks.empty()) { + automation_items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &MidiTimeAxisView::update_pan_track_visibility))); + pan_automation_item = dynamic_cast (&automation_items.back ()); + pan_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && + (!pan_tracks.empty() && string_is_affirmative (pan_tracks.front()->gui_property ("visible")))); + + set const & params = _route->pannable()->what_can_be_automated (); + for (set::iterator p = params.begin(); p != params.end(); ++p) { + _main_automation_menu_map[*p] = pan_automation_item; + } + } + } void @@ -738,7 +770,7 @@ MidiTimeAxisView::add_single_channel_controller_item(Menu_Helpers::MenuList& ctl } } - Gtk::CheckMenuItem* cmi = static_cast(&ctl_items.back()); + Gtk::CheckMenuItem* cmi = static_cast(&ctl_items.back()); _controller_menu_map[fully_qualified_param] = cmi; cmi->set_active (visible); @@ -794,7 +826,7 @@ MidiTimeAxisView::add_multi_channel_controller_item(Menu_Helpers::MenuList& ctl_ } } - Gtk::CheckMenuItem* cmi = static_cast(&chn_items.back()); + Gtk::CheckMenuItem* cmi = static_cast(&chn_items.back()); _controller_menu_map[fully_qualified_param] = cmi; cmi->set_active (visible); } @@ -1034,7 +1066,7 @@ MidiTimeAxisView::set_color_mode (ColorMode mode, bool force, bool redisplay, bo if (_channel_selector) { if (mode == ChannelColors) { - _channel_selector->set_channel_colors(CanvasNoteEvent::midi_channel_colors); + _channel_selector->set_channel_colors(NoteBase::midi_channel_colors); } else { _channel_selector->set_default_channel_color(); } @@ -1073,6 +1105,94 @@ MidiTimeAxisView::update_range() } } +void +MidiTimeAxisView::ensure_pan_views (bool show) +{ + bool changed = false; + for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { + changed = true; + (*i)->set_marked_for_display (false); + } + if (changed) { + _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ + } + pan_tracks.clear(); + + if (!_route->panner()) { + return; + } + + set params = _route->panner()->what_can_be_automated(); + set::iterator p; + + for (p = params.begin(); p != params.end(); ++p) { + boost::shared_ptr pan_control = _route->pannable()->automation_control(*p); + + if (pan_control->parameter().type() == NullAutomation) { + error << "Pan control has NULL automation type!" << endmsg; + continue; + } + + if (automation_child (pan_control->parameter ()).get () == 0) { + + /* we don't already have an AutomationTimeAxisView for this parameter */ + + std::string const name = _route->panner()->describe_parameter (pan_control->parameter ()); + + boost::shared_ptr t ( + new AutomationTimeAxisView (_session, + _route, + _route->pannable(), + pan_control, + pan_control->parameter (), + _editor, + *this, + false, + parent_canvas, + name) + ); + + pan_tracks.push_back (t); + add_automation_child (*p, t, show); + } else { + pan_tracks.push_back (automation_child (pan_control->parameter ())); + } + } +} + +void +MidiTimeAxisView::update_gain_track_visibility () +{ + bool const showit = gain_automation_item->get_active(); + + if (showit != string_is_affirmative (gain_track->gui_property ("visible"))) { + gain_track->set_marked_for_display (showit); + + /* now trigger a redisplay */ + + if (!no_redraw) { + _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ + } + } +} + +void +MidiTimeAxisView::update_pan_track_visibility () +{ + bool const showit = pan_automation_item->get_active(); + bool changed = false; + + for (list >::iterator i = pan_tracks.begin(); i != pan_tracks.end(); ++i) { + if ((*i)->set_marked_for_display (showit)) { + changed = true; + } + } + + if (changed) { + _route->gui_changed (X_("visible_tracks"), (void *) 0); /* EMIT_SIGNAL */ + } +} + void MidiTimeAxisView::show_all_automation (bool apply_to_selection) { @@ -1179,6 +1299,12 @@ MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool add_automation_child (param, track, show); break; + case PanWidthAutomation: + case PanElevationAutomation: + case PanAzimuthAutomation: + ensure_pan_views (show); + break; + default: error << "MidiTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg;