show() widgets explicitly, one little file at a time
[ardour.git] / gtk2_ardour / route_time_axis.cc
index 0d7405e4f6f467fc7f3a30e955e7404249083370..caead7fdd1461229e4f30bc9c186a75952b36a98 100644 (file)
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <string>
 #include <vector>
+#include <utility>
 
 #include <sigc++/bind.h>
 
@@ -40,8 +41,9 @@
 #include <gtkmm2ext/utils.h>
 
 #include <ardour/playlist.h>
+#include <ardour/audioplaylist.h>
 #include <ardour/diskstream.h>
-#include <ardour/insert.h>
+#include <ardour/processor.h>
 #include <ardour/ladspa_plugin.h>
 #include <ardour/location.h>
 #include <ardour/panner.h>
 #include <ardour/session.h>
 #include <ardour/session_playlist.h>
 #include <ardour/utils.h>
+#include <ardour/parameter.h>
 
 #include "ardour_ui.h"
 #include "route_time_axis.h"
 #include "automation_time_axis.h"
-#include "redirect_automation_time_axis.h"
-#include "redirect_automation_line.h"
 #include "canvas_impl.h"
 #include "crossfade_view.h"
 #include "enums.h"
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "playlist_selector.h"
-#include "plugin_selector.h"
-#include "plugin_ui.h"
 #include "point_selection.h"
 #include "prompter.h"
 #include "public_editor.h"
@@ -81,6 +80,7 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
 using namespace Editing;
+using namespace sigc;
 
 
 RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr<Route> rt, Canvas& canvas)
@@ -106,11 +106,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        ignore_toggle = false;
 
-       mute_button->set_active (false);
-       solo_button->set_active (false);
-       
-       mute_button->set_name ("TrackMuteButton");
-       solo_button->set_name ("SoloButton");
        edit_group_button.set_name ("TrackGroupButton");
        playlist_button.set_name ("TrackPlaylistButton");
        automation_button.set_name ("TrackAutomationButton");
@@ -118,20 +113,9 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        visual_button.set_name ("TrackVisualButton");
        hide_button.set_name ("TrackRemoveButton");
 
-       hide_button.add (*(manage (new Image (get_xpm("small_x.xpm")))));
-
-       solo_button->signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       mute_button->signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       playlist_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       automation_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       size_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       visual_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-       hide_button.signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
+       hide_button.add (*(manage (new Image (::get_icon("hide")))));
+       hide_button.show_all ();
 
-       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), 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), false);
        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));
@@ -139,11 +123,28 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        visual_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::visual_click));
        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));
+       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));
+
        if (is_track()) {
-               rec_enable_button->set_active (false);
-               rec_enable_button->set_name ("TrackRecordEnableButton");
-               rec_enable_button->signal_button_press_event().connect (mem_fun (*this, &RouteTimeAxisView::select_me), false);
-               rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
+
+               /* use icon */
+
+               rec_enable_button->remove ();
+               switch (track()->mode()) {
+               case ARDOUR::Normal:
+                       rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
+                       break;
+               case ARDOUR::Destructive:
+                       rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red"))))));
+                       break;
+               }
+               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));
                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"));
        }
@@ -175,57 +176,36 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        /* remove focus from the buttons */
        
-       automation_button.unset_flags (Gtk::CAN_FOCUS);
-       solo_button->unset_flags (Gtk::CAN_FOCUS);
-       mute_button->unset_flags (Gtk::CAN_FOCUS);
-       edit_group_button.unset_flags (Gtk::CAN_FOCUS);
-       size_button.unset_flags (Gtk::CAN_FOCUS);
-       playlist_button.unset_flags (Gtk::CAN_FOCUS);
-       hide_button.unset_flags (Gtk::CAN_FOCUS);
-       visual_button.unset_flags (Gtk::CAN_FOCUS);
-
-       /* map current state of the route */
-
-       update_diskstream_display ();
-       solo_changed(0);
-       mute_changed(0);
-       //redirects_changed (0);
-       //reset_redirect_automation_curves ();
        y_position = -1;
 
        _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed));
        _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed));
-       _route->redirects_changed.connect (mem_fun(*this, &RouteTimeAxisView::redirects_changed));
-       _route->name_changed.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed));
+       _route->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));
 
+
        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));
 
-               /* ask for notifications of any new RegionViews */
-               // FIXME: _view is NULL, but it would be nice to attach this here :/
-               //_view->RegionViewAdded.connect (mem_fun(*this, &RouteTimeAxisView::region_view_added));
-               //_view->attach ();
-
                /* pick up the correct freeze state */
                map_frozen ();
 
        }
 
        editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
-       ColorChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
+       ColorsChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
 }
 
 RouteTimeAxisView::~RouteTimeAxisView ()
 {
        GoingAway (); /* EMIT_SIGNAL */
 
-       vector_delete (&redirect_automation_curves);
-
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                delete *i;
        }
 
@@ -246,15 +226,23 @@ RouteTimeAxisView::~RouteTimeAxisView ()
 }
 
 void
-RouteTimeAxisView::set_playlist (Playlist *newplaylist)
+RouteTimeAxisView::post_construct ()
+{
+       /* map current state of the route */
+
+       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 ();
+}
+
+void
+RouteTimeAxisView::set_playlist (boost::shared_ptr<Playlist> newplaylist)
 {
-       Playlist *pl = playlist();
+       boost::shared_ptr<Playlist> pl = playlist();
        assert(pl);
 
        modified_connection.disconnect ();
-       state_changed_connection.disconnect ();
-       
-       state_changed_connection = pl->StateChanged.connect (mem_fun(*this, &RouteTimeAxisView::playlist_state_changed));
        modified_connection = pl->Modified.connect (mem_fun(*this, &RouteTimeAxisView::playlist_modified));
 }
 
@@ -263,6 +251,63 @@ 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)
 {
@@ -297,8 +342,6 @@ RouteTimeAxisView::add_edit_group_menu_item (RouteGroup *eg, RadioMenuItem::Grou
 
        MenuList &items = edit_group_menu.items();
 
-       cerr << "adding edit group " << eg->name() << endl;
-
        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 ();
@@ -307,18 +350,10 @@ RouteTimeAxisView::add_edit_group_menu_item (RouteGroup *eg, RadioMenuItem::Grou
 
 void
 RouteTimeAxisView::set_edit_group_from_menu (RouteGroup *eg)
-
 {
        _route->set_edit_group (eg, this);
 }
 
-void
-RouteTimeAxisView::playlist_state_changed (Change ignored)
-{
-       // ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::playlist_state_changed), ignored));
-       // why are we here ?
-}
-
 void
 RouteTimeAxisView::playlist_changed ()
 
@@ -326,7 +361,7 @@ RouteTimeAxisView::playlist_changed ()
        label_view ();
 
        if (is_track()) {
-               set_playlist (dynamic_cast<Playlist*>(get_diskstream()->playlist()));
+               set_playlist (get_diskstream()->playlist());
        }
 }
 
@@ -343,7 +378,7 @@ RouteTimeAxisView::label_view ()
 }
 
 void
-RouteTimeAxisView::route_name_changed (void *src)
+RouteTimeAxisView::route_name_changed ()
 {
        editor.route_name_changed (this);
        label_view ();
@@ -363,14 +398,16 @@ RouteTimeAxisView::playlist_click ()
 {
        // always build a new action menu
        
-       if (playlist_action_menu == 0) {
-               playlist_action_menu = new Menu;
-               playlist_action_menu->set_name ("ArdourContextMenu");
-       }
-       
-       build_playlist_menu(playlist_action_menu);
+       if (playlist_action_menu != 0) {
+               delete playlist_action_menu;
+       } 
 
-       playlist_action_menu->popup (1, 0);
+       playlist_action_menu = new Menu;
+       playlist_action_menu->set_name ("ArdourContextMenu");
+       
+       build_playlist_menu (playlist_action_menu);
+       editor.set_selected_track (*this, Selection::Add);
+       playlist_action_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
@@ -382,7 +419,8 @@ RouteTimeAxisView::automation_click ()
                */
                build_display_menu ();
        }
-       automation_action_menu->popup (1, 0);
+       editor.set_selected_track (*this, Selection::Add);
+       automation_action_menu->popup (1, gtk_get_current_event_time());
 }
 
 void
@@ -403,7 +441,27 @@ RouteTimeAxisView::build_automation_action_menu ()
        automation_items.push_back (MenuElem (_("Hide all automation"),
                                              mem_fun(*this, &RouteTimeAxisView::hide_all_automation)));
 
+       if (subplugin_menu.get_parent())
+               subplugin_menu.detach();
+
        automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu));
+       
+       map<ARDOUR::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;
+
+               automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param), 
+                               bind (mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param)));
+
+               i->second->menu_item = static_cast<Gtk::CheckMenuItem*>(&automation_items.back());
+
+               i->second->menu_item->set_active(show_automation(i->second->param));
+               //i->second->menu_item->set_active(false);
+       }
 }
 
 void
@@ -464,6 +522,24 @@ RouteTimeAxisView::build_display_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;
+               }
        }
 
        items.push_back (SeparatorElem());
@@ -475,9 +551,93 @@ RouteTimeAxisView::build_display_menu ()
        items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
 }
 
+static bool __reset_item (RadioMenuItem* item)
+{
+       item->set_active ();
+       return false;
+}
+
+void
+RouteTimeAxisView::set_track_mode (TrackMode mode)
+{
+       RadioMenuItem* item;
+       RadioMenuItem* other_item;
+
+       switch (mode) {
+       case ARDOUR::Normal:
+               item = normal_track_mode_item;
+               other_item = destructive_track_mode_item;
+               break;
+       case ARDOUR::Destructive:
+               item = destructive_track_mode_item;
+               other_item = normal_track_mode_item;
+               break;
+       default:
+               fatal << string_compose (_("programming error: %1 %2"), "illegal track mode in RouteTimeAxisView::set_track_mode", mode) << endmsg;
+               /*NOTREACHED*/
+               return;
+       }
+
+       if (item->get_active () && track()->mode() != mode) {
+               _set_track_mode (track().get(), mode, other_item);
+       }
+}
+
+void
+RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* reset_item)
+{
+       bool needs_bounce;
+
+       if (!track->can_use_mode (mode, needs_bounce)) {
+
+               if (!needs_bounce) {
+                       /* cannot be done */
+                       Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item));
+                       return;
+               } else {
+                       cerr << "would bounce this one\n";
+                       return;
+               }
+       }
+
+       track->set_mode (mode);
+
+       rec_enable_button->remove ();
+       switch (mode) {
+       case ARDOUR::Normal:
+               rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red"))))));
+               break;
+       case ARDOUR::Destructive:
+               rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red"))))));
+               break;
+       }
+       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::Destructive:
+               item = destructive_track_mode_item;
+               break;
+       default:
+               fatal << string_compose (_("programming error: %1 %2"), "illegal track mode in RouteTimeAxisView::set_track_mode", track()->mode()) << endmsg;
+               /*NOTREACHED*/
+               return;
+       }
+
+       item->set_active ();
+}
 
 void
-RouteTimeAxisView::show_timestretch (jack_nframes_t start, jack_nframes_t end)
+RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
 {
        double x1;
        double x2;
@@ -515,8 +675,8 @@ RouteTimeAxisView::show_timestretch (jack_nframes_t start, jack_nframes_t end)
                timestretch_rect->property_y1() =  0.0;
                timestretch_rect->property_x2() =  0.0;
                timestretch_rect->property_y2() =  0.0;
-               timestretch_rect->property_fill_color_rgba() =  color_map[cTimeStretchFill];
-               timestretch_rect->property_outline_color_rgba() = color_map[cTimeStretchOutline];
+               timestretch_rect->property_fill_color_rgba() =  ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
+               timestretch_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchOutline.get();
        }
 
        timestretch_rect->show ();
@@ -571,7 +731,9 @@ RouteTimeAxisView::set_height (TrackHeight h)
 
        ensure_xml_node ();
 
-       _view->set_height ((double) height);
+       if (_view) {
+               _view->set_height ((double) height);
+       }
 
        switch (height_style) {
        case Largest:
@@ -607,19 +769,19 @@ RouteTimeAxisView::set_height (TrackHeight h)
                show_name_entry ();
                hide_name_label ();
 
-               mute_button->show_all();
-               solo_button->show_all();
+               mute_button->show();
+               solo_button->show();
                if (rec_enable_button)
-                       rec_enable_button->show_all();
+                       rec_enable_button->show();
 
-               edit_group_button.show_all();
-               hide_button.show_all();
-               visual_button.show_all();
-               size_button.show_all();
-               automation_button.show_all();
+               edit_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_all();
+                       playlist_button.show();
                }
                break;
 
@@ -627,10 +789,10 @@ RouteTimeAxisView::set_height (TrackHeight h)
                show_name_entry ();
                hide_name_label ();
 
-               mute_button->show_all();
-               solo_button->show_all();
+               mute_button->show();
+               solo_button->show();
                if (rec_enable_button)
-                       rec_enable_button->show_all();
+                       rec_enable_button->show();
 
                edit_group_button.hide ();
                hide_button.hide ();
@@ -721,7 +883,24 @@ RouteTimeAxisView::align_style_changed ()
 void
 RouteTimeAxisView::set_align_style (AlignStyle style)
 {
-       get_diskstream()->set_align_style (style);
+       RadioMenuItem* item;
+
+       switch (style) {
+       case ExistingMaterial:
+               item = align_existing_item;
+               break;
+       case CaptureTime:
+               item = align_capture_item;
+               break;
+       default:
+               fatal << string_compose (_("programming error: %1 %2"), "illegal align style in RouteTimeAxisView::set_align_style", style) << endmsg;
+               /*NOTREACHED*/
+               return;
+       }
+
+       if (item->get_active()) {
+               get_diskstream()->set_align_style (style);
+       }
 }
 
 void
@@ -730,11 +909,11 @@ RouteTimeAxisView::rename_current_playlist ()
        ArdourPrompter prompter (true);
        string name;
 
-       Diskstream *const ds = get_diskstream();
+       boost::shared_ptr<Diskstream> ds = get_diskstream();
        if (!ds || ds->destructive())
                return;
 
-       Playlist *const pl = ds->playlist();
+       boost::shared_ptr<Playlist> pl = ds->playlist();
        if (!pl)
                return;
 
@@ -761,15 +940,22 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
 {
        string name;
        
-       Diskstream *const ds = get_diskstream();
+       boost::shared_ptr<Diskstream> ds = get_diskstream();
        if (!ds || ds->destructive())
                return;
 
-       Playlist *const pl = ds->playlist();
+       boost::shared_ptr<const Playlist> pl = ds->playlist();
        if (!pl)
                return;
 
-       name = Playlist::bump_name (pl->name(), _session);
+       name = pl->name();
+
+       do {
+               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.
 
        if (prompt) {
 
@@ -778,7 +964,7 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
                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, false);
+               prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
                prompter.show_all ();
                
                switch (prompter.run ()) {
@@ -793,7 +979,7 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
 
        if (name.length()) {
                ds->use_copy_playlist ();
-               pl->set_name (name);
+               ds->playlist()->set_name (name);
        }
 }
 
@@ -802,15 +988,20 @@ RouteTimeAxisView::use_new_playlist (bool prompt)
 {
        string name;
        
-       Diskstream *const ds = get_diskstream();
+       boost::shared_ptr<Diskstream> ds = get_diskstream();
        if (!ds || ds->destructive())
                return;
 
-       Playlist *const pl = ds->playlist();
+       boost::shared_ptr<const Playlist> pl = ds->playlist();
        if (!pl)
                return;
 
-       name = Playlist::bump_name (pl->name(), _session);
+       name = pl->name();
+
+       do {
+               name = Playlist::bump_name (name, _session);
+       } while (_session.playlist_by_name(name));
+
 
        if (prompt) {
                
@@ -819,8 +1010,8 @@ RouteTimeAxisView::use_new_playlist (bool prompt)
                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, false);
-               
+               prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true);
+
                switch (prompter.run ()) {
                case Gtk::RESPONSE_ACCEPT:
                        prompter.get_result (name);
@@ -833,22 +1024,22 @@ RouteTimeAxisView::use_new_playlist (bool prompt)
 
        if (name.length()) {
                ds->use_new_playlist ();
-               pl->set_name (name);
+               ds->playlist()->set_name (name);
        }
 }
 
 void
 RouteTimeAxisView::clear_playlist ()
 {
-       Diskstream *const ds = get_diskstream();
+       boost::shared_ptr<Diskstream> ds = get_diskstream();
        if (!ds || ds->destructive())
                return;
 
-       Playlist *const pl = ds->playlist();
+       boost::shared_ptr<Playlist> pl = ds->playlist();
        if (!pl)
                return;
 
-       editor.clear_playlist (*pl);
+       editor.clear_playlist (pl);
 }
 
 void
@@ -876,12 +1067,23 @@ RouteTimeAxisView::update_diskstream_display ()
 void
 RouteTimeAxisView::selection_click (GdkEventButton* ev)
 {
+       if (Keyboard::modifier_state_equals (ev->state, (Keyboard::Shift|Keyboard::Control))) {
+
+               /* special case: select/deselect all tracks */
+               if (editor.get_selection().selected (this)) {
+                       editor.get_selection().clear_tracks ();
+               } else {
+                       editor.select_all_tracks ();
+               }
+
+               return;
+       } 
+
        PublicEditor::TrackViewList* tracks = editor.get_valid_views (this, _route->edit_group());
 
        switch (Keyboard::selection_type (ev->state)) {
        case Selection::Toggle:
-               /* XXX this is not right */
-               editor.get_selection().add (*tracks);
+               editor.get_selection().toggle (*tracks);
                break;
                
        case Selection::Set:
@@ -889,7 +1091,17 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev)
                break;
 
        case Selection::Extend:
-               /* not defined yet */
+               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());
+               }
+               break;
+
+       case Selection::Add:
+               editor.get_selection().add (*tracks);
                break;
        }
 
@@ -899,7 +1111,7 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev)
 void
 RouteTimeAxisView::set_selected_points (PointSelection& points)
 {
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                (*i)->set_selected_points (points);
        }
 }
@@ -907,11 +1119,16 @@ RouteTimeAxisView::set_selected_points (PointSelection& points)
 void
 RouteTimeAxisView::set_selected_regionviews (RegionSelection& regions)
 {
-       _view->set_selected_regionviews (regions);
+       if (_view) {
+               _view->set_selected_regionviews (regions);
+       }
 }
 
+/** Add the selectable things that we have to a list.
+ * @param results List to add things to.
+ */
 void
-RouteTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, double top, double bot, list<Selectable*>& results)
+RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable*>& results)
 {
        double speed = 1.0;
        
@@ -919,8 +1136,8 @@ RouteTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, do
                speed = get_diskstream()->speed();
        }
        
-       jack_nframes_t start_adjusted = session_frame_to_track_frame(start, speed);
-       jack_nframes_t end_adjusted   = session_frame_to_track_frame(end, 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);
@@ -928,7 +1145,7 @@ RouteTimeAxisView::get_selectables (jack_nframes_t start, jack_nframes_t end, do
 
        /* pick up visible automation tracks */
        
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                if (!(*i)->hidden()) {
                        (*i)->get_selectables (start_adjusted, end_adjusted, top, bot, results);
                }
@@ -942,7 +1159,7 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>&
                _view->get_inverted_selectables (sel, results);
        }
 
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                if (!(*i)->hidden()) {
                        (*i)->get_inverted_selectables (sel, results);
                }
@@ -951,6 +1168,33 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>&
        return;
 }
 
+bool
+RouteTimeAxisView::show_automation(Parameter param)
+{
+       return (_show_automation.find(param) != _show_automation.end());
+}
+
+/** Retuns NULL if track for \a param doesn't exist.
+ */
+RouteTimeAxisView::RouteAutomationNode*
+RouteTimeAxisView::automation_track(Parameter param)
+{
+       map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.find(param);
+
+       if (i != _automation_tracks.end())
+               return i->second;
+       else
+               return NULL;
+}
+
+/** Shorthand for GainAutomation, etc.
+ */    
+RouteTimeAxisView::RouteAutomationNode*
+RouteTimeAxisView::automation_track(AutomationType type)
+{
+       return automation_track(Parameter(type));
+}
+
 RouteGroup*
 RouteTimeAxisView::edit_group() const
 {
@@ -963,15 +1207,15 @@ RouteTimeAxisView::name() const
        return _route->name();
 }
 
-Playlist *
+boost::shared_ptr<Playlist>
 RouteTimeAxisView::playlist () const 
 {
-       Diskstream *ds;
+       boost::shared_ptr<Diskstream> ds;
 
        if ((ds = get_diskstream()) != 0) {
                return ds->playlist(); 
        } else {
-               return 0; 
+               return boost::shared_ptr<Playlist> ();
        }
 }
 
@@ -986,17 +1230,17 @@ RouteTimeAxisView::name_entry_changed ()
                return;
        }
 
+       strip_whitespace_edges(x);
+
        if (x.length() == 0) {
                name_entry.set_text (_route->name());
                return;
        }
 
-       strip_whitespace_edges(x);
-
        if (_session.route_name_unique (x)) {
-               _route->set_name (x, this);
+               _route->set_name (x);
        } else {
-               ARDOUR_UI::instance()->popup_error (_("a track already exists with that name"));
+               ARDOUR_UI::instance()->popup_error (_("A track already exists with that name"));
                name_entry.set_text (_route->name());
        }
 }
@@ -1010,28 +1254,33 @@ RouteTimeAxisView::visual_click ()
 void
 RouteTimeAxisView::hide_click ()
 {
+       // LAME fix for hide_button refresh fix
+       hide_button.set_sensitive(false);
+       
        editor.hide_track_in_display (*this);
+       
+       hide_button.set_sensitive(true);
 }
 
-Region*
-RouteTimeAxisView::find_next_region (jack_nframes_t pos, RegionPoint point, int32_t dir)
+boost::shared_ptr<Region>
+RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir)
 {
-       Diskstream *stream;
-       Playlist *playlist;
+       boost::shared_ptr<Diskstream> stream;
+       boost::shared_ptr<Playlist> playlist;
 
        if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) {
                return playlist->find_next_region (pos, point, dir);
        }
 
-       return 0;
+       return boost::shared_ptr<Region> ();
 }
 
 bool
 RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
-       Playlist* what_we_got;
-       Diskstream* ds = get_diskstream();
-       Playlist* playlist;
+       boost::shared_ptr<Playlist> what_we_got;
+       boost::shared_ptr<Diskstream> ds = get_diskstream();
+       boost::shared_ptr<Playlist> playlist;
        bool ret = false;
 
        if (ds == 0) {
@@ -1041,7 +1290,6 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 
        playlist = ds->playlist();
 
-
        TimeSelection time (selection.time);
        float speed = ds->speed();
        if (speed != 1.0f) {
@@ -1056,7 +1304,7 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp 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, &before, &playlist->get_state()));
+                       _session.add_command( new MementoCommand<Playlist>(*playlist.get(), &before, &playlist->get_state()));
                        ret = true;
                }
                break;
@@ -1069,7 +1317,7 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
        case Clear:
                if ((what_we_got = playlist->cut (time)) != 0) {
                        _session.add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
-                       what_we_got->unref ();
+                       what_we_got->release ();
                        ret = true;
                }
                break;
@@ -1079,13 +1327,13 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 }
 
 bool
-RouteTimeAxisView::paste (jack_nframes_t pos, float times, Selection& selection, size_t nth)
+RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth)
 {
        if (!is_track()) {
                return false;
        }
 
-       Playlist* playlist = get_diskstream()->playlist();
+       boost::shared_ptr<Playlist> playlist = get_diskstream()->playlist();
        PlaylistSelection::iterator p;
        
        for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth);
@@ -1098,20 +1346,19 @@ RouteTimeAxisView::paste (jack_nframes_t pos, float times, Selection& selection,
                pos = session_frame_to_track_frame(pos, get_diskstream()->speed() );
        
        XMLNode &before = playlist->get_state();
-       playlist->paste (**p, pos, times);
+       playlist->paste (*p, pos, times);
        _session.add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
 
        return true;
 }
 
 
-list<TimeAxisView*>
+TimeAxisView::Children
 RouteTimeAxisView::get_child_list()
 {
-  
-       list<TimeAxisView*>redirect_children;
+       TimeAxisView::Children redirect_children;
        
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
                if (!(*i)->hidden()) {
                        redirect_children.push_back(*i);
                }
@@ -1136,12 +1383,34 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        if (playlist_menu) {
                delete playlist_menu;
        }
+
        playlist_menu = new Menu;
        playlist_menu->set_name ("ArdourContextMenu");
 
-       playlist_items.push_back (MenuElem (string_compose (_("Current: %1"), get_diskstream()->playlist()->name())));
-       playlist_items.push_back (SeparatorElem());
+       vector<boost::shared_ptr<Playlist> > playlists;
+       boost::shared_ptr<Diskstream> ds = get_diskstream();
+       RadioMenuItem::Group playlist_group;
+
+       _session.get_playlists (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),
+                                                                                                    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), 
+                                                                                                    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 (SeparatorElem());
 
@@ -1150,8 +1419,26 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        playlist_items.push_back (SeparatorElem());
        playlist_items.push_back (MenuElem (_("Clear Current"), mem_fun(editor, &PublicEditor::clear_playlists)));
        playlist_items.push_back (SeparatorElem());
-       playlist_items.push_back (MenuElem(_("Select"), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
 
+       playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
+}
+
+void
+RouteTimeAxisView::use_playlist (boost::weak_ptr<Playlist> wpl)
+{
+       assert (is_track());
+
+       boost::shared_ptr<Playlist> pl (wpl.lock());
+
+       if (!pl) {
+               return;
+       }
+
+       boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl);
+       
+       if (apl) {
+               get_diskstream()->use_playlist (apl);
+       }
 }
 
 void
@@ -1182,36 +1469,88 @@ RouteTimeAxisView::map_frozen ()
 }
 
 void
-RouteTimeAxisView::color_handler (ColorID id, uint32_t val)
+RouteTimeAxisView::color_handler ()
 {
-       switch (id) {
-       case cTimeStretchOutline:
-               timestretch_rect->property_outline_color_rgba() = val;
-               break;
-       case cTimeStretchFill:
-               timestretch_rect->property_fill_color_rgba() = val;
-               break;
-       default:
-               break;
+       //case cTimeStretchOutline:
+       if (timestretch_rect) {
+               timestretch_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchOutline.get();
+       }
+       //case cTimeStretchFill:
+       if (timestretch_rect) {
+               timestretch_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
        }
+
 }
 
-bool
-RouteTimeAxisView::select_me (GdkEventButton* ev)
+void
+RouteTimeAxisView::toggle_automation_track (Parameter param)
 {
-       editor.get_selection().add (this);
-       return false;
+       RouteAutomationNode* node = automation_track(param);
+
+       if (!node)
+               return;
+
+       bool showit = node->menu_item->get_active();
+
+       if (showit != node->track->marked_for_display()) {
+               if (showit) {
+                       node->track->set_marked_for_display (true);
+                       node->track->canvas_display->show();
+                       node->track->get_state_node()->add_property ("shown", X_("yes"));
+               } else {
+                       node->track->set_marked_for_display (false);
+                       node->track->hide ();
+                       node->track->get_state_node()->add_property ("shown", X_("no"));
+               }
+
+               /* now trigger a redisplay */
+               
+               if (!no_redraw) {
+                        _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */
+               }
+       }
 }
 
+void
+RouteTimeAxisView::automation_track_hidden (Parameter param)
+{
+       RouteAutomationNode* ran = automation_track(param);
+       if (!ran)
+               return;
+
+       _show_automation.erase(param);
+       ran->track->get_state_node()->add_property (X_("shown"), X_("no"));
+
+       if (ran->menu_item && !_hidden) {
+               ran->menu_item->set_active (false);
+       }
+
+        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+}
+
+
 void
 RouteTimeAxisView::show_all_automation ()
 {
        no_redraw = true;
+       
+       /* Show our automation */
+
+       map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i;
+       for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+               i->second->track->set_marked_for_display (true);
+               i->second->track->canvas_display->show();
+               i->second->track->get_state_node()->add_property ("shown", X_("yes"));
+               i->second->menu_item->set_active(true);
+       }
 
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
-               for (vector<RedirectAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
+
+       /* Show processor automation */
+
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
+               for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
                        if ((*ii)->view == 0) {
-                               add_redirect_automation_curve ((*i)->redirect, (*ii)->what);
+                               add_processor_automation_curve ((*i)->processor, (*ii)->what);
                        } 
 
                        (*ii)->menu_item->set_active (true);
@@ -1220,6 +1559,9 @@ RouteTimeAxisView::show_all_automation ()
 
        no_redraw = false;
 
+
+       /* Redraw */
+
         _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
 }
 
@@ -1227,10 +1569,25 @@ void
 RouteTimeAxisView::show_existing_automation ()
 {
        no_redraw = true;
+       
+       /* Show our automation */
+
+       map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i;
+       for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
+               if (i->second->track->line() && i->second->track->line()->npoints() > 0) {
+                       i->second->track->set_marked_for_display (true);
+                       i->second->track->canvas_display->show();
+                       i->second->track->get_state_node()->add_property ("shown", X_("yes"));
+                       i->second->menu_item->set_active(true);
+               }
+       }
+
 
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
-               for (vector<RedirectAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
-                       if ((*ii)->view != 0) {
+       /* Show processor automation */
+
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
+               for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
+                       if ((*ii)->view != 0 && (*i)->processor->control((*ii)->what)->list()->size() > 0) {
                                (*ii)->menu_item->set_active (true);
                        }
                }
@@ -1246,12 +1603,14 @@ RouteTimeAxisView::hide_all_automation ()
 {
        no_redraw = true;
 
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
-               for (vector<RedirectAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
+               for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
                        (*ii)->menu_item->set_active (false);
                }
        }
 
+       _show_automation.clear();
+
        no_redraw = false;
         _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
 }
@@ -1260,54 +1619,50 @@ RouteTimeAxisView::hide_all_automation ()
 void
 RouteTimeAxisView::region_view_added (RegionView* rv)
 {
-       for (vector<TimeAxisView*>::iterator i = children.begin(); i != children.end(); ++i) {
-               AutomationTimeAxisView* atv;
+       for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+               boost::shared_ptr<AutomationTimeAxisView> atv;
 
-               if ((atv = dynamic_cast<AutomationTimeAxisView*> (*i)) != 0) {
-                       rv->add_ghost (*atv);
+               if ((atv = boost::dynamic_pointer_cast<AutomationTimeAxisView> (*i)) != 0) {
+                       rv->add_ghost (*atv.get());
                }
        }
 }
 
 void
-RouteTimeAxisView::add_ghost_to_redirect (RegionView* rv, AutomationTimeAxisView* atv)
+RouteTimeAxisView::add_ghost_to_processor (RegionView* rv, boost::shared_ptr<AutomationTimeAxisView> atv)
 {
-       rv->add_ghost (*atv);
+       rv->add_ghost (*atv.get());
 }
 
-RouteTimeAxisView::RedirectAutomationInfo::~RedirectAutomationInfo ()
+RouteTimeAxisView::ProcessorAutomationInfo::~ProcessorAutomationInfo ()
 {
-       for (vector<RedirectAutomationNode*>::iterator i = lines.begin(); i != lines.end(); ++i) {
+       for (vector<ProcessorAutomationNode*>::iterator i = lines.begin(); i != lines.end(); ++i) {
                delete *i;
        }
 }
 
 
-RouteTimeAxisView::RedirectAutomationNode::~RedirectAutomationNode ()
+RouteTimeAxisView::ProcessorAutomationNode::~ProcessorAutomationNode ()
 {
-       parent.remove_ran (this);
-
-       if (view) {
-               delete view;
-       }
+       parent.remove_processor_automation_node (this);
 }
 
 void
-RouteTimeAxisView::remove_ran (RedirectAutomationNode* ran)
+RouteTimeAxisView::remove_processor_automation_node (ProcessorAutomationNode* pan)
 {
-       if (ran->view) {
-               remove_child (ran->view);
+       if (pan->view) {
+               remove_child (pan->view);
        }
 }
 
-RouteTimeAxisView::RedirectAutomationNode*
-RouteTimeAxisView::find_redirect_automation_node (boost::shared_ptr<Redirect> redirect, uint32_t what)
+RouteTimeAxisView::ProcessorAutomationNode*
+RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr<Processor> processor, Parameter what)
 {
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
 
-               if ((*i)->redirect == redirect) {
+               if ((*i)->processor == processor) {
 
-                       for (vector<RedirectAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
+                       for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
                                if ((*ii)->what == what) {
                                        return *ii;
                                }
@@ -1318,7 +1673,6 @@ RouteTimeAxisView::find_redirect_automation_node (boost::shared_ptr<Redirect> re
        return 0;
 }
 
-// FIXME: duplicated in midi_time_axis.cc
 static string 
 legalize_for_xml_node (string str)
 {
@@ -1339,114 +1693,148 @@ legalize_for_xml_node (string str)
 
 
 void
-RouteTimeAxisView::add_redirect_automation_curve (boost::shared_ptr<Redirect> redirect, uint32_t what)
+RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> processor, Parameter what)
 {
-       RedirectAutomationLine* ral;
        string name;
-       RedirectAutomationNode* ran;
+       ProcessorAutomationNode* pan;
 
-       if ((ran = find_redirect_automation_node (redirect, what)) == 0) {
+       if ((pan = find_processor_automation_node (processor, what)) == 0) {
                fatal << _("programming error: ")
-                     << string_compose (X_("redirect automation curve for %1:%2 not registered with audio track!"),
-                                 redirect->name(), what)
+                     << string_compose (X_("processor automation curve for %1:%2 not registered with track!"),
+                                 processor->name(), what)
                      << endmsg;
                /*NOTREACHED*/
                return;
        }
 
-       if (ran->view) {
+       if (pan->view) {
                return;
        }
 
-       name = redirect->describe_parameter (what);
+       name = processor->describe_parameter (what);
 
        /* create a string that is a legal XML node name that can be used to refer to this redirect+port combination */
 
-       char state_name[256];
-       snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (redirect->name()).c_str(), what);
+       /* FIXME: ew */
 
-       ran->view = new RedirectAutomationTimeAxisView (_session, _route, editor, *this, parent_canvas, name, what, *redirect, state_name);
+       char state_name[256];
+       snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id());
 
-       ral = new RedirectAutomationLine (name, 
-                                         *redirect, what, _session, *ran->view,
-                                         *ran->view->canvas_display, redirect->automation_list (what));
-       
-       ral->set_line_color (color_map[cRedirectAutomationLine]);
-       ral->queue_reset ();
+       boost::shared_ptr<AutomationControl> control = processor->control(what, true);
 
-       ran->view->add_line (*ral);
+       pan->view = boost::shared_ptr<AutomationTimeAxisView>(
+                       new AutomationTimeAxisView (_session, _route, processor, control,
+                               editor, *this, parent_canvas, name, state_name));
 
-       ran->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::redirect_automation_track_hidden), ran, redirect));
+       pan->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor));
 
-       if (!ran->view->marked_for_display()) {
-               ran->view->hide ();
+       if (!pan->view->marked_for_display()) {
+               pan->view->hide ();
        } else {
-               ran->menu_item->set_active (true);
+               pan->menu_item->set_active (true);
        }
 
-       add_child (ran->view);
+       add_child (pan->view);
 
-       _view->foreach_regionview (bind (mem_fun(*this, &RouteTimeAxisView::add_ghost_to_redirect), ran->view));
+       if (_view) {
+               _view->foreach_regionview (bind (mem_fun(*this, &RouteTimeAxisView::add_ghost_to_processor), pan->view));
+       }
 
-       redirect->mark_automation_visible (what, true);
+       processor->mark_automation_visible (what, true);
 }
 
 void
-RouteTimeAxisView::redirect_automation_track_hidden (RouteTimeAxisView::RedirectAutomationNode* ran, boost::shared_ptr<Redirect> r)
+RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::ProcessorAutomationNode* pan, boost::shared_ptr<Processor> i)
 {
        if (!_hidden) {
-               ran->menu_item->set_active (false);
+               pan->menu_item->set_active (false);
        }
 
-       r->mark_automation_visible (ran->what, false);
+       i->mark_automation_visible (pan->what, false);
 
         _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
-RouteTimeAxisView::add_existing_redirect_automation_curves (boost::shared_ptr<Redirect> redirect)
+RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr<Processor> processor)
 {
-       set<uint32_t> s;
-       RedirectAutomationLine *ral;
+       set<Parameter> s;
+       boost::shared_ptr<AutomationLine> al;
 
-       redirect->what_has_visible_automation (s);
+       processor->what_has_visible_automation (s);
 
-       for (set<uint32_t>::iterator i = s.begin(); i != s.end(); ++i) {
+       for (set<Parameter>::iterator i = s.begin(); i != s.end(); ++i) {
                
-               if ((ral = find_redirect_automation_curve (redirect, *i)) != 0) {
-                       ral->queue_reset ();
+               if ((al = find_processor_automation_curve (processor, *i)) != 0) {
+                       al->queue_reset ();
                } else {
-                       add_redirect_automation_curve (redirect, (*i));
+                       add_processor_automation_curve (processor, (*i));
                }
        }
 }
 
 void
-RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r)
+RouteTimeAxisView::add_automation_child(Parameter param, boost::shared_ptr<AutomationTimeAxisView> track, bool show)
 {
        using namespace Menu_Helpers;
-       RedirectAutomationInfo *rai;
-       list<RedirectAutomationInfo*>::iterator x;
+
+       XMLProperty* prop;
+
+       add_child (track);
+
+       track->Hiding.connect (bind (mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param));
+
+       bool hideit = (!show);
        
-       const std::set<uint32_t>& automatable = r->what_can_be_automated ();
-       std::set<uint32_t> has_visible_automation;
+       XMLNode* node;
 
-       r->what_has_visible_automation(has_visible_automation);
+       if ((node = track->get_state_node()) != 0) {
+               if  ((prop = node->property ("shown")) != 0) {
+                       if (prop->value() == "yes") {
+                               hideit = false;
+                       }
+               } 
+       }
+       
+       _automation_tracks.insert(std::make_pair(param, new RouteAutomationNode(param, NULL, track)));
+
+       if (hideit) {
+               track->hide ();
+       } else {
+               _show_automation.insert(param);
+               _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+       }
+
+       build_display_menu();
+}
+
+
+void
+RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr<Processor> processor)
+{
+       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);
 
        if (automatable.empty()) {
                return;
        }
 
-       for (x = redirect_automation.begin(); x != redirect_automation.end(); ++x) {
-               if ((*x)->redirect == r) {
+       for (x = processor_automation.begin(); x != processor_automation.end(); ++x) {
+               if ((*x)->processor == processor) {
                        break;
                }
        }
 
-       if (x == redirect_automation.end()) {
+       if (x == processor_automation.end()) {
 
-               rai = new RedirectAutomationInfo (r);
-               redirect_automation.push_back (rai);
+               rai = new ProcessorAutomationInfo (processor);
+               processor_automation.push_back (rai);
 
        } else {
 
@@ -1454,7 +1842,7 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r
 
        }
 
-       /* any older menu was deleted at the top of redirects_changed()
+       /* any older menu was deleted at the top of processors_changed()
           when we cleared the subplugin menu.
        */
 
@@ -1464,12 +1852,12 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r
 
        items.clear ();
 
-       for (std::set<uint32_t>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
+       for (std::set<Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
 
-               RedirectAutomationNode* ran;
+               ProcessorAutomationNode* pan;
                CheckMenuItem* mitem;
                
-               string name = r->describe_parameter (*i);
+               string name = processor->describe_parameter (*i);
                
                items.push_back (CheckMenuElem (name));
                mitem = dynamic_cast<CheckMenuItem*> (&items.back());
@@ -1478,54 +1866,54 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r
                        mitem->set_active(true);
                }
 
-               if ((ran = find_redirect_automation_node (r, *i)) == 0) {
+               if ((pan = find_processor_automation_node (processor, *i)) == 0) {
 
                        /* new item */
                        
-                       ran = new RedirectAutomationNode (*i, mitem, *this);
+                       pan = new ProcessorAutomationNode (*i, mitem, *this);
                        
-                       rai->lines.push_back (ran);
+                       rai->lines.push_back (pan);
 
                } else {
 
-                       ran->menu_item = mitem;
+                       pan->menu_item = mitem;
 
                }
 
-               mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::redirect_menu_item_toggled), rai, ran));
+               mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan));
        }
 
-       /* add the menu for this redirect, because the subplugin
-          menu is always cleared at the top of redirects_changed().
+       /* add the menu for this processor, because the subplugin
+          menu is always cleared at the top of processors_changed().
           this is the result of some poor design in gtkmm and/or
           GTK+.
        */
 
-       subplugin_menu.items().push_back (MenuElem (r->name(), *rai->menu));
+       subplugin_menu.items().push_back (MenuElem (processor->name(), *rai->menu));
        rai->valid = true;
 }
 
 void
-RouteTimeAxisView::redirect_menu_item_toggled (RouteTimeAxisView::RedirectAutomationInfo* rai,
-                                              RouteTimeAxisView::RedirectAutomationNode* ran)
+RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAutomationInfo* rai,
+                                              RouteTimeAxisView::ProcessorAutomationNode* pan)
 {
-       bool showit = ran->menu_item->get_active();
+       bool showit = pan->menu_item->get_active();
        bool redraw = false;
 
-       if (ran->view == 0 && showit) {
-               add_redirect_automation_curve (rai->redirect, ran->what);
+       if (pan->view == 0 && showit) {
+               add_processor_automation_curve (rai->processor, pan->what);
                redraw = true;
        }
 
-       if (showit != ran->view->marked_for_display()) {
+       if (pan->view && showit != pan->view->marked_for_display()) {
 
                if (showit) {
-                       ran->view->set_marked_for_display (true);
-                       ran->view->canvas_display->show();
+                       pan->view->set_marked_for_display (true);
+                       pan->view->canvas_display->show();
                } else {
-                       rai->redirect->mark_automation_visible (ran->what, true);
-                       ran->view->set_marked_for_display (false);
-                       ran->view->hide ();
+                       rai->processor->mark_automation_visible (pan->what, true);
+                       pan->view->set_marked_for_display (false);
+                       pan->view->hide ();
                }
 
                redraw = true;
@@ -1542,22 +1930,22 @@ RouteTimeAxisView::redirect_menu_item_toggled (RouteTimeAxisView::RedirectAutoma
 }
 
 void
-RouteTimeAxisView::redirects_changed (void *src)
+RouteTimeAxisView::processors_changed ()
 {
        using namespace Menu_Helpers;
 
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ++i) {
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                (*i)->valid = false;
        }
 
        subplugin_menu.items().clear ();
 
-       _route->foreach_redirect (this, &RouteTimeAxisView::add_redirect_to_subplugin_menu);
-       _route->foreach_redirect (this, &RouteTimeAxisView::add_existing_redirect_automation_curves);
+       _route->foreach_processor (this, &RouteTimeAxisView::add_processor_to_subplugin_menu);
+       _route->foreach_processor (this, &RouteTimeAxisView::add_existing_processor_automation_curves);
 
-       for (list<RedirectAutomationInfo*>::iterator i = redirect_automation.begin(); i != redirect_automation.end(); ) {
+       for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ) {
 
-               list<RedirectAutomationInfo*>::iterator tmp;
+               list<ProcessorAutomationInfo*>::iterator tmp;
 
                tmp = i;
                ++tmp;
@@ -1565,7 +1953,7 @@ RouteTimeAxisView::redirects_changed (void *src)
                if (!(*i)->valid) {
 
                        delete *i;
-                       redirect_automation.erase (i);
+                       processor_automation.erase (i);
 
                } 
 
@@ -1577,25 +1965,32 @@ RouteTimeAxisView::redirects_changed (void *src)
        _route->gui_changed ("track_height", this);
 }
 
-RedirectAutomationLine *
-RouteTimeAxisView::find_redirect_automation_curve (boost::shared_ptr<Redirect> redirect, uint32_t what)
+boost::shared_ptr<AutomationLine>
+RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr<Processor> processor, Parameter what)
 {
-       RedirectAutomationNode* ran;
+       ProcessorAutomationNode* pan;
 
-       if ((ran = find_redirect_automation_node (redirect, what)) != 0) {
-               if (ran->view) {
-                       return dynamic_cast<RedirectAutomationLine*> (ran->view->lines.front());
+       if ((pan = find_processor_automation_node (processor, what)) != 0) {
+               if (pan->view) {
+                       pan->view->line();
                } 
        }
 
-       return 0;
+       return boost::shared_ptr<AutomationLine>();
 }
 
 void
-RouteTimeAxisView::reset_redirect_automation_curves ()
+RouteTimeAxisView::reset_processor_automation_curves ()
 {
-       for (vector<RedirectAutomationLine*>::iterator i = redirect_automation_curves.begin(); i != redirect_automation_curves.end(); ++i) {
+       for (ProcessorAutomationCurves::iterator i = processor_automation_curves.begin(); i != processor_automation_curves.end(); ++i) {
                (*i)->reset();
        }
 }
 
+void
+RouteTimeAxisView::update_rec_display ()
+{
+       RouteUI::update_rec_display ();
+       name_entry.set_sensitive (!_route->record_enabled());
+}
+