X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=49c49a3734399723c44e7e110bc70b2e87fe6bbe;hb=9c4f5ac000ad91b55e4cf91317b7a89f6239870e;hp=27c99985742a2eb12050212e51aea7d5ec82024b;hpb=c899ba4368e61f31820a34c5e7c9a48345a364a2;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 27c9998574..49c49a3734 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -39,7 +39,6 @@ #include #include #include -#include #include #include @@ -253,10 +252,6 @@ RouteTimeAxisView::~RouteTimeAxisView () delete _view; _view = 0; - for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - delete i->second; - } - _automation_tracks.clear (); delete route_group_menu; @@ -269,6 +264,7 @@ RouteTimeAxisView::post_construct () update_diskstream_display (); + _subplugin_menu_map.clear (); subplugin_menu.items().clear (); _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu)); _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves)); @@ -396,6 +392,13 @@ RouteTimeAxisView::build_automation_action_menu () { using namespace Menu_Helpers; + /* detach subplugin_menu from automation_action_menu before we delete automation_action_menu, + otherwise bad things happen (see comment for similar case in MidiTimeAxisView::build_automation_action_menu) + */ + + detach_menu (subplugin_menu); + + _main_automation_menu_map.clear (); delete automation_action_menu; automation_action_menu = new Menu; @@ -411,11 +414,13 @@ RouteTimeAxisView::build_automation_action_menu () items.push_back (MenuElem (_("Hide All Automation"), sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation))); + + items.push_back (SeparatorElem ()); - /* attach the plugin submenu. It may have previously been used elsewhere, so we detach it first. */ + /* Attach the plugin submenu. It may have previously been used elsewhere, + so it was detached above */ - detach_menu (subplugin_menu); - items.push_back (MenuElem (_("Plugins"), subplugin_menu)); + items.push_back (MenuElem (_("Plugins"), subplugin_menu)); items.back().set_sensitive (!subplugin_menu.items().empty()); } @@ -433,7 +438,7 @@ RouteTimeAxisView::build_display_menu () MenuList& items = display_menu->items(); display_menu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Color"), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color))); + items.push_back (MenuElem (_("Color..."), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color))); items.push_back (SeparatorElem()); @@ -756,7 +761,7 @@ RouteTimeAxisView::set_height (uint32_t h) snprintf (buf, sizeof (buf), "%u", height); xml_node->add_property ("height", buf); - if (height >= hNormal) { + if (height >= preset_height (HeightNormal)) { reset_meter(); show_name_entry (); hide_name_label (); @@ -778,7 +783,7 @@ RouteTimeAxisView::set_height (uint32_t h) playlist_button.show(); } - } else if (height >= hSmaller) { + } else if (height >= preset_height (HeightSmaller)) { reset_meter(); show_name_entry (); @@ -1212,34 +1217,6 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list& return; } -bool -RouteTimeAxisView::show_automation(Evoral::Parameter param) -{ - return (_show_automation.find(param) != _show_automation.end()); -} - -/** Retuns 0 if track for \a param doesn't exist. - */ -RouteTimeAxisView::RouteAutomationNode* -RouteTimeAxisView::automation_track (Evoral::Parameter param) -{ - map::iterator i = _automation_tracks.find (param); - - if (i != _automation_tracks.end()) { - return i->second; - } else { - return 0; - } -} - -/** Shorthand for GainAutomation, etc. - */ -RouteTimeAxisView::RouteAutomationNode* -RouteTimeAxisView::automation_track (AutomationType type) -{ - return automation_track (Evoral::Parameter(type)); -} - RouteGroup* RouteTimeAxisView::route_group () const { @@ -1613,14 +1590,16 @@ RouteTimeAxisView::color_handler () void RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param) { - RouteAutomationNode* node = automation_track(param); + boost::shared_ptr track = automation_child (param); + Gtk::CheckMenuItem* menu = automation_child_menu_item (param); - if (!node) { + if (!track) { /* it doesn't exist yet, so we don't care about the button state: just add it */ create_automation_child (param, true); } else { - bool yn = node->menu_item->get_active(); - if (node->track->set_visibility (node->menu_item->get_active()) && yn) { + assert (menu); + bool yn = menu->get_active(); + if (track->set_visibility (menu->get_active()) && yn) { /* we made it visible, now trigger a redisplay. if it was hidden, then automation_track_hidden() will have done that for us. @@ -1636,19 +1615,20 @@ RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param) void RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param) { - RouteAutomationNode* ran = automation_track(param); + boost::shared_ptr track = automation_child (param); - if (!ran) { + if (!track) { return; } + Gtk::CheckMenuItem* menu = automation_child_menu_item (param); + // if Evoral::Parameter::operator< doesn't obey strict weak ordering, we may crash here.... - _show_automation.erase (param); - ran->track->get_state_node()->add_property (X_("shown"), X_("no")); + track->get_state_node()->add_property (X_("shown"), X_("no")); - if (ran->menu_item && !_hidden) { + if (menu && !_hidden) { ignore_toggle = true; - ran->menu_item->set_active (false); + menu->set_active (false); ignore_toggle = false; } @@ -1665,13 +1645,15 @@ RouteTimeAxisView::show_all_automation () /* Show our automation */ - map::iterator i; - for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - i->second->track->set_marked_for_display (true); - i->second->track->canvas_display()->show(); - i->second->track->get_state_node()->add_property ("shown", X_("yes")); - if (i->second->menu_item) { - i->second->menu_item->set_active(true); + for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + i->second->set_marked_for_display (true); + i->second->canvas_display()->show(); + i->second->get_state_node()->add_property ("shown", X_("yes")); + + Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); + + if (menu) { + menu->set_active(true); } } @@ -1702,13 +1684,16 @@ RouteTimeAxisView::show_existing_automation () /* Show our automation */ - map::iterator i; - for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - if (i->second->track->line() && i->second->track->line()->npoints() > 0) { - i->second->track->set_marked_for_display (true); - i->second->track->canvas_display()->show(); - i->second->track->get_state_node()->add_property ("shown", X_("yes")); - i->second->menu_item->set_active(true); + for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + if (i->second->has_automation()) { + i->second->set_marked_for_display (true); + i->second->canvas_display()->show(); + i->second->get_state_node()->add_property ("shown", X_("yes")); + + Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); + if (menu) { + menu->set_active(true); + } } } @@ -1735,12 +1720,15 @@ RouteTimeAxisView::hide_all_automation () /* Hide our automation */ - for (map::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - i->second->track->set_marked_for_display (false); - i->second->track->hide (); - i->second->track->get_state_node()->add_property ("shown", X_("no")); - if (i->second->menu_item) { - i->second->menu_item->set_active (false); + for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + i->second->set_marked_for_display (false); + i->second->hide (); + i->second->get_state_node()->add_property ("shown", X_("no")); + + Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); + + if (menu) { + menu->set_active (false); } } @@ -1752,8 +1740,6 @@ RouteTimeAxisView::hide_all_automation () } } - _show_automation.clear(); - no_redraw = false; _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } @@ -1947,14 +1933,10 @@ RouteTimeAxisView::add_automation_child (Evoral::Parameter param, boost::shared_ } } - _automation_tracks.insert (std::make_pair (param, new RouteAutomationNode(param, NULL, track))); + _automation_tracks[param] = track; track->set_visibility (!hideit); - if (!hideit) { - _show_automation.insert (param); - } - if (!no_redraw) { _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } @@ -2029,6 +2011,8 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr p items.push_back (CheckMenuElem (name)); mitem = dynamic_cast (&items.back()); + _subplugin_menu_map[*i] = mitem; + if (has_visible_automation.find((*i)) != has_visible_automation.end()) { mitem->set_active(true); } @@ -2108,6 +2092,7 @@ RouteTimeAxisView::processors_changed (RouteProcessorChange c) (*i)->valid = false; } + _subplugin_menu_map.clear (); subplugin_menu.items().clear (); _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu)); @@ -2196,7 +2181,7 @@ RouteTimeAxisView::automation_child(Evoral::Parameter param) { AutomationTracks::iterator i = _automation_tracks.find(param); if (i != _automation_tracks.end()) { - return i->second->track; + return i->second; } else { return boost::shared_ptr(); } @@ -2388,3 +2373,19 @@ RouteTimeAxisView::set_button_names () } mute_button_label.set_text (_("m")); } + +Gtk::CheckMenuItem* +RouteTimeAxisView::automation_child_menu_item (Evoral::Parameter param) +{ + ParameterMenuMap::iterator i = _main_automation_menu_map.find (param); + if (i != _main_automation_menu_map.end()) { + return i->second; + } + + i = _subplugin_menu_map.find (param); + if (i != _subplugin_menu_map.end()) { + return i->second; + } + + return 0; +}