Allow edit group creation from the route UI's menu. Allow new tracks to be put in...
[ardour.git] / gtk2_ardour / route_time_axis.cc
index 42b2e646ad478aff2be92c0ddf0cdc2c8e157410..3a75ea5b19ce8932bcec4f37650e14dfa8192935 100644 (file)
 
 #include <sigc++/bind.h>
 
-#include <pbd/error.h>
-#include <pbd/stl_delete.h>
-#include <pbd/whitespace.h>
-#include <pbd/memento_command.h>
+#include "pbd/error.h"
+#include "pbd/stl_delete.h"
+#include "pbd/whitespace.h"
+#include "pbd/memento_command.h"
 
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
 #include <gtkmm2ext/bindable_button.h>
 #include <gtkmm2ext/utils.h>
 
-#include <ardour/playlist.h>
-#include <ardour/audioplaylist.h>
-#include <ardour/diskstream.h>
-#include <ardour/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/profile.h>
+#include "ardour/amp.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/diskstream.h"
+#include "ardour/event_type_map.h"
+#include "ardour/ladspa_plugin.h"
+#include "ardour/location.h"
+#include "ardour/panner.h"
+#include "ardour/playlist.h"
+#include "ardour/playlist.h"
+#include "ardour/processor.h"
+#include "ardour/profile.h"
+#include "ardour/route_group.h"
+#include "ardour/session.h"
+#include "ardour/session_playlist.h"
+#include "ardour/utils.h"
+#include "evoral/Parameter.hpp"
 
 #include "ardour_ui.h"
 #include "route_time_axis.h"
 #include "simplerect.h"
 #include "streamview.h"
 #include "utils.h"
+#include "route_group_dialog.h"
 
-#include <ardour/track.h>
+#include "ardour/track.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
+using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace Editing;
 using namespace sigc;
+using namespace std;
 
+Glib::RefPtr<Gdk::Pixbuf> RouteTimeAxisView::slider;
+
+void
+RouteTimeAxisView::setup_slider_pix ()
+{
+       if ((slider = ::get_icon ("fader_belt_h")) == 0) {
+               throw failed_constructor ();
+       }
+}
 
 RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr<Route> rt, Canvas& canvas)
        : AxisView(sess),
@@ -95,19 +110,27 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
          size_button (_("h")), // height
          automation_button (_("a")),
          visual_button (_("v")),
-         lm (rt, sess)
+         gm (sess, slider, true)
 {
-       lm.set_no_show_all();
-       lm.setup_meters(50);
+       gm.set_controls (_route, _route->shared_peak_meter(), _route->gain_control(), _route->amp());
+       gm.get_level_meter().set_no_show_all();
+       gm.get_level_meter().setup_meters(50);
+
        _has_state = true;
        playlist_menu = 0;
        playlist_action_menu = 0;
        automation_action_menu = 0;
        _view = 0;
+
+       if (!_route->is_hidden()) {
+               _marked_for_display = true;
+       }
+
        timestretch_rect = 0;
        no_redraw = false;
        destructive_track_mode_item = 0;
        normal_track_mode_item = 0;
+       non_layered_track_mode_item = 0;
 
        ignore_toggle = false;
 
@@ -118,6 +141,13 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        visual_button.set_name ("TrackVisualButton");
        hide_button.set_name ("TrackRemoveButton");
 
+       edit_group_button.unset_flags (Gtk::CAN_FOCUS);
+       playlist_button.unset_flags (Gtk::CAN_FOCUS);
+       automation_button.unset_flags (Gtk::CAN_FOCUS);
+       size_button.unset_flags (Gtk::CAN_FOCUS);
+       visual_button.unset_flags (Gtk::CAN_FOCUS);
+       hide_button.unset_flags (Gtk::CAN_FOCUS);
+
        hide_button.add (*(manage (new Image (::get_icon("hide")))));
        hide_button.show_all ();
 
@@ -129,17 +159,19 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        hide_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::hide_click));
 
        solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false);
-       solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release));
+       solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release), false);
        mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false);
-       mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release));
+       mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release), false);
 
        if (is_track()) {
 
                /* use icon */
 
                rec_enable_button->remove ();
+
                switch (track()->mode()) {
                case ARDOUR::Normal:
+               case ARDOUR::NonLayered:
                        rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
                        break;
                case ARDOUR::Destructive:
@@ -150,20 +182,21 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
                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));
-               controls_table.attach (*rec_enable_button, 4, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+               controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
                ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record"));
 
        }
 
-       controls_hbox.pack_start(lm, false, false);
+       controls_hbox.pack_start(gm.get_level_meter(), false, false);
        _route->meter_change.connect (mem_fun(*this, &RouteTimeAxisView::meter_changed));
-       _route->input_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
-       _route->output_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
+       _route->input()->changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
+       _route->output()->changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
 
-       controls_table.attach (*mute_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-       controls_table.attach (*solo_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       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::EXPAND, 0, 0);
 
-       controls_table.attach (edit_group_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       controls_table.attach (edit_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 
        ARDOUR_UI::instance()->tooltips().set_tip(*solo_button,_("Solo"));
        ARDOUR_UI::instance()->tooltips().set_tip(*mute_button,_("Mute"));
@@ -176,7 +209,9 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        
        label_view ();
 
-       if (!Profile->get_sae()) {
+       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);
@@ -185,20 +220,20 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        } else {
 
-               controls_table.attach (automation_button, 4, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               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);
        }
 
-       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->solo_isolated_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
 
 
        if (is_track()) {
@@ -213,8 +248,11 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        }
 
-       editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
+       _editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
        ColorsChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
+
+       gm.get_gain_slider().signal_scroll_event().connect(mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false);
+       gm.get_gain_slider().set_name ("TrackGainFader");
 }
 
 RouteTimeAxisView::~RouteTimeAxisView ()
@@ -225,20 +263,14 @@ RouteTimeAxisView::~RouteTimeAxisView ()
                delete *i;
        }
 
-       if (playlist_menu) {
-               delete playlist_menu;
-               playlist_menu = 0;
-       }
+       delete playlist_menu;
+       playlist_menu = 0;
   
-       if (playlist_action_menu) {
-               delete playlist_action_menu;
-               playlist_action_menu = 0;
-       }
+       delete playlist_action_menu;
+       playlist_action_menu = 0;
 
-       if (_view) {
-               delete _view;
-               _view = 0;
-       }
+       delete _view;
+       _view = 0;
 
        for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
                delete i->second;
@@ -253,9 +285,10 @@ RouteTimeAxisView::post_construct ()
        /* map current state of the route */
 
        update_diskstream_display ();
+
        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 (mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
+       _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
        reset_processor_automation_curves ();
 }
 
@@ -274,63 +307,6 @@ RouteTimeAxisView::playlist_modified ()
 {
 }
 
-void
-RouteTimeAxisView::set_state (const XMLNode& node)
-{
-       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");
-
-               if (prop && prop->value() == "yes") {
-                       show = true;
-                       _show_automation.insert(param);
-               }
-               
-               if (_automation_tracks.find(param) == _automation_tracks.end())
-                       create_automation_child(param, show);
-       }
-}
-
-XMLNode* 
-RouteTimeAxisView::get_automation_child_xml_node (Parameter param)
-{
-       return RouteUI::get_automation_child_xml_node (param);
-}
-
 gint
 RouteTimeAxisView::edit_click (GdkEventButton *ev)
 {
@@ -345,13 +321,18 @@ RouteTimeAxisView::edit_click (GdkEventButton *ev)
        RadioMenuItem::Group group;
 
        items.clear ();
+
+       items.push_back (MenuElem (_("New group..."), mem_fun (*this, &RouteTimeAxisView::set_edit_group_to_new)));
+
+       items.push_back (SeparatorElem ());
+       
        items.push_back (RadioMenuElem (group, _("No group"), 
                                        bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0)));
        
        if (_route->edit_group() == 0) {
                static_cast<RadioMenuItem*>(&items.back())->set_active ();
        }
-       
+
        _session.foreach_edit_group (bind (mem_fun (*this, &RouteTimeAxisView::add_edit_group_menu_item), &group));
        edit_group_menu.popup (ev->button, ev->time);
 
@@ -379,7 +360,6 @@ RouteTimeAxisView::set_edit_group_from_menu (RouteGroup *eg)
 
 void
 RouteTimeAxisView::playlist_changed ()
-
 {
        label_view ();
 
@@ -403,7 +383,7 @@ RouteTimeAxisView::label_view ()
 void
 RouteTimeAxisView::route_name_changed ()
 {
-       editor.route_name_changed (this);
+       _editor.route_name_changed (this);
        label_view ();
 }
 
@@ -420,32 +400,51 @@ void
 RouteTimeAxisView::playlist_click ()
 {
        // always build a new action menu
-       
-       if (playlist_action_menu != 0) {
-               delete playlist_action_menu;
-       } 
+  
+       delete playlist_action_menu;
 
        playlist_action_menu = new Menu;
        playlist_action_menu->set_name ("ArdourContextMenu");
        
        build_playlist_menu (playlist_action_menu);
-       editor.set_selected_track (*this, Selection::Add);
+
+       conditionally_add_to_selection ();
        playlist_action_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
 RouteTimeAxisView::automation_click ()
 {
-       if (automation_action_menu == 0) {
-               /* this seems odd, but the automation action
-                  menu is built as part of the display menu.
-               */
-               build_display_menu ();
-       }
-       editor.set_selected_track (*this, Selection::Add);
+       conditionally_add_to_selection ();
+       build_automation_action_menu ();
        automation_action_menu->popup (1, gtk_get_current_event_time());
 }
 
+int
+RouteTimeAxisView::set_state (const XMLNode& node)
+{
+       TimeAxisView::set_state (node);
+
+       XMLNodeList kids = node.children();
+       XMLNodeConstIterator iter;
+       const XMLProperty* prop;
+       
+       for (iter = kids.begin(); iter != kids.end(); ++iter) {
+               if ((*iter)->name() == AutomationTimeAxisView::state_node_name) {
+                       if ((prop = (*iter)->property ("automation-id")) != 0) {
+
+                               Evoral::Parameter param = ARDOUR::EventTypeMap::instance().new_parameter(prop->value());
+                               bool show = ((prop = (*iter)->property ("shown")) != 0) && prop->value() == "yes";
+                               create_automation_child(param, show);
+                       } else {
+                               warning << "Automation child has no ID" << endmsg;
+                       }
+               }
+       }
+
+       return 0;
+}
+
 void
 RouteTimeAxisView::build_automation_action_menu ()
 {
@@ -469,13 +468,12 @@ RouteTimeAxisView::build_automation_action_menu ()
 
        automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu));
        
-       map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i;
+       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)));
@@ -510,11 +508,11 @@ RouteTimeAxisView::build_display_menu ()
 
        items.push_back (SeparatorElem());
 
-       build_remote_control_menu ();
-       build_automation_action_menu ();
-
        if (!Profile->get_sae()) {
+               build_remote_control_menu ();
                items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+               /* rebuild this every time */
+               build_automation_action_menu ();
                items.push_back (MenuElem (_("Automation"), *automation_action_menu));
                items.push_back (SeparatorElem());
        }
@@ -558,15 +556,25 @@ RouteTimeAxisView::build_display_menu ()
 
                if (!Profile->get_sae()) {
                        items.push_back (MenuElem (_("Alignment"), *alignment_menu));
-                       get_diskstream()->AlignmentStyleChanged.connect (mem_fun(*this, &RouteTimeAxisView::align_style_changed));
+                       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)));
+                       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)));
+
+                       items.push_back (RadioMenuElem (mode_group, _("Tape mode"), bind (
+                                       mem_fun (*this, &RouteTimeAxisView::set_track_mode),
+                                       ARDOUR::Destructive)));
                        destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+
+                       items.push_back (RadioMenuElem (mode_group, _("No layering mode"),
+                                                       bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered)));
+                       non_layered_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+
                        
                        switch (track()->mode()) {
                        case ARDOUR::Destructive:
@@ -575,7 +583,11 @@ RouteTimeAxisView::build_display_menu ()
                        case ARDOUR::Normal:
                                normal_track_mode_item->set_active ();
                                break;
+                       case ARDOUR::NonLayered:
+                               non_layered_track_mode_item->set_active ();
+                               break;
                        }
+               }
 
                get_diskstream()->AlignmentStyleChanged.connect (
                                mem_fun(*this, &RouteTimeAxisView::align_style_changed));
@@ -584,8 +596,11 @@ RouteTimeAxisView::build_display_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 (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active)));
@@ -593,12 +608,19 @@ RouteTimeAxisView::build_display_menu ()
        route_active_menu_item->set_active (_route->active());
 
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
+       items.push_back (MenuElem (_("Hide"), mem_fun(*this, &RouteTimeAxisView::hide_click)));
+       if (!Profile->get_sae()) {
+               items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
+       } else {
+               items.push_front (SeparatorElem());
+               items.push_front (MenuElem (_("Delete"), mem_fun(*this, &RouteUI::remove_this_route)));
+       }
 }
 
-static bool __reset_item (RadioMenuItem* item)
+static bool __reset_item (RadioMenuItem* item, RadioMenuItem* item_2)
 {
        item->set_active ();
+       item_2->set_active ();
        return false;
 }
 
@@ -607,15 +629,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;
@@ -623,13 +653,13 @@ RouteTimeAxisView::set_track_mode (TrackMode mode)
                return;
        }
        
-       if (item && other_item && 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;
 
@@ -637,7 +667,7 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem*
 
                if (!needs_bounce) {
                        /* cannot be done */
-                       Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item));
+                       Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item, reset_item_2));
                        return;
                } else {
                        cerr << "would bounce this one\n";
@@ -648,7 +678,9 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem*
        track->set_mode (mode);
 
        rec_enable_button->remove ();
+
        switch (mode) {
+       case ARDOUR::NonLayered:
        case ARDOUR::Normal:
                rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
                break;
@@ -656,8 +688,8 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem*
                rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red"))))));
                break;
        }
-       rec_enable_button->show_all ();
 
+       rec_enable_button->show_all ();
 }
 
 void
@@ -669,6 +701,9 @@ RouteTimeAxisView::track_mode_changed ()
        case ARDOUR::Normal:
                item = normal_track_mode_item;
                break;
+       case ARDOUR::NonLayered:
+               item = non_layered_track_mode_item;
+               break;
        case ARDOUR::Destructive:
                item = destructive_track_mode_item;
                break;
@@ -715,7 +750,7 @@ RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
 #endif
 
        if (timestretch_rect == 0) {
-               timestretch_rect = new SimpleRect (*canvas_display);
+               timestretch_rect = new SimpleRect (*canvas_display ());
                timestretch_rect->property_x1() =  0.0;
                timestretch_rect->property_y1() =  0.0;
                timestretch_rect->property_x2() =  0.0;
@@ -727,9 +762,9 @@ 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;
@@ -768,56 +803,36 @@ RouteTimeAxisView::show_selection (TimeSelection& ts)
 }
 
 void
-RouteTimeAxisView::set_height (TrackHeight h)
+RouteTimeAxisView::set_height (uint32_t h)
 {
-       int gmlen = (height_to_pixels (h)) - 5;
-       bool height_changed = (height == 0) || (h != height_style);
-       lm.setup_meters (gmlen);
+       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;
+       char buf[32];
+       snprintf (buf, sizeof (buf), "%u", height);
+       xml_node->add_property ("height", buf);
 
-       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;
-       }
-
-       switch (height_style) {
-       case Largest:
-       case Large:
-       case Larger:
-       case Normal:
+       if (height >= hNormal) {
                reset_meter();
                show_name_entry ();
                hide_name_label ();
 
+               gm.get_gain_slider().show();
                mute_button->show();
-               solo_button->show();
+               if (!_route || _route->is_master()) {
+                       solo_button->hide();
+               } else {
+                       solo_button->show();
+               }
                if (rec_enable_button)
                        rec_enable_button->show();
 
@@ -830,15 +845,20 @@ RouteTimeAxisView::set_height (TrackHeight h)
                if (is_track() && track()->mode() == ARDOUR::Normal) {
                        playlist_button.show();
                }
-               break;
 
-       case Smaller:
+       } else if (height >= hSmaller) {
+
                reset_meter();
                show_name_entry ();
                hide_name_label ();
 
+               gm.get_gain_slider().hide();
                mute_button->show();
-               solo_button->show();
+               if (!_route || _route->is_master()) {
+                       solo_button->hide();
+               } else {
+                       solo_button->show();
+               }
                if (rec_enable_button)
                        rec_enable_button->show();
 
@@ -851,12 +871,25 @@ RouteTimeAxisView::set_height (TrackHeight h)
                if (is_track() && track()->mode() == ARDOUR::Normal) {
                        playlist_button.hide ();
                }
-               break;
 
-       case Small:
+       } else {
+
+
+               /* don't allow name_entry to be hidden while
+                  it has focus, otherwise the GUI becomes unusable.
+               */
+
+               if (name_entry.has_focus()) {
+                       if (name_entry.get_text() != _route->name()) {
+                               name_entry_changed ();
+                       }
+                       controls_ebox.grab_focus ();
+               }
+
                hide_name_entry ();
                show_name_label ();
-
+               
+               gm.get_gain_slider().hide();
                mute_button->hide();
                solo_button->hide();
                if (rec_enable_button)
@@ -869,7 +902,6 @@ RouteTimeAxisView::set_height (TrackHeight h)
                automation_button.hide ();
                playlist_button.hide ();
                name_label.set_text (_route->name());
-               break;
        }
 
        if (height_changed) {
@@ -892,7 +924,7 @@ RouteTimeAxisView::select_track_color ()
 void
 RouteTimeAxisView::reset_samples_per_unit ()
 {
-       set_samples_per_unit (editor.get_current_zoom());
+       set_samples_per_unit (_editor.get_current_zoom());
 }
 
 void
@@ -983,8 +1015,43 @@ RouteTimeAxisView::rename_current_playlist ()
        }
 }
 
+std::string 
+RouteTimeAxisView::resolve_new_group_playlist_name(std::string &basename, vector<boost::shared_ptr<Playlist> > const & playlists)
+{
+       std::string ret(basename);
+
+       std::string group_string = "."+edit_group()->name()+".";
+
+       // iterate through all playlists
+       int maxnumber = 0;
+       for (vector<boost::shared_ptr<Playlist> >::const_iterator i = playlists.begin(); i != playlists.end(); ++i) {
+               std::string tmp = (*i)->name();
+
+               std::string::size_type idx = tmp.find(group_string);                    
+               // find those which belong to this group
+               if (idx != string::npos) {
+                       tmp = tmp.substr(idx + group_string.length());
+
+                       // and find the largest current number
+                       int x = atoi(tmp.c_str());
+                       if (x > maxnumber) {
+                               maxnumber = x;
+                       }
+               }
+       }
+
+       maxnumber++;
+
+       char buf[32];
+       snprintf (buf, sizeof(buf), "%d", maxnumber);
+               
+       ret = this->name()+"."+edit_group()->name()+"."+buf;
+
+       return ret;
+}
+
 void
-RouteTimeAxisView::use_copy_playlist (bool prompt)
+RouteTimeAxisView::use_copy_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const & playlists_before_op)
 {
        string name;
        
@@ -997,10 +1064,14 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
                return;
 
        name = pl->name();
+       
+       if (edit_group() && edit_group()->is_active()) {
+               name = resolve_new_group_playlist_name(name, playlists_before_op);
+       }
 
-       do {
+       while (_session.playlist_by_name(name)) {
                name = Playlist::bump_name (name, _session);
-       } while (_session.playlist_by_name(name));
+       }
 
        // TODO: The prompter "new" button should be de-activated if the user
        // specifies a playlist name which already exists in the session.
@@ -1032,7 +1103,7 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
 }
 
 void
-RouteTimeAxisView::use_new_playlist (bool prompt)
+RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const & playlists_before_op)
 {
        string name;
        
@@ -1045,10 +1116,14 @@ RouteTimeAxisView::use_new_playlist (bool prompt)
                return;
 
        name = pl->name();
+       
+       if (edit_group() && edit_group()->is_active()) {
+               name = resolve_new_group_playlist_name(name,playlists_before_op);
+       }
 
-       do {
+       while (_session.playlist_by_name(name)) {
                name = Playlist::bump_name (name, _session);
-       } while (_session.playlist_by_name(name));
+       }
 
 
        if (prompt) {
@@ -1087,7 +1162,7 @@ RouteTimeAxisView::clear_playlist ()
        if (!pl)
                return;
 
-       editor.clear_playlist (pl);
+       _editor.clear_playlist (pl);
 }
 
 void
@@ -1118,38 +1193,38 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev)
        if (Keyboard::modifier_state_equals (ev->state, (Keyboard::TertiaryModifier|Keyboard::PrimaryModifier))) {
 
                /* special case: select/deselect all tracks */
-               if (editor.get_selection().selected (this)) {
-                       editor.get_selection().clear_tracks ();
+               if (_editor.get_selection().selected (this)) {
+                       _editor.get_selection().clear_tracks ();
                } else {
-                       editor.select_all_tracks ();
+                       _editor.select_all_tracks ();
                }
 
                return;
        } 
 
-       PublicEditor::TrackViewList* tracks = editor.get_valid_views (this, _route->edit_group());
+       PublicEditor::TrackViewList* tracks = _editor.get_valid_views (this, _route->edit_group());
 
        switch (Keyboard::selection_type (ev->state)) {
        case Selection::Toggle:
-               editor.get_selection().toggle (*tracks);
+               _editor.get_selection().toggle (*tracks);
                break;
                
        case Selection::Set:
-               editor.get_selection().set (*tracks);
+               _editor.get_selection().set (*tracks);
                break;
 
        case Selection::Extend:
                if (tracks->size() > 1) {
                        /* add each one, do not "extend" */
-                       editor.get_selection().add (*tracks);
+                       _editor.get_selection().add (*tracks);
                } else {
                        /* extend to the single track */
-                       editor.extend_selection_to_track (*tracks->front());
+                       _editor.extend_selection_to_track (*tracks->front());
                }
                break;
 
        case Selection::Add:
-               editor.get_selection().add (*tracks);
+               _editor.get_selection().add (*tracks);
                break;
        }
 
@@ -1187,7 +1262,7 @@ RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top,
        nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
        nframes_t end_adjusted   = session_frame_to_track_frame(end, speed);
 
-       if (_view && ((top < 0.0 && bot < 0.0)) || touched (top, bot)) {
+       if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) {
                _view->get_selectables (start_adjusted, end_adjusted, results);
        }
 
@@ -1217,30 +1292,31 @@ 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*
@@ -1285,11 +1361,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);
        }
 }
 
@@ -1305,7 +1384,7 @@ RouteTimeAxisView::hide_click ()
        // LAME fix for hide_button refresh fix
        hide_button.set_sensitive(false);
        
-       editor.hide_track_in_display (*this);
+       _editor.hide_track_in_display (*this);
        
        hide_button.set_sensitive(true);
 }
@@ -1364,14 +1443,14 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
        switch (op) {
        case Cut:
                if ((what_we_got = playlist->cut (time)) != 0) {
-                       editor.get_cut_buffer().add (what_we_got);
+                       _editor.get_cut_buffer().add (what_we_got);
                        _session.add_command( new MementoCommand<Playlist>(*playlist.get(), &before, &playlist->get_state()));
                        ret = true;
                }
                break;
        case Copy:
                if ((what_we_got = playlist->copy (time)) != 0) {
-                       editor.get_cut_buffer().add (what_we_got);
+                       _editor.get_cut_buffer().add (what_we_got);
                }
                break;
 
@@ -1397,7 +1476,7 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
        boost::shared_ptr<Playlist> playlist = get_diskstream()->playlist();
        PlaylistSelection::iterator p;
        
-       for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth);
+       for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth) {}
 
        if (p == selection.playlists.end()) {
                return false;
@@ -1441,9 +1520,7 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        menu->set_name ("ArdourContextMenu");
        playlist_items.clear();
 
-       if (playlist_menu) {
-               delete playlist_menu;
-       }
+       delete playlist_menu;
 
        playlist_menu = new Menu;
        playlist_menu->set_name ("ArdourContextMenu");
@@ -1475,10 +1552,19 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        playlist_items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
        playlist_items.push_back (SeparatorElem());
 
-       playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
-       playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
+       if (!edit_group() || !edit_group()->is_active()) {
+               playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(_editor, &PublicEditor::new_playlists), this)));
+               playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(_editor, &PublicEditor::copy_playlists), this)));
+
+       } else {
+               // Use a label which tells the user what is happening
+               playlist_items.push_back (MenuElem (_("New Take"), bind(mem_fun(_editor, &PublicEditor::new_playlists), this)));
+               playlist_items.push_back (MenuElem (_("Copy Take"), bind(mem_fun(_editor, &PublicEditor::copy_playlists), this)));
+               
+       }
+
        playlist_items.push_back (SeparatorElem());
-       playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(editor, &PublicEditor::clear_playlists), this)));
+       playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(_editor, &PublicEditor::clear_playlists), this)));
        playlist_items.push_back (SeparatorElem());
 
        playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
@@ -1498,14 +1584,58 @@ RouteTimeAxisView::use_playlist (boost::weak_ptr<Playlist> wpl)
        boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl);
        
        if (apl) {
+               if (get_diskstream()->playlist() == apl) {
+                       // radio button cotnrols mean this function is called for both the 
+                       // old and new playlist
+                       return;
+               }
                get_diskstream()->use_playlist (apl);
+
+
+               if (edit_group() && edit_group()->is_active()) {
+                       //PBD::stacktrace(cerr, 20);
+                       std::string group_string = "."+edit_group()->name()+".";
+
+                       std::string take_name = apl->name();
+                       std::string::size_type idx = take_name.find(group_string);
+
+                       if (idx == std::string::npos)
+                               return;
+
+                       take_name = take_name.substr(idx + group_string.length()); // find the bit containing the take number / name
+                       
+                       for (list<Route*>::const_iterator i = edit_group()->route_list().begin(); i != edit_group()->route_list().end(); ++i) {
+                               if ( (*i) == this->route().get()) {
+                                       continue;
+                               }
+                               
+                               std::string playlist_name = (*i)->name()+group_string+take_name;
+
+                               Track *track = dynamic_cast<Track *>(*i);
+                               if (!track) {
+                                       std::cerr << "route " << (*i)->name() << " is not a Track" << std::endl;
+                                       continue;
+                               }
+
+                               boost::shared_ptr<Playlist> ipl = session().playlist_by_name(playlist_name);
+                               if (!ipl) {
+                                       // No playlist for this track for this take yet, make it
+                                       track->diskstream()->use_new_playlist();
+                                       track->diskstream()->playlist()->set_name(playlist_name);
+                               } else {
+                                       track->diskstream()->use_playlist(ipl);
+                               }
+                               
+                               //(*i)->get_dis
+                       }
+               }
        }
 }
 
 void
 RouteTimeAxisView::show_playlist_selector ()
 {
-       editor.playlist_selector().show_for (this);
+       _editor.playlist_selector().show_for (this);
 }
 
 void
@@ -1545,7 +1675,7 @@ RouteTimeAxisView::color_handler ()
 }
 
 void
-RouteTimeAxisView::toggle_automation_track (Parameter param)
+RouteTimeAxisView::toggle_automation_track (Evoral::Parameter param)
 {
        RouteAutomationNode* node = automation_track(param);
 
@@ -1557,7 +1687,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);
@@ -1574,12 +1704,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"));
 
@@ -1587,7 +1719,7 @@ RouteTimeAxisView::automation_track_hidden (Parameter param)
                ran->menu_item->set_active (false);
        }
 
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 
@@ -1598,10 +1730,10 @@ RouteTimeAxisView::show_all_automation ()
        
        /* 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);
        }
@@ -1621,10 +1753,9 @@ 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
@@ -1634,11 +1765,11 @@ RouteTimeAxisView::show_existing_automation ()
        
        /* 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);
                }
@@ -1649,15 +1780,15 @@ 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);
                        }
                }
        }
 
        no_redraw = false;
-
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+       
+       _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
@@ -1667,7 +1798,7 @@ RouteTimeAxisView::hide_all_automation ()
 
        /* Hide our automation */
 
-       for (map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+       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"));
@@ -1685,26 +1816,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;
-
-               if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
-                       rv->add_ghost (*atv.get());
+       /* XXX need to find out if automation children have automationstreamviews. If yes, no ghosts */
+       if(is_audio_track()) {
+               for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+                       boost::shared_ptr<AutomationTimeAxisView> atv;
+                       
+                       if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
+                               atv->add_ghost(rv);
+                       }
                }
        }
-}
 
-void
-RouteTimeAxisView::add_ghost_to_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 ()
@@ -1729,7 +1861,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) {
 
@@ -1766,7 +1898,7 @@ 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;
@@ -1793,11 +1925,12 @@ 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, false, 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));
 
@@ -1810,7 +1943,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 (mem_fun(*pan->view.get(), &TimeAxisView::add_ghost));
        }
 
        processor->mark_automation_visible (what, true);
@@ -1825,18 +1958,23 @@ 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<Parameter>::iterator i = s.begin(); i != s.end(); ++i) {
+       for (set<Evoral::Parameter>::iterator i = s.begin(); i != s.end(); ++i) {
                
                if ((al = find_processor_automation_curve (processor, *i)) != 0) {
                        al->queue_reset ();
@@ -1847,19 +1985,18 @@ 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));
 
        bool hideit = (!show);
-       
-       XMLNode* node;
 
        if ((node = track->get_state_node()) != 0) {
                if  ((prop = node->property ("shown")) != 0) {
@@ -1868,14 +2005,18 @@ RouteTimeAxisView::add_automation_child(Parameter param, boost::shared_ptr<Autom
                        }
                } 
        }
-       
+
        _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();
@@ -1883,16 +2024,21 @@ 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) {
+               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;
+       const std::set<Evoral::Parameter>& automatable = processor->what_can_be_automated ();
+       std::set<Evoral::Parameter> has_visible_automation;
 
-       processor->what_has_visible_automation(has_visible_automation);
+       processor->what_has_visible_data(has_visible_automation);
 
        if (automatable.empty()) {
                return;
@@ -1925,7 +2071,7 @@ 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;
@@ -1982,7 +2128,8 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto
 
                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);
@@ -1997,7 +2144,7 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto
 
                /* now trigger a redisplay */
                
-                _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+                _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 
        }
 }
@@ -2013,8 +2160,8 @@ 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 (mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu));
+       _route->foreach_processor (mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
 
        for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ) {
 
@@ -2035,11 +2182,11 @@ RouteTimeAxisView::processors_changed ()
 
        /* change in visibility was possible */
 
-       _route->gui_changed ("track_height", this);
+       _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;
 
@@ -2070,12 +2217,26 @@ RouteTimeAxisView::update_rec_display ()
 void
 RouteTimeAxisView::set_layer_display (LayerDisplay d)
 {
-       _view->set_layer_display (d);
+       if (_view) {
+               _view->set_layer_display (d);
+       }
+}
+
+LayerDisplay
+RouteTimeAxisView::layer_display () const
+{
+       if (_view) {
+               return _view->layer_display ();
+       }
+
+       /* we don't know, since we don't have a _view, so just return something */
+       return Overlaid;
 }
+
        
 
 boost::shared_ptr<AutomationTimeAxisView>
-RouteTimeAxisView::automation_child(ARDOUR::Parameter param)
+RouteTimeAxisView::automation_child(Evoral::Parameter param)
 {
        AutomationTracks::iterator i = _automation_tracks.find(param);
        if (i != _automation_tracks.end())
@@ -2087,14 +2248,14 @@ RouteTimeAxisView::automation_child(ARDOUR::Parameter param)
 void
 RouteTimeAxisView::fast_update ()
 {
-       lm.update_meters ();
+       gm.get_level_meter().update_meters ();
 }
 
 void
 RouteTimeAxisView::hide_meter ()
 {
        clear_meter ();
-       lm.hide_meters ();
+       gm.get_level_meter().hide_meters ();
 }
 
 void
@@ -2107,7 +2268,7 @@ void
 RouteTimeAxisView::reset_meter ()
 {
        if (Config->get_show_track_meters()) {
-               lm.setup_meters (height-5);
+               gm.get_level_meter().setup_meters (height-5);
        } else {
                hide_meter ();
        }
@@ -2116,7 +2277,7 @@ RouteTimeAxisView::reset_meter ()
 void
 RouteTimeAxisView::clear_meter ()
 {
-       lm.clear_meters ();
+       gm.get_level_meter().clear_meters ();
 }
 
 void
@@ -2131,3 +2292,134 @@ RouteTimeAxisView::io_changed (IOChange change, void *src)
 {
        reset_meter ();
 }
+
+void
+RouteTimeAxisView::build_underlay_menu(Gtk::Menu* parent_menu) {
+       using namespace Menu_Helpers;
+
+       if(!_underlay_streams.empty()) {
+               MenuList& parent_items = parent_menu->items();
+               Menu* gs_menu = manage (new Menu);
+               gs_menu->set_name ("ArdourContextMenu");
+               MenuList& gs_items = gs_menu->items();
+               
+               parent_items.push_back (MenuElem (_("Underlays"), *gs_menu));
+               
+               for(UnderlayList::iterator it = _underlay_streams.begin(); it != _underlay_streams.end(); ++it) {
+                       gs_items.push_back(MenuElem(string_compose(_("Remove \"%1\""), (*it)->trackview().name()),
+                                                   bind(mem_fun(*this, &RouteTimeAxisView::remove_underlay), *it)));
+               }
+       }
+}
+
+bool
+RouteTimeAxisView::set_underlay_state() 
+{
+       if(!underlay_xml_node) {
+               return false;
+       }
+
+       XMLNodeList nlist = underlay_xml_node->children();
+       XMLNodeConstIterator niter;
+       XMLNode *child_node;
+       
+       for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+               child_node = *niter;
+
+               if(child_node->name() != "Underlay") {
+                       continue;
+               }
+
+               XMLProperty* prop = child_node->property ("id");
+               if (prop) {
+                       PBD::ID id (prop->value());
+
+                       RouteTimeAxisView* v = _editor.get_route_view_by_id (id);
+
+                       if (v) {
+                               add_underlay(v->view(), false);
+                       }
+               }
+       }
+
+       return false;
+}
+
+void
+RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml) 
+{
+       if(!v) {
+               return;
+       }
+
+       RouteTimeAxisView& other = v->trackview();
+
+       if(find(_underlay_streams.begin(), _underlay_streams.end(), v) == _underlay_streams.end()) {
+               if(find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this) != other._underlay_mirrors.end()) {
+                       fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
+                       /*NOTREACHED*/
+               }
+
+               _underlay_streams.push_back(v);
+               other._underlay_mirrors.push_back(this);
+
+               v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::add_ghost));
+
+               if(update_xml) {
+                       if(!underlay_xml_node) {
+                               ensure_xml_node();
+                               underlay_xml_node = xml_node->add_child("Underlays");
+                       }
+
+                       XMLNode* node = underlay_xml_node->add_child("Underlay");
+                       XMLProperty* prop = node->add_property("id");
+                       prop->set_value(v->trackview().route()->id().to_s());
+               }
+       }
+}
+
+void
+RouteTimeAxisView::remove_underlay(StreamView* v) 
+{
+       if(!v) {
+               return;
+       }
+
+       UnderlayList::iterator it = find(_underlay_streams.begin(), _underlay_streams.end(), v);
+       RouteTimeAxisView& other = v->trackview();
+
+       if(it != _underlay_streams.end()) {
+               UnderlayMirrorList::iterator gm = find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this);
+
+               if(gm == other._underlay_mirrors.end()) {
+                       fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg;
+                       /*NOTREACHED*/
+               }
+
+               v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::remove_ghost));
+
+               _underlay_streams.erase(it);
+               other._underlay_mirrors.erase(gm);
+
+               if(underlay_xml_node) {
+                       underlay_xml_node->remove_nodes_and_delete("id", v->trackview().route()->id().to_s());
+               }
+       }
+}
+
+void
+RouteTimeAxisView::set_edit_group_to_new ()
+{
+       RouteGroup* g = new RouteGroup (_session, "", RouteGroup::Active);
+       g->set_active (true, this);
+
+       RouteGroupDialog d (g);
+       int const r = d.do_run ();
+
+       if (r == Gtk::RESPONSE_OK) {
+               _session.add_edit_group (g);
+               _route->set_edit_group (g, this);
+       } else {
+               delete g;
+       }
+}