Allow edit group creation from the route UI's menu. Allow new tracks to be put in...
[ardour.git] / gtk2_ardour / route_time_axis.cc
index d6ad6af59965673f520f79208c72a8639266b859..3a75ea5b19ce8932bcec4f37650e14dfa8192935 100644 (file)
 #include <algorithm>
 #include <string>
 #include <vector>
+#include <utility>
 
 #include <sigc++/bind.h>
 
-#include <pbd/error.h>
-#include <pbd/stl_delete.h>
-#include <pbd/whitespace.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/stl_delete.h"
+#include "pbd/whitespace.h"
+#include "pbd/memento_command.h"
 
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/playlist.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/diskstream.h>
-#include <ardour/insert.h>
-#include <ardour/ladspa_plugin.h>
-#include <ardour/location.h>
-#include <ardour/panner.h>
-#include <ardour/playlist.h>
-#include <ardour/session.h>
-#include <ardour/session_playlist.h>
-#include <ardour/utils.h>
+#include "ardour/amp.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/diskstream.h"
+#include "ardour/event_type_map.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/location.h"
+#include "ardour/panner.h"
+#include "ardour/playlist.h"
+#include "ardour/playlist.h"
+#include "ardour/processor.h"
+#include "ardour/profile.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+#include "ardour/session_playlist.h"
+#include "ardour/utils.h"
+#include "evoral/Parameter.hpp"
 
 #include "ardour_ui.h"
 #include "route_time_axis.h"
 #include "automation_time_axis.h"
-#include "redirect_automation_time_axis.h"
-#include "redirect_automation_line.h"
 #include "canvas_impl.h"
 #include "crossfade_view.h"
 #include "enums.h"
 #include "simplerect.h"
 #include "streamview.h"
 #include "utils.h"
+#include "route_group_dialog.h"
 
-#include <ardour/track.h>
+#include "ardour/track.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
+using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace Editing;
+using namespace sigc;
+using namespace std;
 
+Glib::RefPtr<Gdk::Pixbuf> RouteTimeAxisView::slider;
+
+void
+RouteTimeAxisView::setup_slider_pix ()
+{
+       if ((slider = ::get_icon ("fader_belt_h")) == 0) {
+               throw failed_constructor ();
+       }
+}
 
 RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr<Route> rt, Canvas& canvas)
        : AxisView(sess),
@@ -92,16 +109,28 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
          playlist_button (_("p")), 
          size_button (_("h")), // height
          automation_button (_("a")),
-         visual_button (_("v"))
-
+         visual_button (_("v")),
+         gm (sess, slider, true)
 {
+       gm.set_controls (_route, _route->shared_peak_meter(), _route->gain_control(), _route->amp());
+       gm.get_level_meter().set_no_show_all();
+       gm.get_level_meter().setup_meters(50);
+
        _has_state = true;
        playlist_menu = 0;
        playlist_action_menu = 0;
        automation_action_menu = 0;
        _view = 0;
+
+       if (!_route->is_hidden()) {
+               _marked_for_display = true;
+       }
+
        timestretch_rect = 0;
        no_redraw = false;
+       destructive_track_mode_item = 0;
+       normal_track_mode_item = 0;
+       non_layered_track_mode_item = 0;
 
        ignore_toggle = false;
 
@@ -112,6 +141,13 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        visual_button.set_name ("TrackVisualButton");
        hide_button.set_name ("TrackRemoveButton");
 
+       edit_group_button.unset_flags (Gtk::CAN_FOCUS);
+       playlist_button.unset_flags (Gtk::CAN_FOCUS);
+       automation_button.unset_flags (Gtk::CAN_FOCUS);
+       size_button.unset_flags (Gtk::CAN_FOCUS);
+       visual_button.unset_flags (Gtk::CAN_FOCUS);
+       hide_button.unset_flags (Gtk::CAN_FOCUS);
+
        hide_button.add (*(manage (new Image (::get_icon("hide")))));
        hide_button.show_all ();
 
@@ -123,17 +159,19 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        hide_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::hide_click));
 
        solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
-       solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release));
+       solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false);
        mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false);
-       mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release));
+       mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
 
        if (is_track()) {
 
                /* use icon */
 
                rec_enable_button->remove ();
+
                switch (track()->mode()) {
                case ARDOUR::Normal:
+               case ARDOUR::NonLayered:
                        rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
                        break;
                case ARDOUR::Destructive:
@@ -146,12 +184,19 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
                rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
                controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
                ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record"));
+
        }
 
+       controls_hbox.pack_start(gm.get_level_meter(), false, false);
+       _route->meter_change.connect (mem_fun(*this, &RouteTimeAxisView::meter_changed));
+       _route->input()->changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
+       _route->output()->changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
+
        controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-       controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::FILL|Gtk::EXPAND, 0, 0);
+       controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
 
-       controls_table.attach (edit_group_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       controls_table.attach (edit_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 
        ARDOUR_UI::instance()->tooltips().set_tip(*solo_button,_("Solo"));
        ARDOUR_UI::instance()->tooltips().set_tip(*mute_button,_("Mute"));
@@ -164,24 +209,31 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        
        label_view ();
 
-       controls_table.attach (hide_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (visual_button, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (size_button, 2, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (automation_button, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       if (0) {
+
+               /* old school - when we used to put an extra row of buttons in place */
+
+               controls_table.attach (hide_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (visual_button, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (size_button, 2, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (automation_button, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+
+       } else {
+
+               controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       }
 
        if (is_track() && track()->mode() == ARDOUR::Normal) {
                controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
        }
 
-       /* remove focus from the buttons */
-       
-       y_position = -1;
+       _y_position = -1;
 
        _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
        _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
-       _route->redirects_changed.connect (mem_fun(*this, &RouteTimeAxisView::redirects_changed));
-       _route->name_changed.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed));
-       _route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+       _route->processors_changed.connect (mem_fun(*this, &RouteTimeAxisView::processors_changed));
+       _route->NameChanged.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed));
+       _route->solo_isolated_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
 
 
        if (is_track()) {
@@ -196,34 +248,35 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        }
 
-       editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
-       ColorChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
+       _editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
+       ColorsChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
+
+       gm.get_gain_slider().signal_scroll_event().connect(mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
+       gm.get_gain_slider().set_name ("TrackGainFader");
 }
 
 RouteTimeAxisView::~RouteTimeAxisView ()
 {
        GoingAway (); /* EMIT_SIGNAL */
 
-       vector_delete (&redirect_automation_curves);
-
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                delete *i;
        }
 
-       if (playlist_menu) {
-               delete playlist_menu;
-               playlist_menu = 0;
-       }
+       delete playlist_menu;
+       playlist_menu = 0;
   
-       if (playlist_action_menu) {
-               delete playlist_action_menu;
-               playlist_action_menu = 0;
-       }
+       delete playlist_action_menu;
+       playlist_action_menu = 0;
 
-       if (_view) {
-               delete _view;
-               _view = 0;
+       delete _view;
+       _view = 0;
+
+       for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+               delete i->second;
        }
+       
+       _automation_tracks.clear ();
 }
 
 void
@@ -232,9 +285,11 @@ RouteTimeAxisView::post_construct ()
        /* map current state of the route */
 
        update_diskstream_display ();
-       _route->foreach_redirect (this, &RouteTimeAxisView::add_redirect_to_subplugin_menu);
-       _route->foreach_redirect (this, &RouteTimeAxisView::add_existing_redirect_automation_curves);
-       reset_redirect_automation_curves ();
+
+       subplugin_menu.items().clear ();
+       _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
+       _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
+       reset_processor_automation_curves ();
 }
 
 void
@@ -255,7 +310,7 @@ RouteTimeAxisView::playlist_modified ()
 gint
 RouteTimeAxisView::edit_click (GdkEventButton *ev)
 {
-       if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
+       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                _route->set_edit_group (0, this);
                return FALSE;
        } 
@@ -266,13 +321,18 @@ RouteTimeAxisView::edit_click (GdkEventButton *ev)
        RadioMenuItem::Group group;
 
        items.clear ();
+
+       items.push_back (MenuElem (_("New group..."), mem_fun (*this, &RouteTimeAxisView::set_edit_group_to_new)));
+
+       items.push_back (SeparatorElem ());
+       
        items.push_back (RadioMenuElem (group, _("No group"), 
                                        bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0)));
        
        if (_route->edit_group() == 0) {
                static_cast<RadioMenuItem*>(&items.back())->set_active ();
        }
-       
+
        _session.foreach_edit_group (bind (mem_fun (*this, &RouteTimeAxisView::add_edit_group_menu_item), &group));
        edit_group_menu.popup (ev->button, ev->time);
 
@@ -300,7 +360,6 @@ RouteTimeAxisView::set_edit_group_from_menu (RouteGroup *eg)
 
 void
 RouteTimeAxisView::playlist_changed ()
-
 {
        label_view ();
 
@@ -322,9 +381,9 @@ RouteTimeAxisView::label_view ()
 }
 
 void
-RouteTimeAxisView::route_name_changed (void *src)
+RouteTimeAxisView::route_name_changed ()
 {
-       editor.route_name_changed (this);
+       _editor.route_name_changed (this);
        label_view ();
 }
 
@@ -341,32 +400,51 @@ void
 RouteTimeAxisView::playlist_click ()
 {
        // always build a new action menu
-       
-       if (playlist_action_menu != 0) {
-               delete playlist_action_menu;
-       } 
+  
+       delete playlist_action_menu;
 
        playlist_action_menu = new Menu;
        playlist_action_menu->set_name ("ArdourContextMenu");
        
        build_playlist_menu (playlist_action_menu);
-       editor.set_selected_track (*this, Selection::Add);
+
+       conditionally_add_to_selection ();
        playlist_action_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
 RouteTimeAxisView::automation_click ()
 {
-       if (automation_action_menu == 0) {
-               /* this seems odd, but the automation action
-                  menu is built as part of the display menu.
-               */
-               build_display_menu ();
-       }
-       editor.set_selected_track (*this, Selection::Add);
+       conditionally_add_to_selection ();
+       build_automation_action_menu ();
        automation_action_menu->popup (1, gtk_get_current_event_time());
 }
 
+int
+RouteTimeAxisView::set_state (const XMLNode& node)
+{
+       TimeAxisView::set_state (node);
+
+       XMLNodeList kids = node.children();
+       XMLNodeConstIterator iter;
+       const XMLProperty* prop;
+       
+       for (iter = kids.begin(); iter != kids.end(); ++iter) {
+               if ((*iter)->name() == AutomationTimeAxisView::state_node_name) {
+                       if ((prop = (*iter)->property ("automation-id")) != 0) {
+
+                               Evoral::Parameter param = ARDOUR::EventTypeMap::instance().new_parameter(prop->value());
+                               bool show = ((prop = (*iter)->property ("shown")) != 0) && prop->value() == "yes";
+                               create_automation_child(param, show);
+                       } else {
+                               warning << "Automation child has no ID" << endmsg;
+                       }
+               }
+       }
+
+       return 0;
+}
+
 void
 RouteTimeAxisView::build_automation_action_menu ()
 {
@@ -385,7 +463,26 @@ RouteTimeAxisView::build_automation_action_menu ()
        automation_items.push_back (MenuElem (_("Hide all automation"),
                                              mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
 
+       if (subplugin_menu.get_attach_widget())
+               subplugin_menu.detach();
+
        automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu));
+       
+       map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
+       for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+
+               automation_items.push_back (SeparatorElem());
+
+               delete i->second->menu_item;
+
+               automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param), 
+                               bind (mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param)));
+
+               i->second->menu_item = static_cast<Gtk::CheckMenuItem*>(&automation_items.back());
+
+               i->second->menu_item->set_active(show_automation(i->second->param));
+               //i->second->menu_item->set_active(false);
+       }
 }
 
 void
@@ -411,73 +508,119 @@ RouteTimeAxisView::build_display_menu ()
 
        items.push_back (SeparatorElem());
 
-       build_remote_control_menu ();
-       items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
-
-       build_automation_action_menu ();
-       items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+       if (!Profile->get_sae()) {
+               build_remote_control_menu ();
+               items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+               /* rebuild this every time */
+               build_automation_action_menu ();
+               items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+               items.push_back (SeparatorElem());
+       }
 
        // Hook for derived classes to add type specific stuff
-       items.push_back (SeparatorElem());
        append_extra_display_menu_items ();
        items.push_back (SeparatorElem());
        
        if (is_track()) {
 
+               Menu *layers_menu = manage(new Menu);
+               MenuList &layers_items = layers_menu->items();
+               layers_menu->set_name("ArdourContextMenu");
+
+               RadioMenuItem::Group layers_group;
+
+               layers_items.push_back(RadioMenuElem (layers_group, _("Overlaid"),
+                               bind (mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid)));
+               layers_items.push_back(RadioMenuElem (layers_group, _("Stacked"),
+                               bind (mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked)));
+
+               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"),
-                       bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
+                                       bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial)));
                align_existing_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
                if (get_diskstream()->alignment_style() == ExistingMaterial)
                        align_existing_item->set_active();
-               
+
                alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture time"),
-                       bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
+                                       bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime)));
                align_capture_item = dynamic_cast<RadioMenuItem*>(&alignment_items.back());
                if (get_diskstream()->alignment_style() == CaptureTime)
                        align_capture_item->set_active();
-               
-               items.push_back (MenuElem (_("Alignment"), *alignment_menu));
 
-               get_diskstream()->AlignmentStyleChanged.connect (
-                       mem_fun(*this, &RouteTimeAxisView::align_style_changed));
-
-               RadioMenuItem::Group mode_group;
-               items.push_back (RadioMenuElem (mode_group, _("Normal mode"),
-                                               bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal)));
-               normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
-               items.push_back (RadioMenuElem (mode_group, _("Tape mode"),
-                                               bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive)));
-               destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
-                                
-               
-               switch (track()->mode()) {
-               case ARDOUR::Destructive:
-                       destructive_track_mode_item->set_active ();
-                       break;
-               case ARDOUR::Normal:
-                       normal_track_mode_item->set_active ();
-                       break;
+               if (!Profile->get_sae()) {
+                       items.push_back (MenuElem (_("Alignment"), *alignment_menu));
+                       get_diskstream()->AlignmentStyleChanged.connect (
+                                       mem_fun(*this, &RouteTimeAxisView::align_style_changed));
+                       
+                       RadioMenuItem::Group mode_group;
+                       items.push_back (RadioMenuElem (mode_group, _("Normal mode"), bind (
+                                       mem_fun (*this, &RouteTimeAxisView::set_track_mode),
+                                       ARDOUR::Normal)));
+                       normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+
+                       items.push_back (RadioMenuElem (mode_group, _("Tape mode"), bind (
+                                       mem_fun (*this, &RouteTimeAxisView::set_track_mode),
+                                       ARDOUR::Destructive)));
+                       destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+
+                       items.push_back (RadioMenuElem (mode_group, _("No layering mode"),
+                                                       bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered)));
+                       non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+
+                       
+                       switch (track()->mode()) {
+                       case ARDOUR::Destructive:
+                               destructive_track_mode_item->set_active ();
+                               break;
+                       case ARDOUR::Normal:
+                               normal_track_mode_item->set_active ();
+                               break;
+                       case ARDOUR::NonLayered:
+                               non_layered_track_mode_item->set_active ();
+                               break;
+                       }
                }
+
+               get_diskstream()->AlignmentStyleChanged.connect (
+                               mem_fun(*this, &RouteTimeAxisView::align_style_changed));
+
+               mode_menu = build_mode_menu();
+               if (mode_menu)
+                       items.push_back (MenuElem (_("Mode"), *mode_menu));
+                       
+               color_mode_menu = build_color_mode_menu();
+               if (color_mode_menu)
+                       items.push_back (MenuElem (_("Color Mode"), *color_mode_menu));
+                       
+               items.push_back (SeparatorElem());
        }
 
-       items.push_back (SeparatorElem());
        items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active)));
        route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
        route_active_menu_item->set_active (_route->active());
 
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
+       items.push_back (MenuElem (_("Hide"), mem_fun(*this, &RouteTimeAxisView::hide_click)));
+       if (!Profile->get_sae()) {
+               items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
+       } else {
+               items.push_front (SeparatorElem());
+               items.push_front (MenuElem (_("Delete"), mem_fun(*this, &RouteUI::remove_this_route)));
+       }
 }
 
-static bool __reset_item (RadioMenuItem* item)
+static bool __reset_item (RadioMenuItem* item, RadioMenuItem* item_2)
 {
        item->set_active ();
+       item_2->set_active ();
        return false;
 }
 
@@ -486,29 +629,37 @@ RouteTimeAxisView::set_track_mode (TrackMode mode)
 {
        RadioMenuItem* item;
        RadioMenuItem* other_item;
+       RadioMenuItem* other_item_2;
 
        switch (mode) {
        case ARDOUR::Normal:
                item = normal_track_mode_item;
-               other_item = destructive_track_mode_item;
+               other_item = non_layered_track_mode_item;
+               other_item_2 = destructive_track_mode_item;
+               break;
+       case ARDOUR::NonLayered:
+               item = non_layered_track_mode_item;
+               other_item = normal_track_mode_item;
+               other_item_2 = destructive_track_mode_item;
                break;
        case ARDOUR::Destructive:
                item = destructive_track_mode_item;
                other_item = normal_track_mode_item;
+               other_item_2 = non_layered_track_mode_item;
                break;
        default:
                fatal << string_compose (_("programming error: %1 %2"), "illegal track mode in RouteTimeAxisView::set_track_mode", mode) << endmsg;
                /*NOTREACHED*/
                return;
        }
-
-       if (item->get_active () && track()->mode() != mode) {
-               _set_track_mode (track(), mode, other_item);
+       
+       if (item && other_item && other_item_2 && item->get_active() && track()->mode() != mode) {
+               _set_track_mode (track().get(), mode, other_item, other_item_2);
        }
 }
 
 void
-RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* reset_item)
+RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* reset_item, RadioMenuItem* reset_item_2)
 {
        bool needs_bounce;
 
@@ -516,7 +667,7 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem*
 
                if (!needs_bounce) {
                        /* cannot be done */
-                       Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item));
+                       Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item, reset_item_2));
                        return;
                } else {
                        cerr << "would bounce this one\n";
@@ -527,7 +678,9 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem*
        track->set_mode (mode);
 
        rec_enable_button->remove ();
+
        switch (mode) {
+       case ARDOUR::NonLayered:
        case ARDOUR::Normal:
                rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
                break;
@@ -535,8 +688,8 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem*
                rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red"))))));
                break;
        }
-       rec_enable_button->show_all ();
 
+       rec_enable_button->show_all ();
 }
 
 void
@@ -548,6 +701,9 @@ RouteTimeAxisView::track_mode_changed ()
        case ARDOUR::Normal:
                item = normal_track_mode_item;
                break;
+       case ARDOUR::NonLayered:
+               item = non_layered_track_mode_item;
+               break;
        case ARDOUR::Destructive:
                item = destructive_track_mode_item;
                break;
@@ -594,21 +750,21 @@ RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
 #endif
 
        if (timestretch_rect == 0) {
-               timestretch_rect = new SimpleRect (*canvas_display);
+               timestretch_rect = new SimpleRect (*canvas_display ());
                timestretch_rect->property_x1() =  0.0;
                timestretch_rect->property_y1() =  0.0;
                timestretch_rect->property_x2() =  0.0;
                timestretch_rect->property_y2() =  0.0;
-               timestretch_rect->property_fill_color_rgba() =  color_map[cTimeStretchFill];
-               timestretch_rect->property_outline_color_rgba() = color_map[cTimeStretchOutline];
+               timestretch_rect->property_fill_color_rgba() =  ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
+               timestretch_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchOutline.get();
        }
 
        timestretch_rect->show ();
        timestretch_rect->raise_to_top ();
 
-       x1 = start / editor.get_current_zoom();
-       x2 = (end - 1) / editor.get_current_zoom();
-       y2 = height - 2;
+       x1 = start / _editor.get_current_zoom();
+       x2 = (end - 1) / _editor.get_current_zoom();
+       y2 = current_height() - 2;
        
        timestretch_rect->property_x1() = x1;
        timestretch_rect->property_y1() = 1.0;
@@ -647,54 +803,36 @@ RouteTimeAxisView::show_selection (TimeSelection& ts)
 }
 
 void
-RouteTimeAxisView::set_height (TrackHeight h)
+RouteTimeAxisView::set_height (uint32_t h)
 {
-       bool height_changed = (height == 0) || (h != height_style);
+       int gmlen = h - 5;
+       bool height_changed = (height == 0) || (h != height);
+       gm.get_level_meter().setup_meters (gmlen);
 
        TimeAxisView::set_height (h);
 
        ensure_xml_node ();
 
        if (_view) {
-               _view->set_height ((double) height);
+               _view->set_height ((double) current_height());
        }
 
-       switch (height_style) {
-       case Largest:
-               xml_node->add_property ("track_height", "largest");
-               break;
-
-       case Large:
-               xml_node->add_property ("track_height", "large");
-               break;
-
-       case Larger:
-               xml_node->add_property ("track_height", "larger");
-               break;
-
-       case Normal:
-               xml_node->add_property ("track_height", "normal");
-               break;
+       char buf[32];
+       snprintf (buf, sizeof (buf), "%u", height);
+       xml_node->add_property ("height", buf);
 
-       case Smaller:
-               xml_node->add_property ("track_height", "smaller");
-               break;
-
-       case Small:
-               xml_node->add_property ("track_height", "small");
-               break;
-       }
-
-       switch (height_style) {
-       case Largest:
-       case Large:
-       case Larger:
-       case Normal:
+       if (height >= hNormal) {
+               reset_meter();
                show_name_entry ();
                hide_name_label ();
 
+               gm.get_gain_slider().show();
                mute_button->show();
-               solo_button->show();
+               if (!_route || _route->is_master()) {
+                       solo_button->hide();
+               } else {
+                       solo_button->show();
+               }
                if (rec_enable_button)
                        rec_enable_button->show();
 
@@ -707,14 +845,20 @@ RouteTimeAxisView::set_height (TrackHeight h)
                if (is_track() && track()->mode() == ARDOUR::Normal) {
                        playlist_button.show();
                }
-               break;
 
-       case Smaller:
+       } else if (height >= hSmaller) {
+
+               reset_meter();
                show_name_entry ();
                hide_name_label ();
 
+               gm.get_gain_slider().hide();
                mute_button->show();
-               solo_button->show();
+               if (!_route || _route->is_master()) {
+                       solo_button->hide();
+               } else {
+                       solo_button->show();
+               }
                if (rec_enable_button)
                        rec_enable_button->show();
 
@@ -727,12 +871,25 @@ RouteTimeAxisView::set_height (TrackHeight h)
                if (is_track() && track()->mode() == ARDOUR::Normal) {
                        playlist_button.hide ();
                }
-               break;
 
-       case Small:
+       } else {
+
+
+               /* don't allow name_entry to be hidden while
+                  it has focus, otherwise the GUI becomes unusable.
+               */
+
+               if (name_entry.has_focus()) {
+                       if (name_entry.get_text() != _route->name()) {
+                               name_entry_changed ();
+                       }
+                       controls_ebox.grab_focus ();
+               }
+
                hide_name_entry ();
                show_name_label ();
-
+               
+               gm.get_gain_slider().hide();
                mute_button->hide();
                solo_button->hide();
                if (rec_enable_button)
@@ -745,7 +902,6 @@ RouteTimeAxisView::set_height (TrackHeight h)
                automation_button.hide ();
                playlist_button.hide ();
                name_label.set_text (_route->name());
-               break;
        }
 
        if (height_changed) {
@@ -768,7 +924,7 @@ RouteTimeAxisView::select_track_color ()
 void
 RouteTimeAxisView::reset_samples_per_unit ()
 {
-       set_samples_per_unit (editor.get_current_zoom());
+       set_samples_per_unit (_editor.get_current_zoom());
 }
 
 void
@@ -859,8 +1015,43 @@ RouteTimeAxisView::rename_current_playlist ()
        }
 }
 
+std::string 
+RouteTimeAxisView::resolve_new_group_playlist_name(std::string &basename, vector<boost::shared_ptr<Playlist> > const & playlists)
+{
+       std::string ret(basename);
+
+       std::string group_string = "."+edit_group()->name()+".";
+
+       // iterate through all playlists
+       int maxnumber = 0;
+       for (vector<boost::shared_ptr<Playlist> >::const_iterator i = playlists.begin(); i != playlists.end(); ++i) {
+               std::string tmp = (*i)->name();
+
+               std::string::size_type idx = tmp.find(group_string);                    
+               // find those which belong to this group
+               if (idx != string::npos) {
+                       tmp = tmp.substr(idx + group_string.length());
+
+                       // and find the largest current number
+                       int x = atoi(tmp.c_str());
+                       if (x > maxnumber) {
+                               maxnumber = x;
+                       }
+               }
+       }
+
+       maxnumber++;
+
+       char buf[32];
+       snprintf (buf, sizeof(buf), "%d", maxnumber);
+               
+       ret = this->name()+"."+edit_group()->name()+"."+buf;
+
+       return ret;
+}
+
 void
-RouteTimeAxisView::use_copy_playlist (bool prompt)
+RouteTimeAxisView::use_copy_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const & playlists_before_op)
 {
        string name;
        
@@ -873,10 +1064,14 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
                return;
 
        name = pl->name();
+       
+       if (edit_group() && edit_group()->is_active()) {
+               name = resolve_new_group_playlist_name(name, playlists_before_op);
+       }
 
-       do {
+       while (_session.playlist_by_name(name)) {
                name = Playlist::bump_name (name, _session);
-       } while (_session.playlist_by_name(name));
+       }
 
        // TODO: The prompter "new" button should be de-activated if the user
        // specifies a playlist name which already exists in the session.
@@ -908,7 +1103,7 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
 }
 
 void
-RouteTimeAxisView::use_new_playlist (bool prompt)
+RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const & playlists_before_op)
 {
        string name;
        
@@ -921,10 +1116,14 @@ RouteTimeAxisView::use_new_playlist (bool prompt)
                return;
 
        name = pl->name();
+       
+       if (edit_group() && edit_group()->is_active()) {
+               name = resolve_new_group_playlist_name(name,playlists_before_op);
+       }
 
-       do {
+       while (_session.playlist_by_name(name)) {
                name = Playlist::bump_name (name, _session);
-       } while (_session.playlist_by_name(name));
+       }
 
 
        if (prompt) {
@@ -963,7 +1162,7 @@ RouteTimeAxisView::clear_playlist ()
        if (!pl)
                return;
 
-       editor.clear_playlist (pl);
+       _editor.clear_playlist (pl);
 }
 
 void
@@ -991,41 +1190,41 @@ RouteTimeAxisView::update_diskstream_display ()
 void
 RouteTimeAxisView::selection_click (GdkEventButton* ev)
 {
-       if (Keyboard::modifier_state_equals (ev->state, (Keyboard::Shift|Keyboard::Control))) {
+       if (Keyboard::modifier_state_equals (ev->state, (Keyboard::TertiaryModifier|Keyboard::PrimaryModifier))) {
 
                /* special case: select/deselect all tracks */
-               if (editor.get_selection().selected (this)) {
-                       editor.get_selection().clear_tracks ();
+               if (_editor.get_selection().selected (this)) {
+                       _editor.get_selection().clear_tracks ();
                } else {
-                       editor.select_all_tracks ();
+                       _editor.select_all_tracks ();
                }
 
                return;
        } 
 
-       PublicEditor::TrackViewList* tracks = editor.get_valid_views (this, _route->edit_group());
+       PublicEditor::TrackViewList* tracks = _editor.get_valid_views (this, _route->edit_group());
 
        switch (Keyboard::selection_type (ev->state)) {
        case Selection::Toggle:
-               editor.get_selection().toggle (*tracks);
+               _editor.get_selection().toggle (*tracks);
                break;
                
        case Selection::Set:
-               editor.get_selection().set (*tracks);
+               _editor.get_selection().set (*tracks);
                break;
 
        case Selection::Extend:
                if (tracks->size() > 1) {
                        /* add each one, do not "extend" */
-                       editor.get_selection().add (*tracks);
+                       _editor.get_selection().add (*tracks);
                } else {
                        /* extend to the single track */
-                       editor.extend_selection_to_track (*tracks->front());
+                       _editor.extend_selection_to_track (*tracks->front());
                }
                break;
 
        case Selection::Add:
-               editor.get_selection().add (*tracks);
+               _editor.get_selection().add (*tracks);
                break;
        }
 
@@ -1035,7 +1234,7 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev)
 void
 RouteTimeAxisView::set_selected_points (PointSelection& points)
 {
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                (*i)->set_selected_points (points);
        }
 }
@@ -1048,6 +1247,9 @@ RouteTimeAxisView::set_selected_regionviews (RegionSelection& regions)
        }
 }
 
+/** Add the selectable things that we have to a list.
+ * @param results List to add things to.
+ */
 void
 RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
 {
@@ -1060,13 +1262,13 @@ RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top,
        nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
        nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
 
-       if (_view && ((top < 0.0 && bot < 0.0)) || touched (top, bot)) {
+       if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
                _view->get_selectables (start_adjusted, end_adjusted, results);
        }
 
        /* pick up visible automation tracks */
        
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                if (!(*i)->hidden()) {
                        (*i)->get_selectables (start_adjusted, end_adjusted, top, bot, results);
                }
@@ -1080,7 +1282,7 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>&
                _view->get_inverted_selectables (sel, results);
        }
 
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                if (!(*i)->hidden()) {
                        (*i)->get_inverted_selectables (sel, results);
                }
@@ -1089,6 +1291,34 @@ 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::edit_group() const
 {
@@ -1131,11 +1361,14 @@ RouteTimeAxisView::name_entry_changed ()
                return;
        }
 
-       if (_session.route_name_unique (x)) {
-               _route->set_name (x, this);
-       } else {
+       if (!_session.route_name_unique (x)) {
                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"));
+               name_entry.set_text (_route->name());
+       } else {
+               _route->set_name (x);
        }
 }
 
@@ -1151,7 +1384,7 @@ RouteTimeAxisView::hide_click ()
        // LAME fix for hide_button refresh fix
        hide_button.set_sensitive(false);
        
-       editor.hide_track_in_display (*this);
+       _editor.hide_track_in_display (*this);
        
        hide_button.set_sensitive(true);
 }
@@ -1169,6 +1402,19 @@ 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)
+{
+       boost::shared_ptr<Diskstream> stream;
+       boost::shared_ptr<Playlist> playlist;
+
+       if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) {
+               return playlist->find_next_region_boundary (pos, dir);
+       }
+
+       return -1;
+}
+
 bool
 RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
@@ -1197,14 +1443,14 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
        switch (op) {
        case Cut:
                if ((what_we_got = playlist->cut (time)) != 0) {
-                       editor.get_cut_buffer().add (what_we_got);
+                       _editor.get_cut_buffer().add (what_we_got);
                        _session.add_command( new MementoCommand<Playlist>(*playlist.get(), &before, &playlist->get_state()));
                        ret = true;
                }
                break;
        case Copy:
                if ((what_we_got = playlist->copy (time)) != 0) {
-                       editor.get_cut_buffer().add (what_we_got);
+                       _editor.get_cut_buffer().add (what_we_got);
                }
                break;
 
@@ -1230,7 +1476,7 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
        boost::shared_ptr<Playlist> playlist = get_diskstream()->playlist();
        PlaylistSelection::iterator p;
        
-       for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth);
+       for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth) {}
 
        if (p == selection.playlists.end()) {
                return false;
@@ -1247,13 +1493,12 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
 }
 
 
-list<TimeAxisView*>
+TimeAxisView::Children
 RouteTimeAxisView::get_child_list()
 {
-  
-       list<TimeAxisView*>redirect_children;
+       TimeAxisView::Children redirect_children;
        
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                if (!(*i)->hidden()) {
                        redirect_children.push_back(*i);
                }
@@ -1275,9 +1520,7 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        menu->set_name ("ArdourContextMenu");
        playlist_items.clear();
 
-       if (playlist_menu) {
-               delete playlist_menu;
-       }
+       delete playlist_menu;
 
        playlist_menu = new Menu;
        playlist_menu->set_name ("ArdourContextMenu");
@@ -1309,10 +1552,19 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        playlist_items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
        playlist_items.push_back (SeparatorElem());
 
-       playlist_items.push_back (MenuElem (_("New"), mem_fun(editor, &PublicEditor::new_playlists)));
-       playlist_items.push_back (MenuElem (_("New Copy"), mem_fun(editor, &PublicEditor::copy_playlists)));
+       if (!edit_group() || !edit_group()->is_active()) {
+               playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(_editor, &PublicEditor::new_playlists), this)));
+               playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(_editor, &PublicEditor::copy_playlists), this)));
+
+       } else {
+               // Use a label which tells the user what is happening
+               playlist_items.push_back (MenuElem (_("New Take"), bind(mem_fun(_editor, &PublicEditor::new_playlists), this)));
+               playlist_items.push_back (MenuElem (_("Copy Take"), bind(mem_fun(_editor, &PublicEditor::copy_playlists), this)));
+               
+       }
+
        playlist_items.push_back (SeparatorElem());
-       playlist_items.push_back (MenuElem (_("Clear Current"), mem_fun(editor, &PublicEditor::clear_playlists)));
+       playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(_editor, &PublicEditor::clear_playlists), this)));
        playlist_items.push_back (SeparatorElem());
 
        playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
@@ -1332,14 +1584,58 @@ RouteTimeAxisView::use_playlist (boost::weak_ptr<Playlist> wpl)
        boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl);
        
        if (apl) {
+               if (get_diskstream()->playlist() == apl) {
+                       // radio button cotnrols mean this function is called for both the 
+                       // old and new playlist
+                       return;
+               }
                get_diskstream()->use_playlist (apl);
+
+
+               if (edit_group() && edit_group()->is_active()) {
+                       //PBD::stacktrace(cerr, 20);
+                       std::string group_string = "."+edit_group()->name()+".";
+
+                       std::string take_name = apl->name();
+                       std::string::size_type idx = take_name.find(group_string);
+
+                       if (idx == std::string::npos)
+                               return;
+
+                       take_name = take_name.substr(idx + group_string.length()); // find the bit containing the take number / name
+                       
+                       for (list<Route*>::const_iterator i = edit_group()->route_list().begin(); i != edit_group()->route_list().end(); ++i) {
+                               if ( (*i) == this->route().get()) {
+                                       continue;
+                               }
+                               
+                               std::string playlist_name = (*i)->name()+group_string+take_name;
+
+                               Track *track = dynamic_cast<Track *>(*i);
+                               if (!track) {
+                                       std::cerr << "route " << (*i)->name() << " is not a Track" << std::endl;
+                                       continue;
+                               }
+
+                               boost::shared_ptr<Playlist> ipl = session().playlist_by_name(playlist_name);
+                               if (!ipl) {
+                                       // No playlist for this track for this take yet, make it
+                                       track->diskstream()->use_new_playlist();
+                                       track->diskstream()->playlist()->set_name(playlist_name);
+                               } else {
+                                       track->diskstream()->use_playlist(ipl);
+                               }
+                               
+                               //(*i)->get_dis
+                       }
+               }
        }
 }
 
 void
 RouteTimeAxisView::show_playlist_selector ()
 {
-       editor.playlist_selector().show_for (this);
+       _editor.playlist_selector().show_for (this);
 }
 
 void
@@ -1364,29 +1660,91 @@ RouteTimeAxisView::map_frozen ()
 }
 
 void
-RouteTimeAxisView::color_handler (ColorID id, uint32_t val)
+RouteTimeAxisView::color_handler ()
 {
-       switch (id) {
-       case cTimeStretchOutline:
-               timestretch_rect->property_outline_color_rgba() = val;
-               break;
-       case cTimeStretchFill:
-               timestretch_rect->property_fill_color_rgba() = val;
-               break;
-       default:
-               break;
+       //case cTimeStretchOutline:
+       if (timestretch_rect) {
+               timestretch_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchOutline.get();
        }
+       //case cTimeStretchFill:
+       if (timestretch_rect) {
+               timestretch_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
+       }
+
+       reset_meter();
+}
+
+void
+RouteTimeAxisView::toggle_automation_track (Evoral::Parameter param)
+{
+       RouteAutomationNode* node = automation_track(param);
+
+       if (!node)
+               return;
+
+       bool showit = node->menu_item->get_active();
+
+       if (showit != node->track->marked_for_display()) {
+               if (showit) {
+                       node->track->set_marked_for_display (true);
+                       node->track->canvas_display()->show();
+                       node->track->get_state_node()->add_property ("shown", X_("yes"));
+               } else {
+                       node->track->set_marked_for_display (false);
+                       node->track->hide ();
+                       node->track->get_state_node()->add_property ("shown", X_("no"));
+               }
+
+               /* now trigger a redisplay */
+               
+               if (!no_redraw) {
+                        _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */
+               }
+       }
+}
+
+void
+RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param)
+{
+       RouteAutomationNode* ran = automation_track(param);
+       if (!ran) {
+               return;
+       }
+       
+       // 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"));
+
+       if (ran->menu_item && !_hidden) {
+               ran->menu_item->set_active (false);
+       }
+
+        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
+
 void
 RouteTimeAxisView::show_all_automation ()
 {
        no_redraw = true;
+       
+       /* 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"));
+               i->second->menu_item->set_active(true);
+       }
 
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
-               for (vector<RedirectAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
+
+       /* Show processor automation */
+
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
+               for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
                        if ((*ii)->view == 0) {
-                               add_redirect_automation_curve ((*i)->redirect, (*ii)->what);
+                               add_processor_automation_curve ((*i)->processor, (*ii)->what);
                        } 
 
                        (*ii)->menu_item->set_active (true);
@@ -1395,25 +1753,42 @@ RouteTimeAxisView::show_all_automation ()
 
        no_redraw = false;
 
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+       /* Redraw */
+
+        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
 RouteTimeAxisView::show_existing_automation ()
 {
        no_redraw = true;
+       
+       /* 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 (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
-               for (vector<RedirectAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
-                       if ((*ii)->view != 0) {
+
+       /* Show processor automation */
+
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
+               for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
+                       if ((*ii)->view != 0 && (*i)->processor->data().control((*ii)->what)->list()->size() > 0) {
                                (*ii)->menu_item->set_active (true);
                        }
                }
        }
 
        no_redraw = false;
-
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+       
+       _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
@@ -1421,68 +1796,78 @@ RouteTimeAxisView::hide_all_automation ()
 {
        no_redraw = true;
 
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
-               for (vector<RedirectAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
+       /* 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"));
+               i->second->menu_item->set_active (false);
+       }
+
+       /* Hide processor automation */
+
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
+               for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
                        (*ii)->menu_item->set_active (false);
                }
        }
 
+       _show_automation.clear();
+
        no_redraw = false;
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 
 void
 RouteTimeAxisView::region_view_added (RegionView* rv)
 {
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
-               AutomationTimeAxisView* atv;
-
-               if ((atv = dynamic_cast<AutomationTimeAxisView*> (*i)) != 0) {
-                       rv->add_ghost (*atv);
+       /* 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);
+                       }
                }
        }
-}
 
-void
-RouteTimeAxisView::add_ghost_to_redirect (RegionView* rv, AutomationTimeAxisView* atv)
-{
-       rv->add_ghost (*atv);
+       for (UnderlayMirrorList::iterator i = _underlay_mirrors.begin(); i != _underlay_mirrors.end(); ++i) {
+               (*i)->add_ghost(rv);
+       }
 }
 
-RouteTimeAxisView::RedirectAutomationInfo::~RedirectAutomationInfo ()
+RouteTimeAxisView::ProcessorAutomationInfo::~ProcessorAutomationInfo ()
 {
-       for (vector<RedirectAutomationNode*>::iterator i = lines.begin(); i != lines.end(); ++i) {
+       for (vector<ProcessorAutomationNode*>::iterator i = lines.begin(); i != lines.end(); ++i) {
                delete *i;
        }
 }
 
 
-RouteTimeAxisView::RedirectAutomationNode::~RedirectAutomationNode ()
+RouteTimeAxisView::ProcessorAutomationNode::~ProcessorAutomationNode ()
 {
-       parent.remove_ran (this);
-
-       if (view) {
-               delete view;
-       }
+       parent.remove_processor_automation_node (this);
 }
 
 void
-RouteTimeAxisView::remove_ran (RedirectAutomationNode* ran)
+RouteTimeAxisView::remove_processor_automation_node (ProcessorAutomationNode* pan)
 {
-       if (ran->view) {
-               remove_child (ran->view);
+       if (pan->view) {
+               remove_child (pan->view);
        }
 }
 
-RouteTimeAxisView::RedirectAutomationNode*
-RouteTimeAxisView::find_redirect_automation_node (boost::shared_ptr<Redirect> redirect, uint32_t what)
+RouteTimeAxisView::ProcessorAutomationNode*
+RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr<Processor> processor, Evoral::Parameter what)
 {
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
 
-               if ((*i)->redirect == redirect) {
+               if ((*i)->processor == processor) {
 
-                       for (vector<RedirectAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
+                       for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
                                if ((*ii)->what == what) {
                                        return *ii;
                                }
@@ -1493,12 +1878,11 @@ RouteTimeAxisView::find_redirect_automation_node (boost::shared_ptr<Redirect> re
        return 0;
 }
 
-// FIXME: duplicated in midi_time_axis.cc
 static string 
 legalize_for_xml_node (string str)
 {
        string::size_type pos;
-       string legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_+=:";
+       string legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_=:";
        string legal;
 
        legal = str;
@@ -1514,116 +1898,162 @@ legalize_for_xml_node (string str)
 
 
 void
-RouteTimeAxisView::add_redirect_automation_curve (boost::shared_ptr<Redirect> redirect, uint32_t what)
+RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> processor, Evoral::Parameter what)
 {
-       RedirectAutomationLine* ral;
        string name;
-       RedirectAutomationNode* ran;
+       ProcessorAutomationNode* pan;
 
-       if ((ran = find_redirect_automation_node (redirect, what)) == 0) {
+       if ((pan = find_processor_automation_node (processor, what)) == 0) {
                fatal << _("programming error: ")
-                     << string_compose (X_("redirect automation curve for %1:%2 not registered with audio track!"),
-                                 redirect->name(), what)
+                     << string_compose (X_("processor automation curve for %1:%2 not registered with track!"),
+                                 processor->name(), what)
                      << endmsg;
                /*NOTREACHED*/
                return;
        }
 
-       if (ran->view) {
+       if (pan->view) {
                return;
        }
 
-       name = redirect->describe_parameter (what);
+       name = processor->describe_parameter (what);
 
        /* create a string that is a legal XML node name that can be used to refer to this redirect+port combination */
 
+       /* FIXME: ew */
+
        char state_name[256];
-       snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (redirect->name()).c_str(), what);
+       snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
 
-       ran->view = new RedirectAutomationTimeAxisView (_session, _route, editor, *this, parent_canvas, name, what, *redirect, state_name);
+       boost::shared_ptr<AutomationControl> control
+                       = boost::dynamic_pointer_cast<AutomationControl>(processor->data().control(what, true));
 
-       ral = new RedirectAutomationLine (name, 
-                                         *redirect, what, _session, *ran->view,
-                                         *ran->view->canvas_display, redirect->automation_list (what));
-       
-       ral->set_line_color (color_map[cRedirectAutomationLine]);
-       ral->queue_reset ();
+       pan->view = boost::shared_ptr<AutomationTimeAxisView>(
+                       new AutomationTimeAxisView (_session, _route, processor, control,
+                               _editor, *this, false, parent_canvas, name, state_name));
 
-       ran->view->add_line (*ral);
+       pan->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
 
-       ran->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::redirect_automation_track_hidden), ran, redirect));
-
-       if (!ran->view->marked_for_display()) {
-               ran->view->hide ();
+       if (!pan->view->marked_for_display()) {
+               pan->view->hide ();
        } else {
-               ran->menu_item->set_active (true);
+               pan->menu_item->set_active (true);
        }
 
-       add_child (ran->view);
+       add_child (pan->view);
 
        if (_view) {
-               _view->foreach_regionview (bind (mem_fun(*this, &RouteTimeAxisView::add_ghost_to_redirect), ran->view));
+               _view->foreach_regionview (mem_fun(*pan->view.get(), &TimeAxisView::add_ghost));
        }
 
-       redirect->mark_automation_visible (what, true);
+       processor->mark_automation_visible (what, true);
 }
 
 void
-RouteTimeAxisView::redirect_automation_track_hidden (RouteTimeAxisView::RedirectAutomationNode* ran, boost::shared_ptr<Redirect> r)
+RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr<Processor> i)
 {
        if (!_hidden) {
-               ran->menu_item->set_active (false);
+               pan->menu_item->set_active (false);
        }
 
-       r->mark_automation_visible (ran->what, false);
+       i->mark_automation_visible (pan->what, false);
 
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
-RouteTimeAxisView::add_existing_redirect_automation_curves (boost::shared_ptr<Redirect> redirect)
+RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr<Processor> p)
 {
-       set<uint32_t> s;
-       RedirectAutomationLine *ral;
+       boost::shared_ptr<Processor> processor (p.lock ());
+       if (!processor) {
+               return;
+       }
+       
+       set<Evoral::Parameter> s;
+       boost::shared_ptr<AutomationLine> al;
 
-       redirect->what_has_visible_automation (s);
+       processor->what_has_visible_data (s);
 
-       for (set<uint32_t>::iterator i = s.begin(); i != s.end(); ++i) {
+       for (set<Evoral::Parameter>::iterator i = s.begin(); i != s.end(); ++i) {
                
-               if ((ral = find_redirect_automation_curve (redirect, *i)) != 0) {
-                       ral->queue_reset ();
+               if ((al = find_processor_automation_curve (processor, *i)) != 0) {
+                       al->queue_reset ();
                } else {
-                       add_redirect_automation_curve (redirect, (*i));
+                       add_processor_automation_curve (processor, (*i));
                }
        }
 }
 
 void
-RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r)
+RouteTimeAxisView::add_automation_child(Evoral::Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show)
 {
        using namespace Menu_Helpers;
-       RedirectAutomationInfo *rai;
-       list<RedirectAutomationInfo*>::iterator x;
+
+       XMLProperty* prop;
+       XMLNode* node;
+
+       add_child (track);
+
+       track->Hiding.connect (bind (mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param));
+
+       bool hideit = (!show);
+
+       if ((node = track->get_state_node()) != 0) {
+               if  ((prop = node->property ("shown")) != 0) {
+                       if (prop->value() == "yes") {
+                               hideit = false;
+                       }
+               } 
+       }
+
+       _automation_tracks.insert(std::make_pair(param, new RouteAutomationNode(param, NULL, track)));
+
+       if (hideit) {
+               track->hide ();
+       } else {
+               _show_automation.insert (param);
+
+
+               if (!no_redraw) {
+                       _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+               }
+       }
+
+       build_display_menu();
+}
+
+
+void
+RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p)
+{
+       boost::shared_ptr<Processor> processor (p.lock ());
+       if (!processor) {
+               return;
+       }
+       
+       using namespace Menu_Helpers;
+       ProcessorAutomationInfo *rai;
+       list<ProcessorAutomationInfo*>::iterator x;
        
-       const std::set<uint32_t>& automatable = r->what_can_be_automated ();
-       std::set<uint32_t> has_visible_automation;
+       const std::set<Evoral::Parameter>& automatable = processor->what_can_be_automated ();
+       std::set<Evoral::Parameter> has_visible_automation;
 
-       r->what_has_visible_automation(has_visible_automation);
+       processor->what_has_visible_data(has_visible_automation);
 
        if (automatable.empty()) {
                return;
        }
 
-       for (x = redirect_automation.begin(); x != redirect_automation.end(); ++x) {
-               if ((*x)->redirect == r) {
+       for (x = processor_automation.begin(); x != processor_automation.end(); ++x) {
+               if ((*x)->processor == processor) {
                        break;
                }
        }
 
-       if (x == redirect_automation.end()) {
+       if (x == processor_automation.end()) {
 
-               rai = new RedirectAutomationInfo (r);
-               redirect_automation.push_back (rai);
+               rai = new ProcessorAutomationInfo (processor);
+               processor_automation.push_back (rai);
 
        } else {
 
@@ -1631,7 +2061,7 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r
 
        }
 
-       /* any older menu was deleted at the top of redirects_changed()
+       /* any older menu was deleted at the top of processors_changed()
           when we cleared the subplugin menu.
        */
 
@@ -1641,12 +2071,12 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r
 
        items.clear ();
 
-       for (std::set<uint32_t>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
+       for (std::set<Evoral::Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
 
-               RedirectAutomationNode* ran;
+               ProcessorAutomationNode* pan;
                CheckMenuItem* mitem;
                
-               string name = r->describe_parameter (*i);
+               string name = processor->describe_parameter (*i);
                
                items.push_back (CheckMenuElem (name));
                mitem = dynamic_cast<CheckMenuItem*> (&items.back());
@@ -1655,54 +2085,55 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r
                        mitem->set_active(true);
                }
 
-               if ((ran = find_redirect_automation_node (r, *i)) == 0) {
+               if ((pan = find_processor_automation_node (processor, *i)) == 0) {
 
                        /* new item */
                        
-                       ran = new RedirectAutomationNode (*i, mitem, *this);
+                       pan = new ProcessorAutomationNode (*i, mitem, *this);
                        
-                       rai->lines.push_back (ran);
+                       rai->lines.push_back (pan);
 
                } else {
 
-                       ran->menu_item = mitem;
+                       pan->menu_item = mitem;
 
                }
 
-               mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::redirect_menu_item_toggled), rai, ran));
+               mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan));
        }
 
-       /* add the menu for this redirect, because the subplugin
-          menu is always cleared at the top of redirects_changed().
+       /* add the menu for this processor, because the subplugin
+          menu is always cleared at the top of processors_changed().
           this is the result of some poor design in gtkmm and/or
           GTK+.
        */
 
-       subplugin_menu.items().push_back (MenuElem (r->name(), *rai->menu));
+       subplugin_menu.items().push_back (MenuElem (processor->name(), *rai->menu));
        rai->valid = true;
 }
 
 void
-RouteTimeAxisView::redirect_menu_item_toggled (RouteTimeAxisView::RedirectAutomationInfo* rai,
-                                              RouteTimeAxisView::RedirectAutomationNode* ran)
+RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAutomationInfo* rai,
+                                              RouteTimeAxisView::ProcessorAutomationNode* pan)
 {
-       bool showit = ran->menu_item->get_active();
+       bool showit = pan->menu_item->get_active();
        bool redraw = false;
 
-       if (ran->view == 0 && showit) {
-               add_redirect_automation_curve (rai->redirect, ran->what);
+       if (pan->view == 0 && showit) {
+               add_processor_automation_curve (rai->processor, pan->what);
                redraw = true;
        }
 
-       if (showit != ran->view->marked_for_display()) {
+       if (pan->view && showit != pan->view->marked_for_display()) {
 
                if (showit) {
-                       ran->view->set_marked_for_display (true);
-                       ran->view->canvas_display->show();
+                       pan->view->set_marked_for_display (true);
+                       pan->view->canvas_display()->show();
+                       pan->view->canvas_background()->show();
                } else {
-                       rai->redirect->mark_automation_visible (ran->what, true);
-                       ran->view->set_marked_for_display (false);
-                       ran->view->hide ();
+                       rai->processor->mark_automation_visible (pan->what, true);
+                       pan->view->set_marked_for_display (false);
+                       pan->view->hide ();
                }
 
                redraw = true;
@@ -1713,28 +2144,28 @@ RouteTimeAxisView::redirect_menu_item_toggled (RouteTimeAxisView::RedirectAutoma
 
                /* now trigger a redisplay */
                
-                _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+                _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 
        }
 }
 
 void
-RouteTimeAxisView::redirects_changed (void *src)
+RouteTimeAxisView::processors_changed ()
 {
        using namespace Menu_Helpers;
-
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
+       
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                (*i)->valid = false;
        }
 
        subplugin_menu.items().clear ();
 
-       _route->foreach_redirect (this, &RouteTimeAxisView::add_redirect_to_subplugin_menu);
-       _route->foreach_redirect (this, &RouteTimeAxisView::add_existing_redirect_automation_curves);
+       _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
+       _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
 
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ) {
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ) {
 
-               list<RedirectAutomationInfo*>::iterator tmp;
+               list<ProcessorAutomationInfo*>::iterator tmp;
 
                tmp = i;
                ++tmp;
@@ -1742,7 +2173,7 @@ RouteTimeAxisView::redirects_changed (void *src)
                if (!(*i)->valid) {
 
                        delete *i;
-                       redirect_automation.erase (i);
+                       processor_automation.erase (i);
 
                } 
 
@@ -1751,27 +2182,27 @@ RouteTimeAxisView::redirects_changed (void *src)
 
        /* change in visibility was possible */
 
-       _route->gui_changed ("track_height", this);
+       _route->gui_changed ("visible_tracks", this);
 }
 
-RedirectAutomationLine *
-RouteTimeAxisView::find_redirect_automation_curve (boost::shared_ptr<Redirect> redirect, uint32_t what)
+boost::shared_ptr<AutomationLine>
+RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr<Processor> processor, Evoral::Parameter what)
 {
-       RedirectAutomationNode* ran;
+       ProcessorAutomationNode* pan;
 
-       if ((ran = find_redirect_automation_node (redirect, what)) != 0) {
-               if (ran->view) {
-                       return dynamic_cast<RedirectAutomationLine*> (ran->view->lines.front());
+       if ((pan = find_processor_automation_node (processor, what)) != 0) {
+               if (pan->view) {
+                       pan->view->line();
                } 
        }
 
-       return 0;
+       return boost::shared_ptr<AutomationLine>();
 }
 
 void
-RouteTimeAxisView::reset_redirect_automation_curves ()
+RouteTimeAxisView::reset_processor_automation_curves ()
 {
-       for (vector<RedirectAutomationLine*>::iterator i = redirect_automation_curves.begin(); i != redirect_automation_curves.end(); ++i) {
+       for (ProcessorAutomationCurves::iterator i = processor_automation_curves.begin(); i != processor_automation_curves.end(); ++i) {
                (*i)->reset();
        }
 }
@@ -1783,3 +2214,212 @@ RouteTimeAxisView::update_rec_display ()
        name_entry.set_sensitive (!_route->record_enabled());
 }
                
+void
+RouteTimeAxisView::set_layer_display (LayerDisplay d)
+{
+       if (_view) {
+               _view->set_layer_display (d);
+       }
+}
+
+LayerDisplay
+RouteTimeAxisView::layer_display () const
+{
+       if (_view) {
+               return _view->layer_display ();
+       }
+
+       /* we don't know, since we don't have a _view, so just return something */
+       return Overlaid;
+}
+
+       
+
+boost::shared_ptr<AutomationTimeAxisView>
+RouteTimeAxisView::automation_child(Evoral::Parameter param)
+{
+       AutomationTracks::iterator i = _automation_tracks.find(param);
+       if (i != _automation_tracks.end())
+               return i->second->track;
+       else
+               return boost::shared_ptr<AutomationTimeAxisView>();
+}
+
+void
+RouteTimeAxisView::fast_update ()
+{
+       gm.get_level_meter().update_meters ();
+}
+
+void
+RouteTimeAxisView::hide_meter ()
+{
+       clear_meter ();
+       gm.get_level_meter().hide_meters ();
+}
+
+void
+RouteTimeAxisView::show_meter ()
+{
+       reset_meter ();
+}
+
+void
+RouteTimeAxisView::reset_meter ()
+{
+       if (Config->get_show_track_meters()) {
+               gm.get_level_meter().setup_meters (height-5);
+       } else {
+               hide_meter ();
+       }
+}
+
+void
+RouteTimeAxisView::clear_meter ()
+{
+       gm.get_level_meter().clear_meters ();
+}
+
+void
+RouteTimeAxisView::meter_changed (void *src)
+{
+       ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src));
+       reset_meter();
+}
+
+void
+RouteTimeAxisView::io_changed (IOChange change, void *src)
+{
+       reset_meter ();
+}
+
+void
+RouteTimeAxisView::build_underlay_menu(Gtk::Menu* parent_menu) {
+       using namespace Menu_Helpers;
+
+       if(!_underlay_streams.empty()) {
+               MenuList& parent_items = parent_menu->items();
+               Menu* gs_menu = manage (new Menu);
+               gs_menu->set_name ("ArdourContextMenu");
+               MenuList& gs_items = gs_menu->items();
+               
+               parent_items.push_back (MenuElem (_("Underlays"), *gs_menu));
+               
+               for(UnderlayList::iterator it = _underlay_streams.begin(); it != _underlay_streams.end(); ++it) {
+                       gs_items.push_back(MenuElem(string_compose(_("Remove \"%1\""), (*it)->trackview().name()),
+                                                   bind(mem_fun(*this, &RouteTimeAxisView::remove_underlay), *it)));
+               }
+       }
+}
+
+bool
+RouteTimeAxisView::set_underlay_state() 
+{
+       if(!underlay_xml_node) {
+               return false;
+       }
+
+       XMLNodeList nlist = underlay_xml_node->children();
+       XMLNodeConstIterator niter;
+       XMLNode *child_node;
+       
+       for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+               child_node = *niter;
+
+               if(child_node->name() != "Underlay") {
+                       continue;
+               }
+
+               XMLProperty* prop = child_node->property ("id");
+               if (prop) {
+                       PBD::ID id (prop->value());
+
+                       RouteTimeAxisView* v = _editor.get_route_view_by_id (id);
+
+                       if (v) {
+                               add_underlay(v->view(), false);
+                       }
+               }
+       }
+
+       return false;
+}
+
+void
+RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml) 
+{
+       if(!v) {
+               return;
+       }
+
+       RouteTimeAxisView& other = v->trackview();
+
+       if(find(_underlay_streams.begin(), _underlay_streams.end(), v) == _underlay_streams.end()) {
+               if(find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this) != other._underlay_mirrors.end()) {
+                       fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
+                       /*NOTREACHED*/
+               }
+
+               _underlay_streams.push_back(v);
+               other._underlay_mirrors.push_back(this);
+
+               v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::add_ghost));
+
+               if(update_xml) {
+                       if(!underlay_xml_node) {
+                               ensure_xml_node();
+                               underlay_xml_node = xml_node->add_child("Underlays");
+                       }
+
+                       XMLNode* node = underlay_xml_node->add_child("Underlay");
+                       XMLProperty* prop = node->add_property("id");
+                       prop->set_value(v->trackview().route()->id().to_s());
+               }
+       }
+}
+
+void
+RouteTimeAxisView::remove_underlay(StreamView* v) 
+{
+       if(!v) {
+               return;
+       }
+
+       UnderlayList::iterator it = find(_underlay_streams.begin(), _underlay_streams.end(), v);
+       RouteTimeAxisView& other = v->trackview();
+
+       if(it != _underlay_streams.end()) {
+               UnderlayMirrorList::iterator gm = find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this);
+
+               if(gm == other._underlay_mirrors.end()) {
+                       fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
+                       /*NOTREACHED*/
+               }
+
+               v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::remove_ghost));
+
+               _underlay_streams.erase(it);
+               other._underlay_mirrors.erase(gm);
+
+               if(underlay_xml_node) {
+                       underlay_xml_node->remove_nodes_and_delete("id", v->trackview().route()->id().to_s());
+               }
+       }
+}
+
+void
+RouteTimeAxisView::set_edit_group_to_new ()
+{
+       RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active);
+       g->set_active (true, this);
+
+       RouteGroupDialog d (g);
+       int const r = d.do_run ();
+
+       if (r == Gtk::RESPONSE_OK) {
+               _session.add_edit_group (g);
+               _route->set_edit_group (g, this);
+       } else {
+               delete g;
+       }
+}