cleanup up cleanup at session destruction; clarify the meaning of 3 signals (DropRefe...
[ardour.git] / gtk2_ardour / route_time_axis.cc
index 976a3e1667ed5602f24cd6d3b6122251ad7e4fc3..3e6edd65e1b631335322bccd021804ae4240d641 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
 #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 "pbd/enumwriter.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/processor.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/parameter.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/debug.h"
+#include "ardour/utils.h"
+#include "evoral/Parameter.hpp"
 
 #include "ardour_ui.h"
 #include "route_time_axis.h"
 #include "simplerect.h"
 #include "streamview.h"
 #include "utils.h"
+#include "route_group_menu.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;
 
-RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr<Route> rt, Canvas& canvas)
-       : AxisView(sess),
-         RouteUI(rt, sess, _("m"), _("s"), _("r")), // mute, solo, and record
-         TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas),
-         parent_canvas (canvas),
-         button_table (3, 3),
-         edit_group_button (_("g")), // group
-         playlist_button (_("p")), 
-         size_button (_("h")), // height
-         automation_button (_("a")),
-         visual_button (_("v"))
+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)
+       , RouteUI(rt, sess)
+       , TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas)
+       , parent_canvas (canvas)
+       , button_table (3, 3)
+       , route_group_button (_("g"))
+       , playlist_button (_("p"))
+       , size_button (_("h"))
+       , automation_button (_("a"))
+       , visual_button (_("v"))
+       , gm (sess, slider, true, 115)
 {
+       set_button_names ();
+
+       gm.set_controls (_route, _route->shared_peak_meter(), _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;
+       mode_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;
 
-       edit_group_button.set_name ("TrackGroupButton");
+       route_group_button.set_name ("TrackGroupButton");
        playlist_button.set_name ("TrackPlaylistButton");
        automation_button.set_name ("TrackAutomationButton");
        size_button.set_name ("TrackSizeButton");
        visual_button.set_name ("TrackVisualButton");
        hide_button.set_name ("TrackRemoveButton");
 
+       route_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 ();
 
-       edit_group_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::edit_click), false);
-       playlist_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::playlist_click));
-       automation_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::automation_click));
-       size_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::size_click), false);
-       visual_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::visual_click));
-       hide_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::hide_click));
+       route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_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));
+       size_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::size_click), false);
+       visual_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::visual_click));
+       hide_button.signal_clicked().connect (sigc::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));
-       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));
+       solo_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::solo_press), false);
+       solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false);
+       mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false);
+       mute_button->signal_button_release_event().connect (sigc::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:
@@ -143,226 +184,160 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
                }
                rec_enable_button->show_all ();
 
-               rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false);
-               rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release));
+               rec_enable_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_press), false);
+               rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release), false);
                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"));
+
+               rec_enable_button->set_sensitive (_session->writable());
        }
 
+       controls_hbox.pack_start(gm.get_level_meter(), false, false);
+       _route->meter_change.connect (*this, ui_bind (&RouteTimeAxisView::meter_changed, this, _1), gui_context());
+       _route->input()->changed.connect (*this, ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
+       _route->output()->changed.connect (*this, ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
+
        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 (route_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"));
-       ARDOUR_UI::instance()->tooltips().set_tip(edit_group_button,_("Edit Group"));
+       ARDOUR_UI::instance()->tooltips().set_tip(route_group_button, _("Route Group"));
        ARDOUR_UI::instance()->tooltips().set_tip(size_button,_("Display Height"));
        ARDOUR_UI::instance()->tooltips().set_tip(playlist_button,_("Playlist"));
        ARDOUR_UI::instance()->tooltips().set_tip(automation_button, _("Automation"));
        ARDOUR_UI::instance()->tooltips().set_tip(visual_button, _("Visual options"));
        ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("Hide this track"));
-       
+
        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->processors_changed.connect (mem_fun(*this, &RouteTimeAxisView::processors_changed));
-       _route->NameChanged.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed));
-       _route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
+       _route->mute_changed.connect (*this, ui_bind (&RouteUI::mute_changed, this, _1), gui_context());
+       _route->solo_changed.connect (*this, ui_bind (&RouteUI::solo_changed, this, _1), gui_context());
+       _route->processors_changed.connect (*this, ui_bind (&RouteTimeAxisView::processors_changed, this, _1), gui_context());
+       _route->NameChanged.connect (*this, boost::bind (&RouteTimeAxisView::route_name_changed, this), gui_context());
+       _route->solo_isolated_changed.connect (*this, ui_bind (&RouteUI::solo_changed, this, _1), gui_context());
 
 
        if (is_track()) {
 
-               track()->TrackModeChanged.connect (mem_fun(*this, &RouteTimeAxisView::track_mode_changed));
-               track()->FreezeChange.connect (mem_fun(*this, &RouteTimeAxisView::map_frozen));
-               track()->DiskstreamChanged.connect (mem_fun(*this, &RouteTimeAxisView::diskstream_changed));
-               get_diskstream()->SpeedChanged.connect (mem_fun(*this, &RouteTimeAxisView::speed_changed));
+               track()->TrackModeChanged.connect (*this, boost::bind (&RouteTimeAxisView::track_mode_changed, this), gui_context());
+               track()->FreezeChange.connect (*this, boost::bind (&RouteTimeAxisView::map_frozen, this), gui_context());
+               track()->DiskstreamChanged.connect (*this, boost::bind (&RouteTimeAxisView::diskstream_changed, this), gui_context());
+               get_diskstream()->SpeedChanged.connect (*this, boost::bind (&RouteTimeAxisView::speed_changed, this), gui_context());
 
                /* pick up the correct freeze state */
                map_frozen ();
 
        }
 
-       editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
-       ColorsChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
+       _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
+       ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler));
+
+       route_group_menu = new RouteGroupMenu (
+               _session,
+               (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit)
+               );
+
+       route_group_menu->GroupSelected.connect (sigc::mem_fun (*this, &RouteTimeAxisView::set_route_group_from_menu));
+
+       gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
+       gm.get_gain_slider().set_name ("TrackGainFader");
 }
 
 RouteTimeAxisView::~RouteTimeAxisView ()
 {
-       GoingAway (); /* EMIT_SIGNAL */
+       CatchDeletion (this);
 
        for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                delete *i;
        }
 
-       if (playlist_menu) {
-               delete playlist_menu;
-               playlist_menu = 0;
-       }
-  
-       if (playlist_action_menu) {
-               delete playlist_action_menu;
-               playlist_action_menu = 0;
-       }
-
-       if (_view) {
-               delete _view;
-               _view = 0;
-       }
-}
+       delete playlist_menu;
+       playlist_menu = 0;
 
-void
-RouteTimeAxisView::post_construct ()
-{
-       /* map current state of the route */
+       delete playlist_action_menu;
+       playlist_action_menu = 0;
 
-       update_diskstream_display ();
-       _route->foreach_processor (this, &RouteTimeAxisView::add_processor_to_subplugin_menu);
-       _route->foreach_processor (this, &RouteTimeAxisView::add_existing_processor_automation_curves);
-       reset_processor_automation_curves ();
-}
+       delete _view;
+       _view = 0;
 
-void
-RouteTimeAxisView::set_playlist (boost::shared_ptr<Playlist> newplaylist)
-{
-       boost::shared_ptr<Playlist> pl = playlist();
-       assert(pl);
+       for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+               delete i->second;
+       }
 
-       modified_connection.disconnect ();
-       modified_connection = pl->Modified.connect (mem_fun(*this, &RouteTimeAxisView::playlist_modified));
-}
+       _automation_tracks.clear ();
 
-void
-RouteTimeAxisView::playlist_modified ()
-{
+       delete route_group_menu;
 }
 
 void
-RouteTimeAxisView::set_state (const XMLNode& node)
+RouteTimeAxisView::post_construct ()
 {
-       const XMLProperty *prop;
-       
-       TimeAxisView::set_state (node);
-       
-       if ((prop = node.property ("shown_editor")) != 0) {
-               if (prop->value() == "no") {
-                       _marked_for_display = false;
-               } else {
-                       _marked_for_display = true;
-               }
-       } else {
-               _marked_for_display = true;
-       }
-       
-       XMLNodeList nlist = node.children();
-       XMLNodeConstIterator niter;
-       XMLNode *child_node;
-       
-       _show_automation.clear();
-       
-       for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               child_node = *niter;
-
-               if (child_node->name() != AutomationTimeAxisView::state_node_name)
-                       continue;
-
-               XMLProperty* prop = child_node->property ("automation-id");
-               if (!prop)
-                       continue;
-
-               Parameter param(prop->value());
-               if (!param)
-                       continue;
-               
-               bool show = false;
-
-               prop = child_node->property ("shown");
+       /* map current state of the route */
 
-               if (prop && prop->value() == "yes") {
-                       show = true;
-                       _show_automation.insert(param);
-               }
-               
-               if (_automation_tracks.find(param) == _automation_tracks.end())
-                       create_automation_child(param, show);
-       }
-}
+       update_diskstream_display ();
 
-XMLNode* 
-RouteTimeAxisView::get_automation_child_xml_node (Parameter param)
-{
-       return RouteUI::get_automation_child_xml_node (param);
+       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));
+       reset_processor_automation_curves ();
 }
 
 gint
 RouteTimeAxisView::edit_click (GdkEventButton *ev)
 {
-       if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
-               _route->set_edit_group (0, this);
-               return FALSE;
-       } 
-
-       using namespace Menu_Helpers;
-
-       MenuList& items = edit_group_menu.items ();
-       RadioMenuItem::Group group;
-
-       items.clear ();
-       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 ();
+       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+               if (_route->route_group()) {
+                       _route->route_group()->remove (_route);
+               }
+               return false;
        }
-       
-       _session.foreach_edit_group (bind (mem_fun (*this, &RouteTimeAxisView::add_edit_group_menu_item), &group));
-       edit_group_menu.popup (ev->button, ev->time);
-
-       return FALSE;
-}
-
-void
-RouteTimeAxisView::add_edit_group_menu_item (RouteGroup *eg, RadioMenuItem::Group* group)
-{
-       using namespace Menu_Helpers;
 
-       MenuList &items = edit_group_menu.items();
+       route_group_menu->rebuild (_route->route_group ());
+       route_group_menu->popup (ev->button, ev->time);
 
-       items.push_back (RadioMenuElem (*group, eg->name(), bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), eg)));
-       if (_route->edit_group() == eg) {
-               static_cast<RadioMenuItem*>(&items.back())->set_active ();
-       }
+       return false;
 }
 
 void
-RouteTimeAxisView::set_edit_group_from_menu (RouteGroup *eg)
+RouteTimeAxisView::set_route_group_from_menu (RouteGroup *eg)
 {
-       _route->set_edit_group (eg, this);
+       if (eg) {
+               eg->add (_route);
+       } else {
+               if (_route->route_group()) {
+                       _route->route_group()->remove (_route);
+               }
+       }
 }
 
 void
 RouteTimeAxisView::playlist_changed ()
-
 {
        label_view ();
-
-       if (is_track()) {
-               set_playlist (get_diskstream()->playlist());
-       }
 }
 
 void
@@ -380,7 +355,6 @@ RouteTimeAxisView::label_view ()
 void
 RouteTimeAxisView::route_name_changed ()
 {
-       editor.route_name_changed (this);
        label_view ();
 }
 
@@ -397,32 +371,55 @@ 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, int version)
+{
+       TimeAxisView::set_state (node, version);
+
+       XMLNodeList kids = node.children();
+       XMLNodeConstIterator iter;
+       const XMLProperty* prop;
+
+       if (_view && (prop = node.property ("layer-display"))) {
+               set_layer_display (LayerDisplay (string_2_enum (prop->value(), _view->layer_display ())));
+       }
+
+       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) && string_is_affirmative (prop->value());
+                               create_automation_child(param, show);
+                       } else {
+                               warning << "Automation child has no ID" << endmsg;
+                       }
+               }
+       }
+
+       return 0;
+}
+
 void
 RouteTimeAxisView::build_automation_action_menu ()
 {
@@ -431,31 +428,31 @@ RouteTimeAxisView::build_automation_action_menu ()
        automation_action_menu = manage (new Menu);
        MenuList& automation_items = automation_action_menu->items();
        automation_action_menu->set_name ("ArdourContextMenu");
-       
+
        automation_items.push_back (MenuElem (_("Show all automation"),
-                                             mem_fun(*this, &RouteTimeAxisView::show_all_automation)));
+                                             sigc::mem_fun(*this, &RouteTimeAxisView::show_all_automation)));
 
        automation_items.push_back (MenuElem (_("Show existing automation"),
-                                             mem_fun(*this, &RouteTimeAxisView::show_existing_automation)));
+                                             sigc::mem_fun(*this, &RouteTimeAxisView::show_existing_automation)));
 
        automation_items.push_back (MenuElem (_("Hide all automation"),
-                                             mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
+                                             sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
 
-       if (subplugin_menu.get_parent())
+       if (subplugin_menu.get_attach_widget())
                subplugin_menu.detach();
 
        automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu));
-       
-       map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i;
+       automation_items.back().set_sensitive (!subplugin_menu.items().empty());
+
+       map<Evoral::Parameter, RouteAutomationNode*>::iterator i;
        for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
 
                automation_items.push_back (SeparatorElem());
 
-               if (i->second->menu_item)
-                       delete i->second->menu_item;
+               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)));
+               automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param),
+                               sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param)));
 
                i->second->menu_item = static_cast<Gtk::CheckMenuItem*>(&automation_items.back());
 
@@ -481,79 +478,122 @@ RouteTimeAxisView::build_display_menu ()
 
        MenuList& items = display_menu->items();
        display_menu->set_name ("ArdourContextMenu");
-       
+
        items.push_back (MenuElem (_("Height"), *size_menu));
-       items.push_back (MenuElem (_("Color"), mem_fun(*this, &RouteTimeAxisView::select_track_color)));
+       items.push_back (MenuElem (_("Color"), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color)));
 
        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()) {
+               items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
+               /* 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"),
+                               sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid)));
+               layers_items.push_back(RadioMenuElem (layers_group, _("Stacked"),
+                               sigc::bind (sigc::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)));
+                                       sigc::bind (sigc::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)));
+                                       sigc::bind (sigc::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 (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+
+                       RadioMenuItem::Group mode_group;
+                       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());
+
+                       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());
+
+                       items.push_back (RadioMenuElem (mode_group, _("No layering mode"),
+                                                       sigc::bind (sigc::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 (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context());
+
+               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)));
+       items.push_back (CheckMenuElem (_("Active"), sigc::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"), sigc::mem_fun(*this, &RouteTimeAxisView::hide_click)));
+       if (!Profile->get_sae()) {
+               items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route)));
+       } else {
+               items.push_front (SeparatorElem());
+               items.push_front (MenuElem (_("Delete"), sigc::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;
 }
 
@@ -562,15 +602,23 @@ 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;
@@ -578,13 +626,13 @@ RouteTimeAxisView::set_track_mode (TrackMode mode)
                return;
        }
 
-       if (item->get_active () && track()->mode() != mode) {
-               _set_track_mode (track().get(), 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;
 
@@ -592,7 +640,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 (sigc::bind (sigc::ptr_fun (__reset_item), reset_item, reset_item_2));
                        return;
                } else {
                        cerr << "would bounce this one\n";
@@ -603,7 +651,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;
@@ -611,19 +661,22 @@ 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
 RouteTimeAxisView::track_mode_changed ()
 {
        RadioMenuItem* item;
-       
+
        switch (track()->mode()) {
        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;
@@ -642,35 +695,35 @@ RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
        double x1;
        double x2;
        double y2;
-       
+
        TimeAxisView::show_timestretch (start, end);
 
        hide_timestretch ();
 
-#if 0  
+#if 0
        if (ts.empty()) {
                return;
        }
 
 
-       /* check that the time selection was made in our route, or our edit group.
-          remember that edit_group() == 0 implies the route is *not* in a edit group.
+       /* check that the time selection was made in our route, or our route group.
+          remember that route_group() == 0 implies the route is *not* in a edit group.
        */
 
-       if (!(ts.track == this || (ts.group != 0 && ts.group == _route->edit_group()))) {
+       if (!(ts.track == this || (ts.group != 0 && ts.group == _route->route_group()))) {
                /* this doesn't apply to us */
                return;
        }
 
        /* ignore it if our edit group is not active */
-       
-       if ((ts.track != this) && _route->edit_group() && !_route->edit_group()->is_active()) {
+
+       if ((ts.track != this) && _route->route_group() && !_route->route_group()->is_active()) {
                return;
        }
 #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;
@@ -682,10 +735,10 @@ RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
        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;
        timestretch_rect->property_x2() = x2;
@@ -708,12 +761,12 @@ RouteTimeAxisView::show_selection (TimeSelection& ts)
 
 #if 0
        /* ignore it if our edit group is not active or if the selection was started
-          in some other track or edit group (remember that edit_group() == 0 means
-          that the track is not in an edit group).
+          in some other track or route group (remember that route_group() == 0 means
+          that the track is not in an route group).
        */
 
-       if (((ts.track != this && !is_child (ts.track)) && _route->edit_group() && !_route->edit_group()->is_active()) ||
-           (!(ts.track == this || is_child (ts.track) || (ts.group != 0 && ts.group == _route->edit_group())))) {
+       if (((ts.track != this && !is_child (ts.track)) && _route->route_group() && !_route->route_group()->is_active()) ||
+           (!(ts.track == this || is_child (ts.track) || (ts.group != 0 && ts.group == _route->route_group())))) {
                hide_selection ();
                return;
        }
@@ -723,105 +776,105 @@ 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;
-
-       case Smaller:
-               xml_node->add_property ("track_height", "smaller");
-               break;
-
-       case Small:
-               xml_node->add_property ("track_height", "small");
-               break;
-       }
+       char buf[32];
+       snprintf (buf, sizeof (buf), "%u", height);
+       xml_node->add_property ("height", buf);
 
-       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_control()) {
+                       solo_button->hide();
+               } else {
+                       solo_button->show();
+               }
                if (rec_enable_button)
                        rec_enable_button->show();
 
-               edit_group_button.show();
+               route_group_button.show();
                hide_button.show();
                visual_button.show();
                size_button.show();
                automation_button.show();
-               
+
                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_control()) {
+                       solo_button->hide();
+               } else {
+                       solo_button->show();
+               }
                if (rec_enable_button)
                        rec_enable_button->show();
 
-               edit_group_button.hide ();
+               route_group_button.hide ();
                hide_button.hide ();
                visual_button.hide ();
                size_button.hide ();
                automation_button.hide ();
-               
+
                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)
                        rec_enable_button->hide();
 
-               edit_group_button.hide ();
+               route_group_button.hide ();
                hide_button.hide ();
                visual_button.hide ();
                size_button.hide ();
                automation_button.hide ();
                playlist_button.hide ();
                name_label.set_text (_route->name());
-               break;
        }
 
        if (height_changed) {
@@ -844,7 +897,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
@@ -855,7 +908,7 @@ RouteTimeAxisView::set_samples_per_unit (double spu)
        if (get_diskstream() != 0) {
                speed = get_diskstream()->speed();
        }
-       
+
        if (_view) {
                _view->set_samples_per_unit (spu * speed);
        }
@@ -935,11 +988,46 @@ 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 const group_string = "." + route_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() + "." + route_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;
-       
+
        boost::shared_ptr<Diskstream> ds = get_diskstream();
        if (!ds || ds->destructive())
                return;
@@ -950,9 +1038,13 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
 
        name = pl->name();
 
-       do {
-               name = Playlist::bump_name (name, _session);
-       } while (_session.playlist_by_name(name));
+       if (route_group() && route_group()->is_active()) {
+               name = resolve_new_group_playlist_name(name, playlists_before_op);
+       }
+
+       while (_session->playlists->by_name(name)) {
+               name = Playlist::bump_name (name, *_session);
+       }
 
        // TODO: The prompter "new" button should be de-activated if the user
        // specifies a playlist name which already exists in the session.
@@ -960,18 +1052,18 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
        if (prompt) {
 
                ArdourPrompter prompter (true);
-               
+
                prompter.set_prompt (_("Name for Playlist"));
                prompter.set_initial_text (name);
                prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
                prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
                prompter.show_all ();
-               
+
                switch (prompter.run ()) {
                case Gtk::RESPONSE_ACCEPT:
                        prompter.get_result (name);
                        break;
-                       
+
                default:
                        return;
                }
@@ -984,10 +1076,10 @@ 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;
-       
+
        boost::shared_ptr<Diskstream> ds = get_diskstream();
        if (!ds || ds->destructive())
                return;
@@ -998,15 +1090,19 @@ RouteTimeAxisView::use_new_playlist (bool prompt)
 
        name = pl->name();
 
-       do {
-               name = Playlist::bump_name (name, _session);
-       } while (_session.playlist_by_name(name));
+       if (route_group() && route_group()->is_active()) {
+               name = resolve_new_group_playlist_name(name,playlists_before_op);
+       }
+
+       while (_session->playlists->by_name(name)) {
+               name = Playlist::bump_name (name, *_session);
+       }
 
 
        if (prompt) {
-               
+
                ArdourPrompter prompter (true);
-               
+
                prompter.set_prompt (_("Name for Playlist"));
                prompter.set_initial_text (name);
                prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT);
@@ -1016,7 +1112,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt)
                case Gtk::RESPONSE_ACCEPT:
                        prompter.get_result (name);
                        break;
-                       
+
                default:
                        return;
                }
@@ -1039,20 +1135,20 @@ RouteTimeAxisView::clear_playlist ()
        if (!pl)
                return;
 
-       editor.clear_playlist (pl);
+       _editor.clear_playlist (pl);
 }
 
 void
 RouteTimeAxisView::speed_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
+       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this));
 }
 
 void
 RouteTimeAxisView::diskstream_changed ()
 {
-       Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::update_diskstream_display));
-}      
+       Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::update_diskstream_display, this));
+}
 
 void
 RouteTimeAxisView::update_diskstream_display ()
@@ -1060,52 +1156,41 @@ RouteTimeAxisView::update_diskstream_display ()
        if (!get_diskstream()) // bus
                return;
 
-       set_playlist (get_diskstream()->playlist());
        map_frozen ();
-}      
+}
 
 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());
+       }
 
-       switch (Keyboard::selection_type (ev->state)) {
+       switch (ArdourKeyboard::selection_type (ev->state)) {
        case Selection::Toggle:
-               editor.get_selection().toggle (*tracks);
+               _editor.get_selection().toggle (this);
                break;
-               
+
        case Selection::Set:
-               editor.get_selection().set (*tracks);
+               _editor.get_selection().set (this);
                break;
 
        case Selection::Extend:
-               if (tracks->size() > 1) {
-                       /* add each one, do not "extend" */
-                       editor.get_selection().add (*tracks);
-               } else {
-                       /* extend to the single track */
-                       editor.extend_selection_to_track (*tracks->front());
-               }
+               _editor.extend_selection_to_track (*this);
                break;
 
        case Selection::Add:
-               editor.get_selection().add (*tracks);
+               _editor.get_selection().add (this);
                break;
        }
-
-       delete tracks;
 }
 
 void
@@ -1131,20 +1216,20 @@ void
 RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
 {
        double speed = 1.0;
-       
+
        if (get_diskstream() != 0) {
                speed = get_diskstream()->speed();
        }
-       
+
        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)) {
-               _view->get_selectables (start_adjusted, end_adjusted, results);
+       if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
+               _view->get_selectables (start_adjusted, end_adjusted, top, bot, results);
        }
 
        /* pick up visible automation tracks */
-       
+
        for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                if (!(*i)->hidden()) {
                        (*i)->get_selectables (start_adjusted, end_adjusted, top, bot, results);
@@ -1169,36 +1254,37 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>&
 }
 
 bool
-RouteTimeAxisView::show_automation(Parameter param)
+RouteTimeAxisView::show_automation(Evoral::Parameter param)
 {
        return (_show_automation.find(param) != _show_automation.end());
 }
 
-/** Retuns NULL if track for \a param doesn't exist.
+/** Retuns 0 if track for \a param doesn't exist.
  */
 RouteTimeAxisView::RouteAutomationNode*
-RouteTimeAxisView::automation_track(Parameter param)
+RouteTimeAxisView::automation_track (Evoral::Parameter param)
 {
-       map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.find(param);
+       map<Evoral::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.find (param);
 
-       if (i != _automation_tracks.end())
+       if (i != _automation_tracks.end()) {
                return i->second;
-       else
-               return NULL;
+       } else {
+               return 0;
+       }
 }
 
 /** Shorthand for GainAutomation, etc.
- */    
+ */
 RouteTimeAxisView::RouteAutomationNode*
-RouteTimeAxisView::automation_track(AutomationType type)
+RouteTimeAxisView::automation_track (AutomationType type)
 {
-       return automation_track(Parameter(type));
+       return automation_track (Evoral::Parameter(type));
 }
 
 RouteGroup*
-RouteTimeAxisView::edit_group() const
+RouteTimeAxisView::route_group () const
 {
-       return _route->edit_group();
+       return _route->route_group();
 }
 
 string
@@ -1208,12 +1294,12 @@ RouteTimeAxisView::name() const
 }
 
 boost::shared_ptr<Playlist>
-RouteTimeAxisView::playlist () const 
+RouteTimeAxisView::playlist () const
 {
        boost::shared_ptr<Diskstream> ds;
 
        if ((ds = get_diskstream()) != 0) {
-               return ds->playlist(); 
+               return ds->playlist();
        } else {
                return boost::shared_ptr<Playlist> ();
        }
@@ -1225,7 +1311,7 @@ RouteTimeAxisView::name_entry_changed ()
        string x;
 
        x = name_entry.get_text ();
-       
+
        if (x == _route->name()) {
                return;
        }
@@ -1237,11 +1323,14 @@ RouteTimeAxisView::name_entry_changed ()
                return;
        }
 
-       if (_session.route_name_unique (x)) {
-               _route->set_name (x);
-       } 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);
        }
 }
 
@@ -1256,9 +1345,9 @@ 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);
 }
 
@@ -1275,6 +1364,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)
 {
@@ -1298,25 +1400,25 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
                        (*i).end   = session_frame_to_track_frame((*i).end,   speed);
                }
        }
-       
+
        XMLNode &before = playlist->get_state();
        switch (op) {
        case Cut:
                if ((what_we_got = playlist->cut (time)) != 0) {
-                       editor.get_cut_buffer().add (what_we_got);
-                       _session.add_command( new MementoCommand<Playlist>(*playlist.get(), &before, &playlist->get_state()));
+                       _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;
 
        case Clear:
                if ((what_we_got = playlist->cut (time)) != 0) {
-                       _session.add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+                       _session->add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
                        what_we_got->release ();
                        ret = true;
                }
@@ -1335,19 +1437,20 @@ 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;
        }
 
-       if (get_diskstream()->speed() != 1.0f)
+       if (get_diskstream()->speed() != 1.0f) {
                pos = session_frame_to_track_frame(pos, get_diskstream()->speed() );
-       
+       }
+
        XMLNode &before = playlist->get_state();
        playlist->paste (*p, pos, times);
-       _session.add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
+       _session->add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
 
        return true;
 }
@@ -1357,7 +1460,7 @@ 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);
@@ -1380,9 +1483,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");
@@ -1391,36 +1492,45 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        boost::shared_ptr<Diskstream> ds = get_diskstream();
        RadioMenuItem::Group playlist_group;
 
-       _session.get_playlists (playlists);
-       
+       _session->playlists->get (playlists);
+
        for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
 
                if ((*i)->get_orig_diskstream_id() == ds->id()) {
-                       playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), bind (mem_fun (*this, &RouteTimeAxisView::use_playlist),
+                       playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist),
                                                                                                     boost::weak_ptr<Playlist> (*i))));
 
                        if (ds->playlist()->id() == (*i)->id()) {
                                static_cast<RadioMenuItem*>(&playlist_items.back())->set_active();
                        }
                } else if (ds->playlist()->id() == (*i)->id()) {
-                       playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), bind (mem_fun (*this, &RouteTimeAxisView::use_playlist), 
+                       playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist),
                                                                                                     boost::weak_ptr<Playlist>(*i))));
                        static_cast<RadioMenuItem*>(&playlist_items.back())->set_active();
-                       
+
                }
        }
 
        playlist_items.push_back (SeparatorElem());
-       playlist_items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
+       playlist_items.push_back (MenuElem (_("Rename"), sigc::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 (!route_group() || !route_group()->is_active()) {
+               playlist_items.push_back (MenuElem (_("New"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this)));
+               playlist_items.push_back (MenuElem (_("New Copy"), sigc::bind(sigc::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"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this)));
+               playlist_items.push_back (MenuElem (_("Copy Take"), sigc::bind(sigc::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"), sigc::bind(sigc::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)));
+       playlist_items.push_back (MenuElem(_("Select from all ..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
 }
 
 void
@@ -1435,16 +1545,60 @@ 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 (route_group() && route_group()->is_active()) {
+                       //PBD::stacktrace(cerr, 20);
+                       std::string group_string = "."+route_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
+
+                       boost::shared_ptr<RouteList> rl (route_group()->route_list());
+
+                       for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) {
+                               if ( (*i) == this->route()) {
+                                       continue;
+                               }
+
+                               std::string playlist_name = (*i)->name()+group_string+take_name;
+
+                               boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track>(*i);
+                               if (!track) {
+                                       std::cerr << "route " << (*i)->name() << " is not a Track" << std::endl;
+                                       continue;
+                               }
+
+                               boost::shared_ptr<Playlist> ipl = session()->playlists->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);
+                               }
+                       }
+               }
        }
 }
 
 void
 RouteTimeAxisView::show_playlist_selector ()
 {
-       editor.playlist_selector().show_for (this);
+       _editor.playlist_selector().show_for (this);
 }
 
 void
@@ -1454,7 +1608,7 @@ RouteTimeAxisView::map_frozen ()
                return;
        }
 
-       ENSURE_GUI_THREAD (mem_fun(*this, &RouteTimeAxisView::map_frozen));
+       ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::map_frozen)
 
        switch (track()->freeze_state()) {
        case Track::Frozen:
@@ -1480,10 +1634,11 @@ RouteTimeAxisView::color_handler ()
                timestretch_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
        }
 
+       reset_meter();
 }
 
 void
-RouteTimeAxisView::toggle_automation_track (Parameter param)
+RouteTimeAxisView::toggle_automation_track (Evoral::Parameter param)
 {
        RouteAutomationNode* node = automation_track(param);
 
@@ -1495,7 +1650,7 @@ RouteTimeAxisView::toggle_automation_track (Parameter param)
        if (showit != node->track->marked_for_display()) {
                if (showit) {
                        node->track->set_marked_for_display (true);
-                       node->track->canvas_display->show();
+                       node->track->canvas_display()->show();
                        node->track->get_state_node()->add_property ("shown", X_("yes"));
                } else {
                        node->track->set_marked_for_display (false);
@@ -1504,7 +1659,7 @@ RouteTimeAxisView::toggle_automation_track (Parameter param)
                }
 
                /* now trigger a redisplay */
-               
+
                if (!no_redraw) {
                         _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */
                }
@@ -1512,12 +1667,14 @@ RouteTimeAxisView::toggle_automation_track (Parameter param)
 }
 
 void
-RouteTimeAxisView::automation_track_hidden (Parameter param)
+RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param)
 {
        RouteAutomationNode* ran = automation_track(param);
-       if (!ran)
+       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"));
 
@@ -1525,7 +1682,9 @@ RouteTimeAxisView::automation_track_hidden (Parameter param)
                ran->menu_item->set_active (false);
        }
 
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+       if (_route) {
+               _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+       }
 }
 
 
@@ -1533,13 +1692,13 @@ void
 RouteTimeAxisView::show_all_automation ()
 {
        no_redraw = true;
-       
+
        /* Show our automation */
 
-       map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i;
+       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->canvas_display()->show();
                i->second->track->get_state_node()->add_property ("shown", X_("yes"));
                i->second->menu_item->set_active(true);
        }
@@ -1551,7 +1710,7 @@ RouteTimeAxisView::show_all_automation ()
                for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
                        if ((*ii)->view == 0) {
                                add_processor_automation_curve ((*i)->processor, (*ii)->what);
-                       } 
+                       }
 
                        (*ii)->menu_item->set_active (true);
                }
@@ -1559,24 +1718,23 @@ RouteTimeAxisView::show_all_automation ()
 
        no_redraw = false;
 
-
        /* Redraw */
 
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
 RouteTimeAxisView::show_existing_automation ()
 {
        no_redraw = true;
-       
+
        /* Show our automation */
 
-       map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i;
+       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->canvas_display()->show();
                        i->second->track->get_state_node()->add_property ("shown", X_("yes"));
                        i->second->menu_item->set_active(true);
                }
@@ -1587,7 +1745,7 @@ RouteTimeAxisView::show_existing_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->control((*ii)->what)->list()->size() > 0) {
+                       if ((*ii)->view != 0 && (*i)->processor->data().control((*ii)->what)->list()->size() > 0) {
                                (*ii)->menu_item->set_active (true);
                        }
                }
@@ -1595,7 +1753,7 @@ RouteTimeAxisView::show_existing_automation ()
 
        no_redraw = false;
 
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+       _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
@@ -1603,6 +1761,17 @@ RouteTimeAxisView::hide_all_automation ()
 {
        no_redraw = true;
 
+       /* 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);
@@ -1612,26 +1781,27 @@ RouteTimeAxisView::hide_all_automation ()
        _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 (Children::iterator i = children.begin(); i != children.end(); ++i) {
-               boost::shared_ptr<AutomationTimeAxisView> 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) {
-                       rv->add_ghost (*atv.get());
+                       if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
+                               atv->add_ghost(rv);
+                       }
                }
        }
-}
 
-void
-RouteTimeAxisView::add_ghost_to_processor (RegionView* rv, boost::shared_ptr<AutomationTimeAxisView> atv)
-{
-       rv->add_ghost (*atv.get());
+       for (UnderlayMirrorList::iterator i = _underlay_mirrors.begin(); i != _underlay_mirrors.end(); ++i) {
+               (*i)->add_ghost(rv);
+       }
 }
 
 RouteTimeAxisView::ProcessorAutomationInfo::~ProcessorAutomationInfo ()
@@ -1656,7 +1826,7 @@ RouteTimeAxisView::remove_processor_automation_node (ProcessorAutomationNode* pa
 }
 
 RouteTimeAxisView::ProcessorAutomationNode*
-RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr<Processor> processor, Parameter what)
+RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr<Processor> processor, Evoral::Parameter what)
 {
        for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
 
@@ -1673,11 +1843,11 @@ RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr<Processor>
        return 0;
 }
 
-static string 
+static string
 legalize_for_xml_node (string str)
 {
        string::size_type pos;
-       string legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_+=:";
+       string legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_=:";
        string legal;
 
        legal = str;
@@ -1693,13 +1863,13 @@ legalize_for_xml_node (string str)
 
 
 void
-RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> processor, Parameter what)
+RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> processor, Evoral::Parameter what)
 {
        string name;
        ProcessorAutomationNode* pan;
 
        if ((pan = find_processor_automation_node (processor, what)) == 0) {
-               fatal << _("programming error: ")
+               error << _("programming error: ")
                      << string_compose (X_("processor automation curve for %1:%2 not registered with track!"),
                                  processor->name(), what)
                      << endmsg;
@@ -1720,13 +1890,14 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
        char state_name[256];
        snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
 
-       boost::shared_ptr<AutomationControl> control = processor->control(what, true);
+       boost::shared_ptr<AutomationControl> control
+                       = boost::dynamic_pointer_cast<AutomationControl>(processor->data().control(what, true));
 
        pan->view = boost::shared_ptr<AutomationTimeAxisView>(
                        new AutomationTimeAxisView (_session, _route, processor, control,
-                               editor, *this, parent_canvas, name, state_name));
+                               _editor, *this, false, parent_canvas, name, state_name));
 
-       pan->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
+       pan->view->Hiding.connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
 
        if (!pan->view->marked_for_display()) {
                pan->view->hide ();
@@ -1737,7 +1908,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor>
        add_child (pan->view);
 
        if (_view) {
-               _view->foreach_regionview (bind (mem_fun(*this, &RouteTimeAxisView::add_ghost_to_processor), pan->view));
+               _view->foreach_regionview (sigc::mem_fun(*pan->view.get(), &TimeAxisView::add_ghost));
        }
 
        processor->mark_automation_visible (what, true);
@@ -1752,19 +1923,24 @@ RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::Process
 
        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_processor_automation_curves (boost::shared_ptr<Processor> processor)
+RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr<Processor> p)
 {
-       set<Parameter> s;
+       boost::shared_ptr<Processor> processor (p.lock ());
+       if (!processor) {
+               return;
+       }
+
+       set<Evoral::Parameter> s;
        boost::shared_ptr<AutomationLine> al;
 
-       processor->what_has_visible_automation (s);
+       processor->what_has_visible_data (s);
+
+       for (set<Evoral::Parameter>::iterator i = s.begin(); i != s.end(); ++i) {
 
-       for (set<Parameter>::iterator i = s.begin(); i != s.end(); ++i) {
-               
                if ((al = find_processor_automation_curve (processor, *i)) != 0) {
                        al->queue_reset ();
                } else {
@@ -1774,35 +1950,38 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr<P
 }
 
 void
-RouteTimeAxisView::add_automation_child(Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show)
+RouteTimeAxisView::add_automation_child(Evoral::Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show)
 {
        using namespace Menu_Helpers;
 
        XMLProperty* prop;
+       XMLNode* node;
 
        add_child (track);
 
-       track->Hiding.connect (bind (mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param));
+       track->Hiding.connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param));
 
        bool hideit = (!show);
-       
-       XMLNode* node;
 
        if ((node = track->get_state_node()) != 0) {
                if  ((prop = node->property ("shown")) != 0) {
-                       if (prop->value() == "yes") {
+                       if (string_is_affirmative (prop->value())) {
                                hideit = false;
                        }
-               } 
+               }
        }
-       
+
        _automation_tracks.insert(std::make_pair(param, new RouteAutomationNode(param, NULL, track)));
 
        if (hideit) {
                track->hide ();
        } else {
-               _show_automation.insert(param);
-               _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+               _show_automation.insert (param);
+
+
+               if (!no_redraw) {
+                       _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
+               }
        }
 
        build_display_menu();
@@ -1810,16 +1989,22 @@ RouteTimeAxisView::add_automation_child(Parameter param, boost::shared_ptr<Autom
 
 
 void
-RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr<Processor> processor)
+RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p)
 {
+       boost::shared_ptr<Processor> processor (p.lock ());
+
+       if (!processor || !processor->display_to_user ()) {
+               return;
+       }
+
        using namespace Menu_Helpers;
        ProcessorAutomationInfo *rai;
        list<ProcessorAutomationInfo*>::iterator x;
-       
-       const std::set<Parameter>& automatable = processor->what_can_be_automated ();
-       std::set<Parameter> has_visible_automation;
 
-       processor->what_has_visible_automation(has_visible_automation);
+       const std::set<Evoral::Parameter>& automatable = processor->what_can_be_automated ();
+       std::set<Evoral::Parameter> has_visible_automation;
+
+       processor->what_has_visible_data(has_visible_automation);
 
        if (automatable.empty()) {
                return;
@@ -1852,13 +2037,13 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr<Processor>
 
        items.clear ();
 
-       for (std::set<Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
+       for (std::set<Evoral::Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
 
                ProcessorAutomationNode* pan;
                CheckMenuItem* mitem;
-               
+
                string name = processor->describe_parameter (*i);
-               
+
                items.push_back (CheckMenuElem (name));
                mitem = dynamic_cast<CheckMenuItem*> (&items.back());
 
@@ -1869,9 +2054,9 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr<Processor>
                if ((pan = find_processor_automation_node (processor, *i)) == 0) {
 
                        /* new item */
-                       
+
                        pan = new ProcessorAutomationNode (*i, mitem, *this);
-                       
+
                        rai->lines.push_back (pan);
 
                } else {
@@ -1880,7 +2065,7 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr<Processor>
 
                }
 
-               mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan));
+               mitem->signal_toggled().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan));
        }
 
        /* add the menu for this processor, because the subplugin
@@ -1905,11 +2090,12 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto
                redraw = true;
        }
 
-       if (showit != pan->view->marked_for_display()) {
+       if (pan->view && showit != pan->view->marked_for_display()) {
 
                if (showit) {
                        pan->view->set_marked_for_display (true);
-                       pan->view->canvas_display->show();
+                       pan->view->canvas_display()->show();
+                       pan->view->canvas_background()->show();
                } else {
                        rai->processor->mark_automation_visible (pan->what, true);
                        pan->view->set_marked_for_display (false);
@@ -1923,15 +2109,20 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto
        if (redraw && !no_redraw) {
 
                /* now trigger a redisplay */
-               
-                _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+
+                _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 
        }
 }
 
 void
-RouteTimeAxisView::processors_changed ()
+RouteTimeAxisView::processors_changed (RouteProcessorChange c)
 {
+       if (c.type == RouteProcessorChange::MeterPointChange) {
+               /* nothing to do if only the meter point has changed */
+               return;
+       }
+
        using namespace Menu_Helpers;
 
        for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
@@ -1940,8 +2131,10 @@ RouteTimeAxisView::processors_changed ()
 
        subplugin_menu.items().clear ();
 
-       _route->foreach_processor (this, &RouteTimeAxisView::add_processor_to_subplugin_menu);
-       _route->foreach_processor (this, &RouteTimeAxisView::add_existing_processor_automation_curves);
+       _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));
+
+       bool deleted_processor_automation = false;
 
        for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ) {
 
@@ -1954,26 +2147,27 @@ RouteTimeAxisView::processors_changed ()
 
                        delete *i;
                        processor_automation.erase (i);
+                       deleted_processor_automation = true;
 
-               } 
+               }
 
                i = tmp;
        }
 
-       /* change in visibility was possible */
-
-       _route->gui_changed ("track_height", this);
+       if (deleted_processor_automation) {
+               _route->gui_changed ("visible_tracks", this);
+       }
 }
 
 boost::shared_ptr<AutomationLine>
-RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr<Processor> processor, Parameter what)
+RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr<Processor> processor, Evoral::Parameter what)
 {
        ProcessorAutomationNode* pan;
 
        if ((pan = find_processor_automation_node (processor, what)) != 0) {
                if (pan->view) {
                        pan->view->line();
-               } 
+               }
        }
 
        return boost::shared_ptr<AutomationLine>();
@@ -1993,4 +2187,220 @@ RouteTimeAxisView::update_rec_display ()
        RouteUI::update_rec_display ();
        name_entry.set_sensitive (!_route->record_enabled());
 }
-               
+
+void
+RouteTimeAxisView::set_layer_display (LayerDisplay d)
+{
+       if (_view) {
+               _view->set_layer_display (d);
+       }
+
+       ensure_xml_node ();
+       xml_node->add_property (N_("layer-display"), enum_2_string (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 (*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()),
+                                                   sigc::bind(sigc::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(sigc::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(sigc::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_button_names ()
+{
+       rec_enable_button_label.set_text (_("r"));
+
+       if (Config->get_solo_control_is_listen_control()) {
+               switch (Config->get_listen_position()) {
+               case AfterFaderListen:
+                       solo_button_label.set_text (_("A"));
+                       break;
+               case PreFaderListen:
+                       solo_button_label.set_text (_("P"));
+                       break;
+               }
+       } else {
+               solo_button_label.set_text (_("s"));
+       }
+
+       mute_button_label.set_text (_("m"));
+}