c&p debug
[ardour.git] / gtk2_ardour / route_time_axis.cc
index 27c99985742a2eb12050212e51aea7d5ec82024b..73dcf5d9a37a28677112594ce32bcb8595042432 100644 (file)
@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
-#include  <map>
+#include <map>
 #include <utility>
 
 #include <sigc++/bind.h>
@@ -39,7 +39,6 @@
 #include <gtkmm/menuitem.h>
 #include <gtkmm2ext/gtk_ui.h>
 #include <gtkmm2ext/selector.h>
-#include <gtkmm2ext/stop_signal.h>
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
@@ -62,6 +61,8 @@
 #include "evoral/Parameter.hpp"
 
 #include "ardour_ui.h"
+#include "debug.h"
+#include "global_signals.h"
 #include "route_time_axis.h"
 #include "automation_time_axis.h"
 #include "canvas_impl.h"
@@ -149,7 +150,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
        playlist_button.unset_flags (Gtk::CAN_FOCUS);
        automation_button.unset_flags (Gtk::CAN_FOCUS);
 
-       route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_click), false);
+       route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false);
        playlist_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click));
        automation_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click));
 
@@ -171,7 +172,12 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
                rec_enable_button->show_all ();
 
                controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-               ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record"));
+
+                if (is_midi_track()) {
+                        ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record (Right-click for Step Edit)"));
+                } else {
+                        ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record"));
+                }
 
                rec_enable_button->set_sensitive (_session->writable());
        }
@@ -221,6 +227,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh
        }
 
        _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
+       _editor.HorizontalPositionChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::horizontal_position_changed));
        ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
 
        PropertyList* plist = new PropertyList();
@@ -253,10 +260,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 +272,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));
@@ -276,7 +280,7 @@ RouteTimeAxisView::post_construct ()
 }
 
 gint
-RouteTimeAxisView::edit_click (GdkEventButton *ev)
+RouteTimeAxisView::route_group_click (GdkEventButton *ev)
 {
        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                if (_route->route_group()) {
@@ -318,6 +322,10 @@ RouteTimeAxisView::label_view ()
                name_entry.set_text (x);
        }
 
+       if (x != name_label.get_text()) {
+               name_label.set_text (x);
+       }
+
        ARDOUR_UI::instance()->set_tip (name_entry, x);
 }
 
@@ -331,7 +339,6 @@ RouteTimeAxisView::route_property_changed (const PropertyChange& what_changed)
 
 void
 RouteTimeAxisView::take_name_changed (void *src)
-
 {
        if (src != this) {
                label_view ();
@@ -341,15 +348,7 @@ RouteTimeAxisView::take_name_changed (void *src)
 void
 RouteTimeAxisView::playlist_click ()
 {
-       // always build a new action menu
-
-       delete playlist_action_menu;
-
-       playlist_action_menu = new Menu;
-       playlist_action_menu->set_name ("ArdourContextMenu");
-
-       build_playlist_menu (playlist_action_menu);
-
+       build_playlist_menu ();
        conditionally_add_to_selection ();
        playlist_action_menu->popup (1, gtk_get_current_event_time());
 }
@@ -396,6 +395,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 +417,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 +441,10 @@ 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)));
+
+       build_size_menu ();
+       items.push_back (MenuElem (_("Height"), *_size_menu));
 
        items.push_back (SeparatorElem());
 
@@ -448,7 +459,6 @@ RouteTimeAxisView::build_display_menu ()
 
        // Hook for derived classes to add type specific stuff
        append_extra_display_menu_items ();
-       items.push_back (SeparatorElem());
 
        if (is_track()) {
 
@@ -465,45 +475,50 @@ RouteTimeAxisView::build_display_menu ()
 
                items.push_back (MenuElem (_("Layers"), *layers_menu));
 
-               Menu* alignment_menu = manage (new Menu);
-               MenuList& alignment_items = alignment_menu->items();
-               alignment_menu->set_name ("ArdourContextMenu");
-
-               RadioMenuItem::Group align_group;
-
-               alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material"),
-                                       sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
-               align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
-               if (track()->alignment_style() == ExistingMaterial) {
-                       align_existing_item->set_active();
-               }
-
-               alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time"),
-                                       sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
-               align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
-               if (track()->alignment_style() == CaptureTime) {
-                       align_capture_item->set_active();
-               }
-
                if (!Profile->get_sae()) {
 
+                       Menu* alignment_menu = manage (new Menu);
+                       MenuList& alignment_items = alignment_menu->items();
+                       alignment_menu->set_name ("ArdourContextMenu");
+                       
+                       RadioMenuItem::Group align_group;
+                       
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material"),
+                                                                 sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
+                       align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
+                       if (track()->alignment_style() == ExistingMaterial) {
+                               align_existing_item->set_active();
+                       }
+                       
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time"),
+                                                                 sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
+                       align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
+                       if (track()->alignment_style() == CaptureTime) {
+                               align_capture_item->set_active();
+                       }
+                       
                        items.push_back (MenuElem (_("Alignment"), *alignment_menu));
                        track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
 
+                       Menu* mode_menu = manage (new Menu);
+                       MenuList& mode_items = mode_menu->items ();
+                       mode_menu->set_name ("ArdourContextMenu");
+
                        RadioMenuItem::Group mode_group;
-                       items.push_back (RadioMenuElem (mode_group, _("Normal Mode"), sigc::bind (
+
+                       mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode"), sigc::bind (
                                        sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
                                        ARDOUR::Normal)));
-                       normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+                       normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&mode_items.back());
 
-                       items.push_back (RadioMenuElem (mode_group, _("Tape Mode"), sigc::bind (
+                       mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode"), sigc::bind (
                                        sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode),
                                        ARDOUR::Destructive)));
-                       destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+                       destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&mode_items.back());
 
-                       items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"),
+                       mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"),
                                                        sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered)));
-                       non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+                       non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&mode_items.back());
 
 
                        _ignore_track_mode_change = true;
@@ -521,9 +536,9 @@ RouteTimeAxisView::build_display_menu ()
                        }
                        
                        _ignore_track_mode_change = false;
-               }
 
-               track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+                       items.push_back (MenuElem (_("Mode"), *mode_menu));
+               }
 
                color_mode_menu = build_color_mode_menu();
                if (color_mode_menu) {
@@ -531,6 +546,17 @@ RouteTimeAxisView::build_display_menu ()
                }
 
                items.push_back (SeparatorElem());
+
+               build_playlist_menu ();
+               items.push_back (MenuElem (_("Playlist"), *playlist_action_menu));
+
+               route_group_menu->rebuild (_route->route_group ());
+               items.push_back (MenuElem (_("Route Group"), *route_group_menu));
+
+               build_automation_action_menu ();
+               items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+
+               items.push_back (SeparatorElem());
        }
 
        items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun(*this, &RouteUI::toggle_route_active)));
@@ -652,7 +678,7 @@ RouteTimeAxisView::track_mode_changed ()
 }
 
 void
-RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
+RouteTimeAxisView::show_timestretch (framepos_t start, framepos_t end)
 {
        double x1;
        double x2;
@@ -756,7 +782,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 +804,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 ();
@@ -853,6 +879,14 @@ RouteTimeAxisView::reset_samples_per_unit ()
        set_samples_per_unit (_editor.get_current_zoom());
 }
 
+void
+RouteTimeAxisView::horizontal_position_changed ()
+{
+       if (_view) {
+               _view->horizontal_position_changed ();
+       }
+}
+
 void
 RouteTimeAxisView::set_samples_per_unit (double spu)
 {
@@ -1172,7 +1206,7 @@ RouteTimeAxisView::set_selected_regionviews (RegionSelection& regions)
  * @param results List to add things to.
  */
 void
-RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
+RouteTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list<Selectable*>& results)
 {
        double speed = 1.0;
 
@@ -1180,8 +1214,8 @@ RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top,
                speed = track()->speed();
        }
 
-       nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
-       nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
+       framepos_t const start_adjusted = session_frame_to_track_frame(start, speed);
+       framepos_t const end_adjusted   = session_frame_to_track_frame(end, speed);
 
        if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
                _view->get_selectables (start_adjusted, end_adjusted, top, bot, results);
@@ -1212,34 +1246,6 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>&
        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<Evoral::Parameter, RouteAutomationNode*>::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
 {
@@ -1286,7 +1292,8 @@ RouteTimeAxisView::name_entry_changed ()
                ARDOUR_UI::instance()->popup_error (_("A track already exists with that name"));
                name_entry.set_text (_route->name());
        } else if (_session->route_name_internal (x)) {
-               ARDOUR_UI::instance()->popup_error (_("You cannot create a track with that name as it is reserved for Ardour"));
+               ARDOUR_UI::instance()->popup_error (string_compose (_("You cannot create a track with that name as it is reserved for %1"),
+                                                                    PROGRAM_NAME));
                name_entry.set_text (_route->name());
        } else {
                _route->set_name (x);
@@ -1294,7 +1301,7 @@ RouteTimeAxisView::name_entry_changed ()
 }
 
 boost::shared_ptr<Region>
-RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir)
+RouteTimeAxisView::find_next_region (framepos_t pos, RegionPoint point, int32_t dir)
 {
        boost::shared_ptr<Playlist> pl = playlist ();
 
@@ -1305,8 +1312,8 @@ RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t d
        return boost::shared_ptr<Region> ();
 }
 
-nframes64_t
-RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
+framepos_t
+RouteTimeAxisView::find_next_region_boundary (framepos_t pos, int32_t dir)
 {
        boost::shared_ptr<Playlist> pl = playlist ();
 
@@ -1317,17 +1324,16 @@ RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
        return -1;
 }
 
-bool
+void
 RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
        boost::shared_ptr<Playlist> what_we_got;
        boost::shared_ptr<Track> tr = track ();
        boost::shared_ptr<Playlist> playlist;
-       bool ret = false;
 
        if (tr == 0) {
                /* route is a bus, not a track */
-               return false;
+               return;
        }
 
        playlist = tr->playlist();
@@ -1341,23 +1347,19 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
                }
        }
 
-        playlist->clear_history ();
-        playlist->clear_owned_history ();
+        playlist->clear_changes ();
+        playlist->clear_owned_changes ();
 
        switch (op) {
        case Cut:
                if ((what_we_got = playlist->cut (time)) != 0) {
                        _editor.get_cut_buffer().add (what_we_got);
 
-                        vector<StatefulDiffCommand*> cmds;
-                        
+                        vector<Command*> cmds;
                         playlist->rdiff (cmds);
-                        
-                        for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
-                                _session->add_command (*c);
-                        }
+                        _session->add_commands (cmds);
+                       
                         _session->add_command (new StatefulDiffCommand (playlist));
-                       ret = true;
                }
                break;
        case Copy:
@@ -1368,25 +1370,19 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 
        case Clear:
                if ((what_we_got = playlist->cut (time)) != 0) {
-                        vector<StatefulDiffCommand*> cmds;
-                        
+
+                        vector<Command*> cmds;
                         playlist->rdiff (cmds);
-                        
-                        for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
-                                _session->add_command (*c);
-                        }
+                       _session->add_commands (cmds);
                         _session->add_command (new StatefulDiffCommand (playlist));
                        what_we_got->release ();
-                       ret = true;
                }
                break;
        }
-
-       return ret;
 }
 
 bool
-RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth)
+RouteTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth)
 {
        if (!is_track()) {
                return false;
@@ -1401,11 +1397,14 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
                return false;
        }
 
+        DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("paste to %1\n", pos));
+
        if (track()->speed() != 1.0f) {
                pos = session_frame_to_track_frame (pos, track()->speed());
+                DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("modified paste to %1\n", pos));
        }
 
-        pl->clear_history ();
+        pl->clear_changes ();
        pl->paste (*p, pos, times);
        _session->add_command (new StatefulDiffCommand (pl));
 
@@ -1413,20 +1412,6 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
 }
 
 
-TimeAxisView::Children
-RouteTimeAxisView::get_child_list()
-{
-       TimeAxisView::Children redirect_children;
-
-       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-               if (!(*i)->hidden()) {
-                       redirect_children.push_back(*i);
-               }
-       }
-       return redirect_children;
-}
-
-
 struct PlaylistSorter {
     bool operator() (boost::shared_ptr<Playlist> a, boost::shared_ptr<Playlist> b) const {
             return a->sort_id() < b->sort_id();
@@ -1434,21 +1419,24 @@ struct PlaylistSorter {
 };
 
 void
-RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
+RouteTimeAxisView::build_playlist_menu ()
 {
        using namespace Menu_Helpers;
 
-       if (!menu || !is_track()) {
+       if (!is_track()) {
                return;
        }
 
-       MenuList& playlist_items = menu->items();
-       menu->set_name ("ArdourContextMenu");
+       delete playlist_action_menu;
+       playlist_action_menu = new Menu;
+       playlist_action_menu->set_name ("ArdourContextMenu");
+
+       MenuList& playlist_items = playlist_action_menu->items();
+       playlist_action_menu->set_name ("ArdourContextMenu");
        playlist_items.clear();
 
        delete playlist_menu;
 
-
         vector<boost::shared_ptr<Playlist> > playlists, playlists_tr;
        boost::shared_ptr<Track> tr = track();
        RadioMenuItem::Group playlist_group;
@@ -1613,14 +1601,16 @@ RouteTimeAxisView::color_handler ()
 void
 RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param)
 {
-       RouteAutomationNode* node = automation_track(param);
+       boost::shared_ptr<AutomationTimeAxisView> 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 +1626,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<AutomationTimeAxisView> 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 +1656,15 @@ RouteTimeAxisView::show_all_automation ()
 
        /* Show our automation */
 
-       map<Evoral::Parameter, RouteAutomationNode*>::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 +1695,16 @@ RouteTimeAxisView::show_existing_automation ()
 
        /* Show our automation */
 
-       map<Evoral::Parameter, RouteAutomationNode*>::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 +1731,15 @@ RouteTimeAxisView::hide_all_automation ()
 
        /* Hide our automation */
 
-       for (map<Evoral::Parameter, RouteAutomationNode*>::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 +1751,6 @@ RouteTimeAxisView::hide_all_automation ()
                }
        }
 
-       _show_automation.clear();
-
        no_redraw = false;
         _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
 }
@@ -1763,13 +1760,11 @@ void
 RouteTimeAxisView::region_view_added (RegionView* rv)
 {
        /* XXX need to find out if automation children have automationstreamviews. If yes, no ghosts */
-       if (is_audio_track()) {
-               for (Children::iterator i = children.begin(); i != children.end(); ++i) {
-                       boost::shared_ptr<AutomationTimeAxisView> atv;
-
-                       if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
-                               atv->add_ghost(rv);
-                       }
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+               boost::shared_ptr<AutomationTimeAxisView> atv;
+               
+               if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
+                       atv->add_ghost(rv);
                }
        }
 
@@ -1843,9 +1838,10 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
        ProcessorAutomationNode* pan;
 
        if ((pan = find_processor_automation_node (processor, what)) == 0) {
-               error << _("programming error: ")
-                     << string_compose (X_("processor automation curve for %1:%2 not registered with track!"),
-                                 processor->name(), what)
+                /* session state may never have been saved with new plugin */
+                error << _("programming error: ")
+                     << string_compose (X_("processor automation curve for %1:%2/%3/%4 not registered with track!"),
+                                         processor->name(), what.type(), (int) what.channel(), what.id() )
                      << endmsg;
                /*NOTREACHED*/
                return;
@@ -1862,14 +1858,14 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
        /* FIXME: ew */
 
        char state_name[256];
-       snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
+       snprintf (state_name, sizeof (state_name), "%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
 
        boost::shared_ptr<AutomationControl> control
                        = boost::dynamic_pointer_cast<AutomationControl>(processor->control(what, true));
 
        pan->view = boost::shared_ptr<AutomationTimeAxisView>(
-                       new AutomationTimeAxisView (_session, _route, processor, control,
-                               _editor, *this, false, parent_canvas, name, state_name));
+               new AutomationTimeAxisView (_session, _route, processor, control, control->parameter (),
+                                           _editor, *this, false, parent_canvas, name, state_name));
 
        pan->view->Hiding.connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
 
@@ -1947,14 +1943,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 +2021,8 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
                items.push_back (CheckMenuElem (name));
                mitem = dynamic_cast<CheckMenuItem*> (&items.back());
 
+               _subplugin_menu_map[*i] = mitem;
+
                if (has_visible_automation.find((*i)) != has_visible_automation.end()) {
                        mitem->set_active(true);
                }
@@ -2108,6 +2102,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 +2191,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<AutomationTimeAxisView>();
        }
@@ -2292,7 +2287,7 @@ RouteTimeAxisView::set_underlay_state()
                if (prop) {
                        PBD::ID id (prop->value());
 
-                       RouteTimeAxisView* v = _editor.get_route_view_by_id (id);
+                       RouteTimeAxisView* v = _editor.get_route_view_by_route_id (id);
 
                        if (v) {
                                add_underlay(v->view(), false);
@@ -2388,3 +2383,39 @@ 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;
+}
+
+void
+RouteTimeAxisView::create_gain_automation_child (const Evoral::Parameter& param, bool show)
+{
+       boost::shared_ptr<AutomationControl> c = _route->gain_control();
+       if (!c) {
+               error << "Route has no gain automation, unable to add automation track view." << endmsg;
+               return;
+       }
+
+       gain_track.reset (new AutomationTimeAxisView (_session,
+                                                     _route, _route->amp(), c, param,
+                                                     _editor,
+                                                     *this,
+                                                     false,
+                                                     parent_canvas,
+                                                     _route->amp()->describe_parameter(param)));
+       
+       add_automation_child (Evoral::Parameter(GainAutomation), gain_track, show);
+}