make that status-bar error change actually compile
[ardour.git] / gtk2_ardour / route_time_axis.cc
index 84f752dc8a4b547e643458144829a733dc4c9278..3127f712030e45b51b1ad74065c398da03d70800 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"
 
 using namespace ARDOUR;
 using namespace PBD;
+using namespace Gtkmm2ext;
 using namespace Gtk;
 using namespace Editing;
+using namespace std;
 
+Glib::RefPtr<Gdk::Pixbuf> RouteTimeAxisView::slider;
+
+void
+RouteTimeAxisView::setup_slider_pix ()
+{
+       if ((slider = ::get_icon ("fader_belt_h")) == 0) {
+               throw failed_constructor ();
+       }
+}
 
 RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr<Route> rt, Canvas& canvas)
        : AxisView(sess),
@@ -92,9 +104,13 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
          playlist_button (_("p")), 
          size_button (_("h")), // height
          automation_button (_("a")),
-         visual_button (_("v"))
-
+         visual_button (_("v")),
+         gm (sess, slider, true)
 {
+       gm.set_io (rt);
+       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;
@@ -102,11 +118,11 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        _view = 0;
        timestretch_rect = 0;
        no_redraw = false;
+       destructive_track_mode_item = 0;
+       normal_track_mode_item = 0;
 
        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");
@@ -114,6 +130,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 ();
 
@@ -124,10 +147,10 @@ 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_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_release_event().connect (mem_fun(*this, &RouteUI::mute_release));
+       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);
 
        if (is_track()) {
 
@@ -144,16 +167,24 @@ 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));
+               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"));
+
+               rec_enable_button->set_sensitive (_session.writable());
        }
 
+       controls_hbox.pack_start(gm.get_level_meter(), false, false);
+       _route->meter_change.connect (mem_fun(*this, &RouteTimeAxisView::meter_changed));
+       _route->input_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
+       _route->output_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed));
+
        controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-       controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::FILL|Gtk::EXPAND, 0, 0);
+       controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
 
-       controls_table.attach (edit_group_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       controls_table.attach (edit_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+       controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
 
        ARDOUR_UI::instance()->tooltips().set_tip(*solo_button,_("Solo"));
        ARDOUR_UI::instance()->tooltips().set_tip(*mute_button,_("Mute"));
@@ -166,26 +197,24 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        
        label_view ();
 
-       controls_table.attach (hide_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (visual_button, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (size_button, 2, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-       controls_table.attach (automation_button, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       if (0) {
+
+               /* old school - when we used to put an extra row of buttons in place */
+
+               controls_table.attach (hide_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (visual_button, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (size_button, 2, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               controls_table.attach (automation_button, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+
+       } else {
+
+               controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+       }
 
        if (is_track() && track()->mode() == ARDOUR::Normal) {
                controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
        }
 
-       /* remove focus from the buttons */
-       
-       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);
-
        y_position = -1;
 
        _route->redirects_changed.connect (mem_fun(*this, &RouteTimeAxisView::redirects_changed));
@@ -204,7 +233,10 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh
        }
 
        editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit));
-       ColorChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler));
+       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 ()
@@ -239,6 +271,7 @@ RouteTimeAxisView::post_construct ()
        /* map current state of the route */
 
        update_diskstream_display ();
+       subplugin_menu.items().clear ();
        _route->foreach_redirect (this, &RouteTimeAxisView::add_redirect_to_subplugin_menu);
        _route->foreach_redirect (this, &RouteTimeAxisView::add_existing_redirect_automation_curves);
        reset_redirect_automation_curves ();
@@ -262,7 +295,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,7 +340,6 @@ RouteTimeAxisView::set_edit_group_from_menu (RouteGroup *eg)
 
 void
 RouteTimeAxisView::playlist_changed ()
-
 {
        label_view ();
 
@@ -357,20 +389,17 @@ RouteTimeAxisView::playlist_click ()
        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 ();
+       if (!automation_action_menu)
+               build_automation_action_menu ();
        automation_action_menu->popup (1, gtk_get_current_event_time());
 }
 
@@ -418,14 +447,16 @@ RouteTimeAxisView::build_display_menu ()
 
        items.push_back (SeparatorElem());
 
-       build_remote_control_menu ();
-       items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
-
-       build_automation_action_menu ();
-       items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+       if (!Profile->get_sae()) {
+               build_remote_control_menu ();
+               items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+               /* rebuild this every time */
+               build_automation_action_menu ();
+               items.push_back (MenuElem (_("Automation"), *automation_action_menu));
+               items.push_back (SeparatorElem());
+       }
 
        // Hook for derived classes to add type specific stuff
-       items.push_back (SeparatorElem());
        append_extra_display_menu_items ();
        items.push_back (SeparatorElem());
        
@@ -449,42 +480,47 @@ 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));
-
-               RadioMenuItem::Group mode_group;
-               items.push_back (RadioMenuElem (mode_group, _("Normal mode"),
-                                               bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal)));
-               normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
-               items.push_back (RadioMenuElem (mode_group, _("Tape mode"),
-                                               bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive)));
-               destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
-                                
-               
-               switch (track()->mode()) {
-               case ARDOUR::Destructive:
-                       destructive_track_mode_item->set_active ();
-                       break;
-               case ARDOUR::Normal:
-                       normal_track_mode_item->set_active ();
-                       break;
+               if (!Profile->get_sae()) {
+                       items.push_back (MenuElem (_("Alignment"), *alignment_menu));
+                       get_diskstream()->AlignmentStyleChanged.connect (mem_fun(*this, &RouteTimeAxisView::align_style_changed));
+                       
+                       RadioMenuItem::Group mode_group;
+                       items.push_back (RadioMenuElem (mode_group, _("Normal mode"),
+                                                       bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal)));
+                       normal_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+                       items.push_back (RadioMenuElem (mode_group, _("Tape mode"),
+                                                       bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive)));
+                       destructive_track_mode_item = dynamic_cast<RadioMenuItem*>(&items.back());
+                       
+                       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());
                }
        }
 
-       items.push_back (SeparatorElem());
        items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active)));
        route_active_menu_item = dynamic_cast<CheckMenuItem *> (&items.back());
        route_active_menu_item->set_active (_route->active());
 
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
+       items.push_back (MenuElem (_("Hide"), mem_fun(*this, &RouteTimeAxisView::hide_click)));
+       if (!Profile->get_sae()) {
+               items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route)));
+       } else {
+               items.push_front (SeparatorElem());
+               items.push_front (MenuElem (_("Delete"), mem_fun(*this, &RouteUI::remove_this_route)));
+       }
 }
 
 static bool __reset_item (RadioMenuItem* item)
 {
-       cerr << "reset item to true\n";
        item->set_active ();
        return false;
 }
@@ -509,14 +545,14 @@ RouteTimeAxisView::set_track_mode (TrackMode mode)
                /*NOTREACHED*/
                return;
        }
-
-       if (item->get_active () && track()->mode() != mode) {
+       
+       if (item && other_item && item->get_active () && track()->mode() != mode) {
                _set_track_mode (track(), mode, other_item);
        }
 }
 
 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 +643,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 ();
@@ -616,7 +652,7 @@ RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end)
 
        x1 = start / editor.get_current_zoom();
        x2 = (end - 1) / editor.get_current_zoom();
-       y2 = height - 2;
+       y2 = current_height() - 2;
        
        timestretch_rect->property_x1() = x1;
        timestretch_rect->property_y1() = 1.0;
@@ -655,52 +691,30 @@ RouteTimeAxisView::show_selection (TimeSelection& ts)
 }
 
 void
-RouteTimeAxisView::set_height (TrackHeight h)
+RouteTimeAxisView::set_height (uint32_t h)
 {
-       bool height_changed = (height == 0) || (h != height_style);
+       int gmlen = h - 5;
+       bool height_changed = (height == 0) || (h != height);
+       gm.get_level_meter().setup_meters (gmlen);
 
        TimeAxisView::set_height (h);
 
        ensure_xml_node ();
 
        if (_view) {
-               _view->set_height ((double) height);
+               _view->set_height ((double) current_height());
        }
 
-       switch (height_style) {
-       case Largest:
-               xml_node->add_property ("track_height", "largest");
-               break;
-
-       case Large:
-               xml_node->add_property ("track_height", "large");
-               break;
-
-       case Larger:
-               xml_node->add_property ("track_height", "larger");
-               break;
-
-       case Normal:
-               xml_node->add_property ("track_height", "normal");
-               break;
-
-       case Smaller:
-               xml_node->add_property ("track_height", "smaller");
-               break;
-
-       case Small:
-               xml_node->add_property ("track_height", "small");
-               break;
-       }
+       char buf[32];
+       snprintf (buf, sizeof (buf), "%u", height);
+       xml_node->add_property ("height", buf);
 
-       switch (height_style) {
-       case Largest:
-       case Large:
-       case Larger:
-       case Normal:
+       if (height >= hNormal) {
+               reset_meter();
                show_name_entry ();
                hide_name_label ();
 
+               gm.get_gain_slider().show();
                mute_button->show();
                solo_button->show();
                if (rec_enable_button)
@@ -715,12 +729,14 @@ 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 (rec_enable_button)
@@ -735,12 +751,26 @@ RouteTimeAxisView::set_height (TrackHeight h)
                if (is_track() && track()->mode() == ARDOUR::Normal) {
                        playlist_button.hide ();
                }
-               break;
 
-       case Small:
+       } else {
+
+               hide_meter ();
+
+               /* 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)
@@ -753,7 +783,6 @@ RouteTimeAxisView::set_height (TrackHeight h)
                automation_button.hide ();
                playlist_button.hide ();
                name_label.set_text (_route->name());
-               break;
        }
 
        if (height_changed) {
@@ -867,8 +896,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;
        
@@ -881,10 +945,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.
@@ -916,7 +984,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;
        
@@ -929,10 +997,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) {
@@ -999,6 +1071,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)) {
@@ -1056,7 +1140,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);
        }
 
@@ -1165,6 +1249,19 @@ RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t d
        return boost::shared_ptr<Region> ();
 }
 
+nframes64_t 
+RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir)
+{
+       boost::shared_ptr<Diskstream> stream;
+       boost::shared_ptr<Playlist> playlist;
+
+       if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) {
+               return playlist->find_next_region_boundary (pos, dir);
+       }
+
+       return -1;
+}
+
 bool
 RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 {
@@ -1258,6 +1355,12 @@ RouteTimeAxisView::get_child_list()
 }
 
 
+struct PlaylistSorter {
+    bool operator() (boost::shared_ptr<Playlist> a, boost::shared_ptr<Playlist> b) const {
+        return a->sort_id() < b->sort_id();
+    }
+};
+
 void
 RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
 {
@@ -1271,33 +1374,32 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        menu->set_name ("ArdourContextMenu");
        playlist_items.clear();
 
-       if (playlist_menu) {
-               delete playlist_menu;
-       }
-
-       playlist_menu = new Menu;
-       playlist_menu->set_name ("ArdourContextMenu");
-
-       vector<boost::shared_ptr<Playlist> > playlists;
+       vector<boost::shared_ptr<Playlist> > playlists, playlists_ds;
        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) {
+       _session.get_playlists (playlists);
 
-               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))));
+    /* find the playlists for this diskstream */
+       for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+               if (((*i)->get_orig_diskstream_id() == ds->id()) || (ds->playlist()->id() == (*i)->id())) {
+            playlists_ds.push_back(*i);
+       }
+       }
+       
+       /* sort the playlists */
+       PlaylistSorter cmp;
+       sort(playlists_ds.begin(), playlists_ds.end(), cmp);
+       
+       /* add the playlists to the menu */
+       for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists_ds.begin(); i != playlists_ds.end(); ++i) {
+               playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name()));
+               RadioMenuItem *item = static_cast<RadioMenuItem*>(&playlist_items.back());
 
-                       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();
-                       
+               item->signal_toggled().connect(bind (mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr<Playlist> (*i)));
+               
+               if (ds->playlist()->id() == (*i)->id()) {
+                       item->set_active();
                }
        }
 
@@ -1305,20 +1407,31 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
        playlist_items.push_back (MenuElem (_("Rename"), mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
        playlist_items.push_back (SeparatorElem());
 
-       playlist_items.push_back (MenuElem (_("New"), mem_fun(editor, &PublicEditor::new_playlists)));
-       playlist_items.push_back (MenuElem (_("New Copy"), mem_fun(editor, &PublicEditor::copy_playlists)));
+       if (!edit_group() || !edit_group()->is_active()) {
+               playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
+               playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
+       } else {
+               // Use a label which tells the user what is happening
+               playlist_items.push_back (MenuElem (_("New Take"), bind(mem_fun(editor, &PublicEditor::new_playlists), this)));
+               playlist_items.push_back (MenuElem (_("Copy Take"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this)));
+       }
+
        playlist_items.push_back (SeparatorElem());
-       playlist_items.push_back (MenuElem (_("Clear Current"), mem_fun(editor, &PublicEditor::clear_playlists)));
+       playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(editor, &PublicEditor::clear_playlists), this)));
        playlist_items.push_back (SeparatorElem());
-
        playlist_items.push_back (MenuElem(_("Select from all ..."), mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
 }
 
 void
-RouteTimeAxisView::use_playlist (boost::weak_ptr<Playlist> wpl)
+RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist> wpl)
 {
        assert (is_track());
 
+       // exit if we were triggered by deactivating the old playlist
+       if (!item->get_active()) {
+               return;
+       }
+       
        boost::shared_ptr<Playlist> pl (wpl.lock());
 
        if (!pl) {
@@ -1328,7 +1441,50 @@ 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) {
+                       // exit when use_playlist is called by the creation of the playlist menu
+                       // or the playlist choice is unchanged
+                       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) {
+                                       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
+                       }
+               }
        }
 }
 
@@ -1360,18 +1516,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
@@ -1391,7 +1546,7 @@ RouteTimeAxisView::show_all_automation ()
 
        no_redraw = false;
 
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
@@ -1408,8 +1563,8 @@ RouteTimeAxisView::show_existing_automation ()
        }
 
        no_redraw = false;
-
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+       
+       _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
@@ -1424,7 +1579,7 @@ RouteTimeAxisView::hide_all_automation ()
        }
 
        no_redraw = false;
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 
@@ -1494,7 +1649,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;
@@ -1542,7 +1697,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);
@@ -1573,7 +1728,7 @@ RouteTimeAxisView::redirect_automation_track_hidden (RouteTimeAxisView::Redirect
 
        r->mark_automation_visible (ran->what, false);
 
-        _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+        _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 }
 
 void
@@ -1600,7 +1755,7 @@ RouteTimeAxisView::add_redirect_to_subplugin_menu (boost::shared_ptr<Redirect> r
        using namespace Menu_Helpers;
        RedirectAutomationInfo *rai;
        list<RedirectAutomationInfo*>::iterator x;
-       
+
        const std::set<uint32_t>& automatable = r->what_can_be_automated ();
        std::set<uint32_t> has_visible_automation;
 
@@ -1693,9 +1848,12 @@ RouteTimeAxisView::redirect_menu_item_toggled (RouteTimeAxisView::RedirectAutoma
        if (showit != ran->view->marked_for_display()) {
 
                if (showit) {
+                       ran->menu_item->set_active(true);
                        ran->view->set_marked_for_display (true);
                        ran->view->canvas_display->show();
+                       ran->view->canvas_background->show();
                } else {
+                       ran->menu_item->set_active(false);
                        rai->redirect->mark_automation_visible (ran->what, true);
                        ran->view->set_marked_for_display (false);
                        ran->view->hide ();
@@ -1709,7 +1867,7 @@ RouteTimeAxisView::redirect_menu_item_toggled (RouteTimeAxisView::RedirectAutoma
 
                /* now trigger a redisplay */
                
-                _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */
+                _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */
 
        }
 }
@@ -1736,7 +1894,7 @@ RouteTimeAxisView::redirects_changed (void *src)
                ++tmp;
 
                if (!(*i)->valid) {
-
+                       
                        delete *i;
                        redirect_automation.erase (i);
 
@@ -1747,7 +1905,7 @@ RouteTimeAxisView::redirects_changed (void *src)
 
        /* change in visibility was possible */
 
-       _route->gui_changed ("track_height", this);
+       _route->gui_changed ("visible_tracks", this);
 }
 
 RedirectAutomationLine *
@@ -1772,3 +1930,58 @@ 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 ()
+{
+       gm.get_level_meter().update_meters ();
+}
+
+void
+RouteTimeAxisView::hide_meter ()
+{
+       clear_meter ();
+       gm.get_level_meter().hide_meters ();
+}
+
+void
+RouteTimeAxisView::show_meter ()
+{
+       reset_meter ();
+}
+
+void
+RouteTimeAxisView::reset_meter ()
+{
+       if (Config->get_show_track_meters()) {
+               gm.get_level_meter().setup_meters (height-5);
+       } else {
+               hide_meter ();
+       }
+}
+
+void
+RouteTimeAxisView::clear_meter ()
+{
+       gm.get_level_meter().clear_meters ();
+}
+
+void
+RouteTimeAxisView::meter_changed (void *src)
+{
+       ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src));
+       reset_meter();
+}
+
+void
+RouteTimeAxisView::io_changed (IOChange change, void *src)
+{
+       reset_meter ();
+}
+