Show cursor in Cut mode on button press at cutting position
[ardour.git] / gtk2_ardour / route_time_axis.cc
index 41d7905bf179bbdd2c17fa66b6069c107a1bf0f2..21ff5f8063f0fdfb72d90dd6bec74f8673085bde 100644 (file)
@@ -83,7 +83,7 @@
 
 #include "ardour/track.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -95,8 +95,7 @@ using namespace std;
 using std::list;
 
 RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
-       : AxisView(sess)
-       , RouteUI(sess)
+       : RouteUI(sess)
        , TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas)
        , _view (0)
        , parent_canvas (canvas)
@@ -124,6 +123,17 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
        number_label.set_fallthrough_to_parent (true);
 
        sess->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::parameter_changed, this, _1), gui_context());
+       UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::parameter_changed));
+
+       parameter_changed ("editor-stereo-only-meters");
+}
+
+void
+RouteTimeAxisView::route_property_changed (const PBD::PropertyChange& what_changed)
+{
+       if (what_changed.contains (ARDOUR::Properties::name)) {
+               label_view ();
+       }
 }
 
 void
@@ -139,7 +149,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
                meter_width = 6;
        }
-       gm.set_controls (_route, _route->shared_peak_meter(), _route->amp());
+       gm.set_controls (_route, _route->shared_peak_meter(), _route->amp(), _route->gain_control());
        gm.get_level_meter().set_no_show_all();
        gm.get_level_meter().setup_meters(50, meter_width);
        gm.update_gain_sensitive ();
@@ -168,9 +178,9 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        playlist_button.set_name ("route button");
        automation_button.set_name ("route button");
 
-       route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false);
-       playlist_button.signal_clicked.connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click));
-       automation_button.signal_clicked.connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click));
+       route_group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false);
+       playlist_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click), false);
+       automation_button.signal_button_press_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click), false);
 
        if (is_track()) {
 
@@ -188,8 +198,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                        gm.set_fader_name ("AudioTrackFader");
                 }
 
-               rec_enable_button->set_sensitive (_session->writable());
-
                /* set playlist button tip to the current playlist, and make it update when it changes */
                update_playlist_tip ();
                track()->PlaylistChanged.connect (*this, invalidator (*this), ui_bind(&RouteTimeAxisView::update_playlist_tip, this), gui_context());
@@ -291,7 +299,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        _y_position = -1;
 
        _route->processors_changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::processors_changed, this, _1), gui_context());
-       _route->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::route_property_changed, this, _1), gui_context());
 
        if (is_track()) {
 
@@ -313,8 +320,8 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        PropertyList* plist = new PropertyList();
 
-       plist->add (ARDOUR::Properties::mute, true);
-       plist->add (ARDOUR::Properties::solo, true);
+       plist->add (ARDOUR::Properties::group_mute, true);
+       plist->add (ARDOUR::Properties::group_solo, true);
 
        route_group_menu = new RouteGroupMenu (_session, plist);
 
@@ -341,6 +348,15 @@ RouteTimeAxisView::~RouteTimeAxisView ()
        CatchDeletion (this);
 }
 
+string
+RouteTimeAxisView::name() const
+{
+       if (_route) {
+               return _route->name();
+       }
+       return string();
+}
+
 void
 RouteTimeAxisView::post_construct ()
 {
@@ -363,7 +379,7 @@ RouteTimeAxisView::setup_processor_menu_and_curves ()
        _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves));
 }
 
-gint
+bool
 RouteTimeAxisView::route_group_click (GdkEventButton *ev)
 {
        if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
@@ -377,9 +393,15 @@ RouteTimeAxisView::route_group_click (GdkEventButton *ev)
        r.push_back (route ());
 
        route_group_menu->build (r);
-       route_group_menu->menu()->popup (ev->button, ev->time);
+       if (ev->button == 1) {
+               Gtkmm2ext::anchored_menu_popup(route_group_menu->menu(),
+                                              &route_group_button,
+                                              "", 1, ev->time);
+       } else {
+               route_group_menu->menu()->popup (ev->button, ev->time);
+       }
 
-       return false;
+       return true;
 }
 
 void
@@ -429,10 +451,8 @@ RouteTimeAxisView::update_track_number_visibility ()
                if (tnw & 1) --tnw;
                number_label.set_size_request(tnw, -1);
                number_label.show ();
-               name_hbox.set_size_request(TimeAxisView::name_width_px - 2 - tnw, -1); // -2 = cellspacing
        } else {
                number_label.hide ();
-               name_hbox.set_size_request(TimeAxisView::name_width_px, -1);
        }
 }
 
@@ -441,14 +461,12 @@ RouteTimeAxisView::parameter_changed (string const & p)
 {
        if (p == "track-name-number") {
                update_track_number_visibility();
-       }
-}
-
-void
-RouteTimeAxisView::route_property_changed (const PropertyChange& what_changed)
-{
-       if (what_changed.contains (ARDOUR::Properties::name)) {
-               label_view ();
+       } else if (p == "editor-stereo-only-meters") {
+               if (UIConfiguration::instance().get_editor_stereo_only_meters()) {
+                       gm.get_level_meter().set_max_audio_meter_count (2);
+               } else {
+                       gm.get_level_meter().set_max_audio_meter_count (0);
+               }
        }
 }
 
@@ -460,20 +478,32 @@ RouteTimeAxisView::take_name_changed (void *src)
        }
 }
 
-void
-RouteTimeAxisView::playlist_click ()
+bool
+RouteTimeAxisView::playlist_click (GdkEventButton *ev)
 {
-       build_playlist_menu ();
+       if (ev->button != 1) {
+               return true;
+       }
+
+       build_playlist_menu ();
        conditionally_add_to_selection ();
-       playlist_action_menu->popup (1, gtk_get_current_event_time());
+       Gtkmm2ext::anchored_menu_popup(playlist_action_menu, &playlist_button,
+                                      "", 1, ev->time);
+       return true;
 }
 
-void
-RouteTimeAxisView::automation_click ()
+bool
+RouteTimeAxisView::automation_click (GdkEventButton *ev)
 {
+       if (ev->button != 1) {
+               return true;
+       }
+
        conditionally_add_to_selection ();
        build_automation_action_menu (false);
-       automation_action_menu->popup (1, gtk_get_current_event_time());
+       Gtkmm2ext::anchored_menu_popup(automation_action_menu, &automation_button,
+                                      "", 1, ev->time);
+       return true;
 }
 
 void
@@ -585,15 +615,8 @@ RouteTimeAxisView::build_display_menu ()
        }
        build_size_menu ();
        items.push_back (MenuElem (_("Height"), *_size_menu));
-
        items.push_back (SeparatorElem());
 
-       if (!Profile->get_sae()) {
-               items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
-               items.back().set_sensitive (_editor.get_selection().tracks.size() <= 1);
-               items.push_back (SeparatorElem());
-       }
-
        // Hook for derived classes to add type specific stuff
        append_extra_display_menu_items ();
 
@@ -651,159 +674,152 @@ RouteTimeAxisView::build_display_menu ()
 
                items.push_back (MenuElem (_("Layers"), *layers_menu));
 
-               if (!Profile->get_sae()) {
-
-                       Menu* alignment_menu = manage (new Menu);
-                       MenuList& alignment_items = alignment_menu->items();
-                       alignment_menu->set_name ("ArdourContextMenu");
+               Menu* alignment_menu = manage (new Menu);
+               MenuList& alignment_items = alignment_menu->items();
+               alignment_menu->set_name ("ArdourContextMenu");
 
-                       RadioMenuItem::Group align_group;
+               RadioMenuItem::Group align_group;
 
-                       /* Same verbose hacks as for the layering options above */
+               /* Same verbose hacks as for the layering options above */
 
-                       int existing = 0;
-                       int capture = 0;
-                        int automatic = 0;
-                        int styles = 0;
-                        boost::shared_ptr<Track> first_track;
+               int existing = 0;
+               int capture = 0;
+               int automatic = 0;
+               int styles = 0;
+               boost::shared_ptr<Track> first_track;
 
-                       TrackSelection const & s = _editor.get_selection().tracks;
-                       for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
-                               RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*i);
-                               if (!r || !r->is_track ()) {
-                                       continue;
-                               }
+               for (TrackSelection::const_iterator t = s.begin(); t != s.end(); ++t) {
+                       RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*t);
+                       if (!r || !r->is_track ()) {
+                               continue;
+                       }
 
-                                if (!first_track) {
-                                        first_track = r->track();
-                                }
-
-                                switch (r->track()->alignment_choice()) {
-                                case Automatic:
-                                        ++automatic;
-                                        styles |= 0x1;
-                                        switch (r->track()->alignment_style()) {
-                                        case ExistingMaterial:
-                                                ++existing;
-                                                break;
-                                        case CaptureTime:
-                                                ++capture;
-                                                break;
-                                        }
-                                        break;
-                                case UseExistingMaterial:
-                                        ++existing;
-                                        styles |= 0x2;
-                                        break;
-                                case UseCaptureTime:
-                                        ++capture;
-                                        styles |= 0x4;
-                                        break;
-                                }
+                       if (!first_track) {
+                               first_track = r->track();
                        }
 
-                        bool inconsistent;
-                        switch (styles) {
-                        case 1:
-                        case 2:
-                        case 4:
-                                inconsistent = false;
-                                break;
-                        default:
-                                inconsistent = true;
-                                break;
-                        }
-
-                        RadioMenuItem* i;
-
-                        if (!inconsistent && first_track) {
-
-                                alignment_items.push_back (RadioMenuElem (align_group, _("Automatic (based on I/O connections)")));
-                                i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
-                                i->set_active (automatic != 0 && existing == 0 && capture == 0);
-                                i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, Automatic, true));
-
-                                switch (first_track->alignment_choice()) {
-                                case Automatic:
-                                        switch (first_track->alignment_style()) {
-                                        case ExistingMaterial:
-                                                alignment_items.push_back (MenuElem (_("(Currently: Existing Material)")));
-                                                break;
-                                        case CaptureTime:
-                                                alignment_items.push_back (MenuElem (_("(Currently: Capture Time)")));
-                                                break;
-                                        }
-                                        break;
-                                default:
-                                        break;
-                                }
-
-                                alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material")));
-                                i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
-                                i->set_active (existing != 0 && capture == 0 && automatic == 0);
-                                i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseExistingMaterial, true));
-
-                                alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time")));
-                                i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
-                                i->set_active (existing == 0 && capture != 0 && automatic == 0);
-                                i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseCaptureTime, true));
-
-                                items.push_back (MenuElem (_("Alignment"), *alignment_menu));
-
-                        } else {
-                                /* show nothing */
-                        }
-
-                       Menu* mode_menu = manage (new Menu);
-                       MenuList& mode_items = mode_menu->items ();
-                       mode_menu->set_name ("ArdourContextMenu");
-
-                       RadioMenuItem::Group mode_group;
-
-                       int normal = 0;
-                       int tape = 0;
-                       int non_layered = 0;
-
-                       for (TrackSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
-                               RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*i);
-                               if (!r || !r->is_track ()) {
-                                       continue;
+                       switch (r->track()->alignment_choice()) {
+                       case Automatic:
+                               ++automatic;
+                               styles |= 0x1;
+                               switch (r->track()->alignment_style()) {
+                               case ExistingMaterial:
+                                       ++existing;
+                                       break;
+                               case CaptureTime:
+                                       ++capture;
+                                       break;
                                }
+                               break;
+                       case UseExistingMaterial:
+                               ++existing;
+                               styles |= 0x2;
+                               break;
+                       case UseCaptureTime:
+                               ++capture;
+                               styles |= 0x4;
+                               break;
+                       }
+               }
 
-                               switch (r->track()->mode()) {
-                               case Normal:
-                                       ++normal;
-                                       break;
-                               case Destructive:
-                                       ++tape;
+               bool inconsistent;
+               switch (styles) {
+               case 1:
+               case 2:
+               case 4:
+                       inconsistent = false;
+                       break;
+               default:
+                       inconsistent = true;
+                       break;
+               }
+
+               if (!inconsistent && first_track) {
+
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Automatic (based on I/O connections)")));
+                       i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
+                       i->set_active (automatic != 0 && existing == 0 && capture == 0);
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, Automatic, true));
+
+                       switch (first_track->alignment_choice()) {
+                       case Automatic:
+                               switch (first_track->alignment_style()) {
+                               case ExistingMaterial:
+                                       alignment_items.push_back (MenuElem (_("(Currently: Existing Material)")));
                                        break;
-                               case NonLayered:
-                                       ++non_layered;
+                               case CaptureTime:
+                                       alignment_items.push_back (MenuElem (_("(Currently: Capture Time)")));
                                        break;
                                }
+                               break;
+                       default:
+                               break;
                        }
 
-                       mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode")));
-                       i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
-                       i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal, true));
-                       i->set_active (normal != 0 && tape == 0 && non_layered == 0);
-                       i->set_inconsistent (normal != 0 && (tape != 0 || non_layered != 0));
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material")));
+                       i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
+                       i->set_active (existing != 0 && capture == 0 && automatic == 0);
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseExistingMaterial, true));
+
+                       alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time")));
+                       i = dynamic_cast<RadioMenuItem*> (&alignment_items.back());
+                       i->set_active (existing == 0 && capture != 0 && automatic == 0);
+                       i->signal_activate().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_choice), i, UseCaptureTime, true));
+
+                       items.push_back (MenuElem (_("Alignment"), *alignment_menu));
+
+               } else {
+                       /* show nothing */
+               }
+
+               Menu* mode_menu = manage (new Menu);
+               MenuList& mode_items = mode_menu->items ();
+               mode_menu->set_name ("ArdourContextMenu");
+
+               RadioMenuItem::Group mode_group;
 
-                       mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode")));
-                       i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
-                       i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive, true));
-                       i->set_active (normal == 0 && tape != 0 && non_layered == 0);
-                       i->set_inconsistent (tape != 0 && (normal != 0 || non_layered != 0));
+               int normal = 0;
+               int tape = 0;
+               int non_layered = 0;
 
-                       mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode")));
-                       i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
-                       i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered, true));
-                       i->set_active (normal == 0 && tape == 0 && non_layered != 0);
-                       i->set_inconsistent (non_layered != 0 && (normal != 0 || tape != 0));
+               for (TrackSelection::const_iterator t = s.begin(); t != s.end(); ++t) {
+                       RouteTimeAxisView* r = dynamic_cast<RouteTimeAxisView*> (*t);
+                       if (!r || !r->is_track ()) {
+                               continue;
+                       }
 
-                       items.push_back (MenuElem (_("Record Mode"), *mode_menu));
+                       switch (r->track()->mode()) {
+                       case Normal:
+                               ++normal;
+                               break;
+                       case Destructive:
+                               ++tape;
+                               break;
+                       case NonLayered:
+                               ++non_layered;
+                               break;
+                       }
                }
 
+               mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode")));
+               i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
+               i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal, true));
+               i->set_active (normal != 0 && tape == 0 && non_layered == 0);
+               i->set_inconsistent (normal != 0 && (tape != 0 || non_layered != 0));
+
+               mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode")));
+               i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
+               i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive, true));
+               i->set_active (normal == 0 && tape != 0 && non_layered == 0);
+               i->set_inconsistent (tape != 0 && (normal != 0 || non_layered != 0));
+
+               mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode")));
+               i = dynamic_cast<RadioMenuItem*> (&mode_items.back ());
+               i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered, true));
+               i->set_active (normal == 0 && tape == 0 && non_layered != 0);
+               i->set_inconsistent (non_layered != 0 && (normal != 0 || tape != 0));
+
+               items.push_back (MenuElem (_("Record Mode"), *mode_menu));
 
                items.push_back (SeparatorElem());
 
@@ -864,8 +880,12 @@ RouteTimeAxisView::build_display_menu ()
 
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Hide"), sigc::bind (sigc::mem_fun(_editor, &PublicEditor::hide_track_in_display), this, true)));
-       items.push_front (SeparatorElem());
-       items.push_front (MenuElem (_("Remove"), sigc::mem_fun(_editor, &PublicEditor::remove_tracks)));
+       if (_route && !_route->is_master()) {
+               items.push_back (SeparatorElem());
+               items.push_back (MenuElem (_("Duplicate..."), boost::bind (&ARDOUR_UI::start_duplicate_routes, ARDOUR_UI::instance())));
+       }
+       items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Remove"), sigc::mem_fun(_editor, &PublicEditor::remove_tracks)));
 }
 
 void
@@ -1173,7 +1193,7 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vector<boost::shared_ptr<Play
 
        name = pl->name();
 
-       if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
+       if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) {
                name = resolve_new_group_playlist_name(name, playlists_before_op);
        }
 
@@ -1228,7 +1248,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playl
 
        name = pl->name();
 
-       if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
+       if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) {
                name = resolve_new_group_playlist_name(name,playlists_before_op);
        }
 
@@ -1408,12 +1428,6 @@ RouteTimeAxisView::route_group () const
        return _route->route_group();
 }
 
-string
-RouteTimeAxisView::name() const
-{
-       return _route->name();
-}
-
 boost::shared_ptr<Playlist>
 RouteTimeAxisView::playlist () const
 {
@@ -1426,33 +1440,30 @@ RouteTimeAxisView::playlist () const
        }
 }
 
-void
-RouteTimeAxisView::name_entry_changed ()
+bool
+RouteTimeAxisView::name_entry_changed (string const& str)
 {
-       TimeAxisView::name_entry_changed ();
-
-       string x = name_entry->get_text ();
-
-       if (x == _route->name()) {
-               return;
+       if (str == _route->name()) {
+               return true;
        }
 
+       string x = str;
+       
        strip_whitespace_edges (x);
 
-       if (x.length() == 0) {
-               name_entry->set_text (_route->name());
-               return;
+       if (x.empty()) {
+               return false;
        }
 
        if (_session->route_name_internal (x)) {
-               ARDOUR_UI::instance()->popup_error (string_compose (_("You cannot create a track with that name as it is reserved for %1"),
-                                                                   PROGRAM_NAME));
-               name_entry->grab_focus ();
+               ARDOUR_UI::instance()->popup_error (string_compose (_("The name \"%1\" is reserved for %2"), x, PROGRAM_NAME));
+               return false;
        } else if (RouteUI::verify_new_route_name (x)) {
                _route->set_name (x);
-       } else {
-               name_entry->grab_focus ();
+               return true;
        }
+
+       return false;
 }
 
 boost::shared_ptr<Region>
@@ -1592,7 +1603,7 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
 }
 
 bool
-RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx)
+RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num)
 {
        if (!is_track()) {
                return false;
@@ -1626,7 +1637,7 @@ RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteConte
                framecnt_t amount = extent.second - extent.first;
                pl->ripple(pos, amount * ctx.times, boost::shared_ptr<Region>());
        }
-       pl->paste (*p, pos, ctx.times);
+       pl->paste (*p, pos, ctx.times, sub_num);
 
        vector<Command*> cmds;
        pl->rdiff (cmds);
@@ -1686,7 +1697,7 @@ RouteTimeAxisView::build_playlist_menu ()
        playlist_items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist)));
        playlist_items.push_back (SeparatorElem());
 
-       if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
+       if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::group_select.property_id)) {
                playlist_items.push_back (MenuElem (_("New..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this)));
                playlist_items.push_back (MenuElem (_("New Copy..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this)));
 
@@ -1701,7 +1712,7 @@ RouteTimeAxisView::build_playlist_menu ()
        playlist_items.push_back (MenuElem (_("Clear Current"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::clear_playlists), this)));
        playlist_items.push_back (SeparatorElem());
 
-       playlist_items.push_back (MenuElem(_("Select From All..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
+       playlist_items.push_back (MenuElem(_("Select from All..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector)));
 }
 
 void
@@ -1730,7 +1741,7 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist>
 
        RouteGroup* rg = route_group();
 
-       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) {
+       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::group_select.property_id)) {
                std::string group_string = "." + rg->name() + ".";
 
                std::string take_name = pl->name();
@@ -1776,7 +1787,7 @@ void
 RouteTimeAxisView::update_playlist_tip ()
 {
        RouteGroup* rg = route_group ();
-       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) {
+       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::group_select.property_id)) {
                string group_string = "." + rg->name() + ".";
 
                string take_name = track()->playlist()->name();
@@ -1821,13 +1832,12 @@ RouteTimeAxisView::map_frozen ()
        switch (track()->freeze_state()) {
        case Track::Frozen:
                playlist_button.set_sensitive (false);
-               rec_enable_button->set_sensitive (false);
                break;
        default:
                playlist_button.set_sensitive (true);
-               rec_enable_button->set_sensitive (true);
                break;
        }
+       RouteUI::map_frozen ();
 }
 
 void
@@ -2084,7 +2094,7 @@ RouteTimeAxisView::show_existing_automation (bool apply_to_selection)
 
                for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
                        for (vector<ProcessorAutomationNode*>::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) {
-                               if ((*ii)->view != 0 && (*i)->processor->control((*ii)->what)->list()->size() > 0) {
+                               if ((*i)->processor->control((*ii)->what)->list()->size() > 0) {
                                        (*ii)->menu_item->set_active (true);
                                }
                        }
@@ -2333,14 +2343,10 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
        }
 
        if (x == processor_automation.end()) {
-
                rai = new ProcessorAutomationInfo (processor);
                processor_automation.push_back (rai);
-
        } else {
-
                rai = *x;
-
        }
 
        /* any older menu was deleted at the top of processors_changed()
@@ -2363,6 +2369,10 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
 
                string name = processor->describe_parameter (*i);
 
+               if (name == X_("hidden")) {
+                       continue;
+               }
+
                items.push_back (CheckMenuElem (name));
                mitem = dynamic_cast<Gtk::CheckMenuItem*> (&items.back());
 
@@ -2389,6 +2399,10 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr<Processor> p
                mitem->signal_toggled().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan));
        }
 
+       if (items.size() == 0) {
+               return;
+       }
+
        /* 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
@@ -2488,7 +2502,11 @@ RouteTimeAxisView::can_edit_name () const
 {
        /* we do not allow track name changes if it is record enabled
         */
-       return !_route->record_enabled();
+       boost::shared_ptr<Track> trk (boost::dynamic_pointer_cast<Track> (_route));
+       if (!trk) {
+               return true;
+       }
+       return !trk->rec_enable_control()->get_value();
 }
 
 void
@@ -2638,7 +2656,7 @@ RouteTimeAxisView::set_underlay_state()
                        continue;
                }
 
-               XMLProperty* prop = child_node->property ("id");
+               XMLProperty const * prop = child_node->property ("id");
                if (prop) {
                        PBD::ID id (prop->value());
 
@@ -2680,7 +2698,7 @@ RouteTimeAxisView::add_underlay (StreamView* v, bool /*update_xml*/)
                        }
 
                        XMLNode* node = underlay_xml_node->add_child("Underlay");
-                       XMLProperty* prop = node->add_property("id");
+                       XMLProperty const * prop = node->add_property("id");
                        prop->set_value(v->trackview().route()->id().to_s());
                }
 #endif
@@ -2719,7 +2737,7 @@ RouteTimeAxisView::remove_underlay (StreamView* v)
 void
 RouteTimeAxisView::set_button_names ()
 {
-       if (_route && _route->solo_safe()) {
+       if (_route && _route->solo_safe_control()->solo_safe()) {
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
        } else {
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
@@ -2920,3 +2938,22 @@ RouteTimeAxisView::remove_child (boost::shared_ptr<TimeAxisView> c)
                }
        }
 }
+
+Gdk::Color
+RouteTimeAxisView::color () const
+{
+       return route_color ();
+}
+
+bool
+RouteTimeAxisView::marked_for_display () const
+{
+       return !_route->presentation_info().hidden();
+}
+
+bool
+RouteTimeAxisView::set_marked_for_display (bool yn)
+{
+       return RouteUI::mark_hidden (!yn);
+}
+