Make level meter colors user definable. Base, Mid, Top, and Clip colors are defined...
[ardour.git] / gtk2_ardour / route_time_axis.cc
index 371f055c46ab13e76827a76743b96f16833032a4..ba3b3c19f09f273eab08983cc3cae9c28ca007da 100644 (file)
@@ -50,6 +50,7 @@
 #include <ardour/session.h>
 #include <ardour/session_playlist.h>
 #include <ardour/utils.h>
+#include <ardour/profile.h>
 
 #include "ardour_ui.h"
 #include "route_time_axis.h"
@@ -92,9 +93,12 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
          playlist_button (_("p")), 
          size_button (_("h")), // height
          automation_button (_("a")),
-         visual_button (_("v"))
+         visual_button (_("v")),
+         lm (rt, sess)
 
 {
+       lm.set_no_show_all();
+       lm.setup_meters(50);
        _has_state = true;
        playlist_menu = 0;
        playlist_action_menu = 0;
@@ -105,8 +109,6 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
 
        ignore_toggle = 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");
@@ -124,9 +126,9 @@ 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));
+       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));
+       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()) {
@@ -144,14 +146,20 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
                }
                rec_enable_button->show_all ();
 
-               rec_enable_button->set_name ("TrackRecordEnableButton");
-               rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press));
-               controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+               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);
                ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record"));
+
        }
 
-       controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-       controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::FILL|Gtk::EXPAND, 0, 0);
+       controls_hbox.pack_start(lm, false, false);
+       _route->meter_change.connect (mem_fun(*this, &RouteTimeAxisView::meter_changed));
+       _route->input_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
+       _route->output_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
+
+       controls_table.attach (*mute_button, 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 (edit_group_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
 
@@ -177,20 +185,6 @@ 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 ();
-       redirects_changed (0);
-       reset_redirect_automation_curves ();
        y_position = -1;
 
        _route->redirects_changed.connect (mem_fun(*this, &RouteTimeAxisView::redirects_changed));
@@ -203,19 +197,13 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
                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 ()
@@ -245,9 +233,20 @@ RouteTimeAxisView::~RouteTimeAxisView ()
 }
 
 void
-RouteTimeAxisView::set_playlist (Playlist *newplaylist)
+RouteTimeAxisView::post_construct ()
 {
-       Playlist *pl = playlist();
+       /* map current state of the route */
+
+       update_diskstream_display ();
+       _route->foreach_redirect (this, &RouteTimeAxisView::add_redirect_to_subplugin_menu);
+       _route->foreach_redirect (this, &RouteTimeAxisView::add_existing_redirect_automation_curves);
+       reset_redirect_automation_curves ();
+}
+
+void
+RouteTimeAxisView::set_playlist (boost::shared_ptr<Playlist> newplaylist)
+{
+       boost::shared_ptr<Playlist> pl = playlist();
        assert(pl);
 
        modified_connection.disconnect ();
@@ -262,7 +261,7 @@ RouteTimeAxisView::playlist_modified ()
 gint
 RouteTimeAxisView::edit_click (GdkEventButton *ev)
 {
-       if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
+       if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
                _route->set_edit_group (0, this);
                return FALSE;
        } 
@@ -307,12 +306,11 @@ RouteTimeAxisView::set_edit_group_from_menu (RouteGroup *eg)
 
 void
 RouteTimeAxisView::playlist_changed ()
-
 {
        label_view ();
 
        if (is_track()) {
-               set_playlist (dynamic_cast<Playlist*>(get_diskstream()->playlist()));
+               set_playlist (get_diskstream()->playlist());
        }
 }
 
@@ -419,7 +417,9 @@ RouteTimeAxisView::build_display_menu ()
        items.push_back (SeparatorElem());
 
        build_remote_control_menu ();
-       items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+       if (!Profile->get_sae()) {
+               items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+       }
 
        build_automation_action_menu ();
        items.push_back (MenuElem (_("Automation"), *automation_action_menu));
@@ -449,10 +449,10 @@ RouteTimeAxisView::build_display_menu ()
                if (get_diskstream()->alignment_style() == CaptureTime)
                        align_capture_item->set_active();
                
-               items.push_back (MenuElem (_("Alignment"), *alignment_menu));
-
-               get_diskstream()->AlignmentStyleChanged.connect (
-                       mem_fun(*this, &RouteTimeAxisView::align_style_changed));
+               if (!Profile->get_sae()) {
+                       items.push_back (MenuElem (_("Alignment"), *alignment_menu));
+                       get_diskstream()->AlignmentStyleChanged.connect (mem_fun(*this, &RouteTimeAxisView::align_style_changed));
+               }
 
                RadioMenuItem::Group mode_group;
                items.push_back (RadioMenuElem (mode_group, _("Normal mode"),
@@ -484,7 +484,6 @@ RouteTimeAxisView::build_display_menu ()
 
 static bool __reset_item (RadioMenuItem* item)
 {
-       cerr << "reset item to true\n";
        item->set_active ();
        return false;
 }
@@ -516,7 +515,7 @@ RouteTimeAxisView::set_track_mode (TrackMode mode)
 }
 
 void
-RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* reset_item)
+RouteTimeAxisView::_set_track_mode (boost::shared_ptr<Track> track, TrackMode mode, RadioMenuItem* reset_item)
 {
        bool needs_bounce;
 
@@ -607,8 +606,8 @@ RouteTimeAxisView::show_timestretch (nframes_t start, 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 ();
@@ -657,13 +656,16 @@ RouteTimeAxisView::show_selection (TimeSelection& ts)
 void
 RouteTimeAxisView::set_height (TrackHeight h)
 {
+       int gmlen = (height_to_pixels (h)) - 5;
        bool height_changed = (height == 0) || (h != height_style);
-
+       lm.setup_meters (gmlen);
        TimeAxisView::set_height (h);
 
        ensure_xml_node ();
 
-       _view->set_height ((double) height);
+       if (_view) {
+               _view->set_height ((double) height);
+       }
 
        switch (height_style) {
        case Largest:
@@ -696,6 +698,7 @@ RouteTimeAxisView::set_height (TrackHeight h)
        case Large:
        case Larger:
        case Normal:
+               reset_meter();
                show_name_entry ();
                hide_name_label ();
 
@@ -716,6 +719,7 @@ RouteTimeAxisView::set_height (TrackHeight h)
                break;
 
        case Smaller:
+               reset_meter();
                show_name_entry ();
                hide_name_label ();
 
@@ -736,6 +740,7 @@ RouteTimeAxisView::set_height (TrackHeight h)
                break;
 
        case Small:
+               hide_meter ();
                hide_name_entry ();
                show_name_label ();
 
@@ -843,7 +848,7 @@ RouteTimeAxisView::rename_current_playlist ()
        if (!ds || ds->destructive())
                return;
 
-       Playlist *const pl = ds->playlist();
+       boost::shared_ptr<Playlist> pl = ds->playlist();
        if (!pl)
                return;
 
@@ -874,7 +879,7 @@ RouteTimeAxisView::use_copy_playlist (bool prompt)
        if (!ds || ds->destructive())
                return;
 
-       Playlist *const pl = ds->playlist();
+       boost::shared_ptr<const Playlist> pl = ds->playlist();
        if (!pl)
                return;
 
@@ -922,7 +927,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt)
        if (!ds || ds->destructive())
                return;
 
-       Playlist *const pl = ds->playlist();
+       boost::shared_ptr<const Playlist> pl = ds->playlist();
        if (!pl)
                return;
 
@@ -965,11 +970,11 @@ RouteTimeAxisView::clear_playlist ()
        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
@@ -997,6 +1002,18 @@ RouteTimeAxisView::update_diskstream_display ()
 void
 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 ();
+               } else {
+                       editor.select_all_tracks ();
+               }
+
+               return;
+       } 
+
        PublicEditor::TrackViewList* tracks = editor.get_valid_views (this, _route->edit_group());
 
        switch (Keyboard::selection_type (ev->state)) {
@@ -1009,7 +1026,13 @@ 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:
@@ -1031,7 +1054,9 @@ 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);
+       }
 }
 
 void
@@ -1087,7 +1112,7 @@ RouteTimeAxisView::name() const
        return _route->name();
 }
 
-Playlist *
+boost::shared_ptr<Playlist>
 RouteTimeAxisView::playlist () const 
 {
        boost::shared_ptr<Diskstream> ds;
@@ -1095,7 +1120,7 @@ RouteTimeAxisView::playlist () const
        if ((ds = get_diskstream()) != 0) {
                return ds->playlist(); 
        } else {
-               return 0; 
+               return boost::shared_ptr<Playlist> ();
        }
 }
 
@@ -1146,7 +1171,7 @@ boost::shared_ptr<Region>
 RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir)
 {
        boost::shared_ptr<Diskstream> stream;
-       Playlist *playlist;
+       boost::shared_ptr<Playlist> playlist;
 
        if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) {
                return playlist->find_next_region (pos, point, dir);
@@ -1155,12 +1180,25 @@ RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t d
        return boost::shared_ptr<Region> ();
 }
 
+nframes64_t 
+RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
+{
+       boost::shared_ptr<Diskstream> stream;
+       boost::shared_ptr<Playlist> playlist;
+
+       if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) {
+               return playlist->find_next_region_boundary (pos, dir);
+       }
+
+       return -1;
+}
+
 bool
 RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
-       Playlist* what_we_got;
+       boost::shared_ptr<Playlist> what_we_got;
        boost::shared_ptr<Diskstream> ds = get_diskstream();
-       Playlist* playlist;
+       boost::shared_ptr<Playlist> playlist;
        bool ret = false;
 
        if (ds == 0) {
@@ -1170,7 +1208,6 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 
        playlist = ds->playlist();
 
-
        TimeSelection time (selection.time);
        float speed = ds->speed();
        if (speed != 1.0f) {
@@ -1185,7 +1222,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;
@@ -1198,7 +1235,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;
@@ -1214,7 +1251,7 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
                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);
@@ -1227,7 +1264,7 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
                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;
@@ -1269,49 +1306,55 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        playlist_menu = new Menu;
        playlist_menu->set_name ("ArdourContextMenu");
 
-       vector<Playlist*> playlists;
+       vector<boost::shared_ptr<Playlist> > playlists;
        boost::shared_ptr<Diskstream> ds = get_diskstream();
        RadioMenuItem::Group playlist_group;
 
        _session.get_playlists (playlists);
        
-       for (vector<Playlist*>::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+       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), (*i))));
+                       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), (*i))));
+                       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());
 
-       playlist_items.push_back (MenuElem (_("New"), mem_fun(editor, &PublicEditor::new_playlists)));
-       playlist_items.push_back (MenuElem (_("New Copy"), mem_fun(editor, &PublicEditor::copy_playlists)));
+       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)));
        playlist_items.push_back (SeparatorElem());
-       playlist_items.push_back (MenuElem (_("Clear Current"), mem_fun(editor, &PublicEditor::clear_playlists)));
+       playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(editor, &PublicEditor::clear_playlists), this)));
        playlist_items.push_back (SeparatorElem());
 
        playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
 }
 
 void
-RouteTimeAxisView::use_playlist (Playlist* pl)
+RouteTimeAxisView::use_playlist (boost::weak_ptr<Playlist> wpl)
 {
-       AudioPlaylist* apl = dynamic_cast<AudioPlaylist*> (pl);
-       
        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);
        }
@@ -1345,18 +1388,17 @@ 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;
+       if (timestretch_rect) {
+               timestretch_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchOutline.get();
+       }
+
+       if (timestretch_rect) {
+               timestretch_rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeStretchFill.get();
        }
+
+       reset_meter();
 }
 
 void
@@ -1479,7 +1521,7 @@ static string
 legalize_for_xml_node (string str)
 {
        string::size_type pos;
-       string legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_+=:";
+       string legal_chars = "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_=:";
        string legal;
 
        legal = str;
@@ -1527,7 +1569,7 @@ RouteTimeAxisView::add_redirect_automation_curve (boost::shared_ptr<Redirect> re
                                          *redirect, what, _session, *ran->view,
                                          *ran->view->canvas_display, redirect->automation_list (what));
        
-       ral->set_line_color (color_map[cRedirectAutomationLine]);
+       ral->set_line_color (ARDOUR_UI::config()->canvasvar_RedirectAutomationLine.get());
        ral->queue_reset ();
 
        ran->view->add_line (*ral);
@@ -1542,7 +1584,9 @@ RouteTimeAxisView::add_redirect_automation_curve (boost::shared_ptr<Redirect> re
 
        add_child (ran->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_redirect), ran->view));
+       }
 
        redirect->mark_automation_visible (what, true);
 }
@@ -1755,3 +1799,57 @@ RouteTimeAxisView::reset_redirect_automation_curves ()
        }
 }
 
+void
+RouteTimeAxisView::update_rec_display ()
+{
+       RouteUI::update_rec_display ();
+       name_entry.set_sensitive (!_route->record_enabled());
+}
+
+void
+RouteTimeAxisView::fast_update ()
+{
+       lm.update_meters ();
+}
+
+void
+RouteTimeAxisView::hide_meter ()
+{
+       clear_meter ();
+       lm.hide_meters ();
+}
+
+void
+RouteTimeAxisView::show_meter ()
+{
+       reset_meter ();
+}
+
+void
+RouteTimeAxisView::reset_meter ()
+{
+       if (Config->get_show_track_meters()) {
+               lm.setup_meters (height-5);
+       } else {
+               hide_meter ();
+       }
+}
+
+void
+RouteTimeAxisView::clear_meter ()
+{
+       lm.clear_meters ();
+}
+
+void
+RouteTimeAxisView::meter_changed (void *src)
+{
+       ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src));
+       reset_meter();
+}
+
+void
+RouteTimeAxisView::io_changed (IOChange change, void *src)
+{
+       reset_meter ();
+}