remove "edit" property from track/bus groups; use "select" property which should...

git-svn-id: svn://localhost/ardour2/branches/3.0@13734 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3e356e179588c08b2fdab8af0a825f259764ce3e..a74b4d4e2d2194da7ffb078eee00e87d2b1eabd9 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4025,7 +4025,7 @@ Editor::new_playlists (TimeAxisView* v)
        begin_reversible_command (_("new playlists"));
        vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
        _session->playlists->get (playlists);
-       mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v, ARDOUR::Properties::edit.property_id);
+       mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_new_playlist), playlists), v, ARDOUR::Properties::select.property_id);
        commit_reversible_command ();
 }
 
@@ -4041,7 +4041,7 @@ Editor::copy_playlists (TimeAxisView* v)
        begin_reversible_command (_("copy playlists"));
        vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
        _session->playlists->get (playlists);
-       mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v, ARDOUR::Properties::edit.property_id);
+       mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_use_copy_playlist), playlists), v, ARDOUR::Properties::select.property_id);
        commit_reversible_command ();
 }
 
@@ -4056,7 +4056,7 @@ Editor::clear_playlists (TimeAxisView* v)
        begin_reversible_command (_("clear playlists"));
        vector<boost::shared_ptr<ARDOUR::Playlist> > playlists;
        _session->playlists->get (playlists);
-       mapover_tracks (sigc::mem_fun (*this, &Editor::mapped_clear_playlist), v, ARDOUR::Properties::edit.property_id);
+       mapover_tracks (sigc::mem_fun (*this, &Editor::mapped_clear_playlist), v, ARDOUR::Properties::select.property_id);
        commit_reversible_command ();
 }
 
@@ -4546,7 +4546,7 @@ Editor::get_regions_after (RegionSelection& rs, framepos_t where, const TrackVie
 RegionSelection
 Editor::get_regions_from_selection ()
 {
-       return get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
+       return get_equivalent_regions (selection->regions, ARDOUR::Properties::select.property_id);
 }
 
 /** Get regions using the following method:
@@ -4594,7 +4594,7 @@ Editor::get_regions_from_selection_and_edit_point ()
        /* Add any other regions that are in the same
           edit-activated route group as one of our regions.
         */
-       regions = get_equivalent_regions (regions, ARDOUR::Properties::edit.property_id);
+       regions = get_equivalent_regions (regions, ARDOUR::Properties::select.property_id);
        framepos_t const where = get_preferred_edit_position ();
 
        if (_route_groups->all_group_active_button().get_active() && tracks.empty()) {
@@ -4644,7 +4644,7 @@ Editor::get_regions_from_selection_and_entered ()
                regions.add (entered_regionview);
        }
 
-       return get_equivalent_regions (regions, ARDOUR::Properties::edit.property_id);
+       return get_equivalent_regions (regions, ARDOUR::Properties::select.property_id);
 }
 
 void

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index f9e2bc3a19d1ee8a18ee06a01459926c618bd44e..997a115b7120b5d2a659dad39a9045505e15aee4 100644 (file)
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -172,7 +172,6 @@ EditorGroupTabs::default_properties () const
        plist.add (Properties::mute, true);
        plist.add (Properties::solo, true);
        plist.add (Properties::recenable, true);
-       plist.add (Properties::edit, true);
 
        return plist;
 }

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 81767cdaa3f0434eee2777e9c41a327de8763d81..4f3bd4554f6f1c44075ca3e67da8615a9ceb6ef5 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -851,7 +851,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
                case RegionViewNameHighlight:
                        if (!clicked_regionview->region()->locked()) {
-                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::select.property_id);
                                _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event);
                                return true;
                        }
@@ -917,14 +917,14 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        switch (item_type) {
                        case FadeInHandleItem:
                        {
-                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::select.property_id);
                                _drags->set (new FadeInDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event, _cursors->fade_in);
                                return true;
                        }
 
                        case FadeOutHandleItem:
                        {
-                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::select.property_id);
                                _drags->set (new FadeOutDrag (this, item, reinterpret_cast<RegionView*> (item->get_data("regionview")), s), event, _cursors->fade_out);
                                return true;
                        }
@@ -988,7 +988,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        case LeftFrameHandle:
                         case RightFrameHandle:
                                if (!clicked_regionview->region()->locked()) {
-                                       RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+                                       RegionSelection s = get_equivalent_regions (selection->regions, Properties::select.property_id);
                                        _drags->set (new TrimDrag (this, item, clicked_regionview, s.by_layer()), event);
                                        return true;
                                }
@@ -997,7 +997,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        case RegionViewName:
                        {
                                /* rename happens on edit clicks */
-                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::edit.property_id);
+                               RegionSelection s = get_equivalent_regions (selection->regions, Properties::select.property_id);
                                _drags->set (new TrimDrag (this, clicked_regionview->get_name_highlight(), clicked_regionview, s.by_layer()), event);
                                return true;
                                break;
@@ -2636,7 +2636,7 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region
        if (Config->get_edit_mode() == Splice) {
                _drags->add (new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer()));
        } else {
-               RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
+               RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::select.property_id);
                _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), false, false));
        }
 
@@ -2655,7 +2655,7 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* r
 
        _region_motion_group->raise_to_top ();
 
-       RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
+       RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::select.property_id);
        _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), false, true));
 }
 
@@ -2672,7 +2672,7 @@ Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView*
                return;
        }
 
-       RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id);
+       RegionSelection s = get_equivalent_regions (selection->regions, ARDOUR::Properties::select.property_id);
        _drags->add (new RegionMoveDrag (this, item, region_view, s.by_layer(), true, false));
 
        begin_reversible_command (Operations::drag_region_brush);

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index ba170a680d4b4ab1d807f7df6241ccdb77c1c32a..72f6adfa8259abf3200d553d26f8fd81753fb05f 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -86,7 +86,6 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
        _display.append_column ("", _columns.record);
        _display.append_column ("", _columns.monitoring);
        _display.append_column ("", _columns.select);
-       _display.append_column ("", _columns.edits);
        _display.append_column ("", _columns.active_shared);
 
        TreeViewColumn* col;
@@ -103,9 +102,8 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
                { 7, S_("solo|S"), _("Sharing Solo?") },
                { 8, _("Rec"), _("Sharing Record-enable Status?") },
                { 9, S_("monitoring|Mon"), _("Sharing Monitoring Choice?") },
-               { 10, S_("selection|Sel"), _("Sharing Selected Status?") },
-               { 11, S_("editing|E"), _("Sharing Editing?") },
-               { 12, S_("active|A"), _("Sharing Active Status?") },
+               { 10, S_("selection|Sel"), _("Sharing Selected/Editing Status?") },
+               { 11, S_("active|A"), _("Sharing Active Status?") },
                { -1, 0, 0 }
        };
 
@@ -360,12 +358,6 @@ EditorRouteGroups::button_press_event (GdkEventButton* ev)
                break;
 
        case 11:
-               val = (*iter)[_columns.edits];
-               group->set_edit (!val);
-               ret = true;
-               break;
-
-       case 12:
                val = (*iter)[_columns.active_shared];
                group->set_route_active (!val);
                ret = true;
@@ -408,8 +400,6 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel
        plist.add (Properties::monitoring, val);
        val = (*iter)[_columns.select];
        plist.add (Properties::select, val);
-       val = (*iter)[_columns.edits];
-       plist.add (Properties::edit, val);
        val = (*iter)[_columns.active_shared];
        plist.add (Properties::route_active, val);
        val = (*iter)[_columns.active_state];
@@ -437,7 +427,6 @@ EditorRouteGroups::add (RouteGroup* group)
        row[_columns.record] = group->is_recenable();
        row[_columns.monitoring] = group->is_monitoring();
        row[_columns.select] = group->is_select ();
-       row[_columns.edits] = group->is_edit ();
        row[_columns.active_shared] = group->is_route_active ();
        row[_columns.active_state] = group->is_active ();
        row[_columns.is_visible] = !group->is_hidden();
@@ -508,7 +497,6 @@ EditorRouteGroups::property_changed (RouteGroup* group, const PropertyChange&)
                        (*iter)[_columns.record] = group->is_recenable ();
                        (*iter)[_columns.monitoring] = group->is_monitoring ();
                        (*iter)[_columns.select] = group->is_select ();
-                       (*iter)[_columns.edits] = group->is_edit ();
                        (*iter)[_columns.active_shared] = group->is_route_active ();
                        (*iter)[_columns.active_state] = group->is_active ();
                        (*iter)[_columns.is_visible] = !group->is_hidden();

diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index 94ab3658f3e08a2e8d97dd16d82991a3eb3fad30..42061ff089a743141f0e9f2abf87411052652136 100644 (file)
--- a/gtk2_ardour/editor_route_groups.h
+++ b/gtk2_ardour/editor_route_groups.h
@@ -49,7 +49,6 @@ private:
                        add (record);
                        add (monitoring);
                        add (select);
-                       add (edits);
                        add (active_shared);
                        add (active_state);
                        add (routegroup);
@@ -65,7 +64,6 @@ private:
                Gtk::TreeModelColumn<bool> record;
                Gtk::TreeModelColumn<bool> monitoring;
                Gtk::TreeModelColumn<bool> select;
-               Gtk::TreeModelColumn<bool> edits;
                Gtk::TreeModelColumn<bool> active_shared;
                Gtk::TreeModelColumn<bool> active_state;
                Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;

diff --git a/gtk2_ardour/region_layering_order_editor.cc b/gtk2_ardour/region_layering_order_editor.cc
index b83506cf41f37d7dc2dece4875ed245449d73e79..a7d73afc64a2fc5e479dfbc2e219af124ecb6f59 100644 (file)
--- a/gtk2_ardour/region_layering_order_editor.cc
+++ b/gtk2_ardour/region_layering_order_editor.cc
@@ -127,7 +127,7 @@ RegionLayeringOrderEditor::row_selected ()
        RegionView* rv = row[layering_order_columns.region_view];
        
        vector<RegionView*> eq;
-       editor.get_equivalent_regions (rv, eq, Properties::edit.property_id);
+       editor.get_equivalent_regions (rv, eq, Properties::select.property_id);
 
        /* XXX this should be reversible, really */
        

diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc
index 3e2c497475422dfa88a0c592bcc6e427e4ca4586..945219d4f21615f84e2784b0880c99498557cb29 100644 (file)
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -43,7 +43,6 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        , _solo (_("Soloing"))
        , _rec_enable (_("Record enable"))
        , _select (_("Selection"))
-       , _edit (_("Editing"))
        , _route_active (_("Active state"))
        , _share_color (_("Color"))
        , _share_monitoring (_("Monitoring"))
@@ -103,7 +102,6 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        _solo.set_active (_group->is_solo());
        _rec_enable.set_active (_group->is_recenable());
        _select.set_active (_group->is_select());
-       _edit.set_active (_group->is_edit());
        _route_active.set_active (_group->is_route_active());
        _share_color.set_active (_group->is_color());
        _share_monitoring.set_active (_group->is_monitoring());
@@ -117,14 +115,13 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        _solo.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _rec_enable.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _select.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-       _edit.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _route_active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _share_color.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _share_monitoring.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        
        gain_toggled ();
 
-       Table* table = manage (new Table (12, 4, false));
+       Table* table = manage (new Table (11, 4, false));
        table->set_row_spacings (6);
 
        l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
@@ -142,10 +139,9 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        table->attach (_solo, 1, 3, 4, 5, Gtk::FILL, Gtk::FILL, 0, 0);
        table->attach (_rec_enable, 1, 3, 5, 6, Gtk::FILL, Gtk::FILL, 0, 0);
        table->attach (_select, 1, 3, 6, 7, Gtk::FILL, Gtk::FILL, 0, 0);
-       table->attach (_edit, 1, 3, 7, 8, Gtk::FILL, Gtk::FILL, 0, 0);
-       table->attach (_route_active, 1, 3, 8, 9, Gtk::FILL, Gtk::FILL, 0, 0);
-       table->attach (_share_color, 1, 3, 9, 10, Gtk::FILL, Gtk::FILL, 0, 0);
-       table->attach (_share_monitoring, 1, 3, 10, 11, Gtk::FILL, Gtk::FILL, 0, 0);
+       table->attach (_route_active, 1, 3, 7, 8, Gtk::FILL, Gtk::FILL, 0, 0);
+       table->attach (_share_color, 1, 3, 8, 9, Gtk::FILL, Gtk::FILL, 0, 0);
+       table->attach (_share_monitoring, 1, 3, 9, 10, Gtk::FILL, Gtk::FILL, 0, 0);
 
        options_box->pack_start (*table, false, true);
        main_vbox->pack_start (*options_box, false, true);
@@ -208,7 +204,6 @@ RouteGroupDialog::update ()
        plist.add (Properties::mute, _mute.get_active());
        plist.add (Properties::solo, _solo.get_active ());
        plist.add (Properties::select, _select.get_active());
-       plist.add (Properties::edit, _edit.get_active());
        plist.add (Properties::route_active, _route_active.get_active());
        plist.add (Properties::relative, _relative.get_active());
        plist.add (Properties::active, _active.get_active());

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 0fbbd834701a335fdb7176707e22de140015a98c..a8f6782262bc95a309d077ed0446375a24ef44f0 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -254,7 +254,6 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        PropertyList* plist = new PropertyList();
 
-       plist->add (ARDOUR::Properties::edit, true);
        plist->add (ARDOUR::Properties::mute, true);
        plist->add (ARDOUR::Properties::solo, true);
 
@@ -1062,7 +1061,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::edit.property_id)) {
+       if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
                name = resolve_new_group_playlist_name(name, playlists_before_op);
        }
 
@@ -1117,7 +1116,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::edit.property_id)) {
+       if (route_group() && route_group()->is_active() && route_group()->enabled_property (ARDOUR::Properties::select.property_id)) {
                name = resolve_new_group_playlist_name(name,playlists_before_op);
        }
 
@@ -1498,7 +1497,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::edit.property_id)) {
+       if (!route_group() || !route_group()->is_active() || !route_group()->enabled_property (ARDOUR::Properties::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)));
 
@@ -1542,7 +1541,7 @@ RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr<Playlist>
        
        RouteGroup* rg = route_group();
        
-       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::edit.property_id)) {
+       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) {
                std::string group_string = "." + rg->name() + ".";
                
                std::string take_name = pl->name();
@@ -1588,7 +1587,7 @@ void
 RouteTimeAxisView::update_playlist_tip ()
 {
        RouteGroup* rg = route_group ();
-       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::edit.property_id)) {
+       if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::select.property_id)) {
                string group_string = "." + rg->name() + ".";
                
                string take_name = track()->playlist()->name();

diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h
index 890bf8af40aa8ba0a98889c16c82d974841f732b..1f12c57f8d37f52d97d9d238be2caa80817b894f 100644 (file)
--- a/libs/ardour/ardour/route_group.h
+++ b/libs/ardour/ardour/route_group.h
@@ -42,7 +42,6 @@ namespace Properties {
        extern PBD::PropertyDescriptor<bool> solo;
        extern PBD::PropertyDescriptor<bool> recenable;
        extern PBD::PropertyDescriptor<bool> select;
-       extern PBD::PropertyDescriptor<bool> edit;
        extern PBD::PropertyDescriptor<bool> route_active;
        extern PBD::PropertyDescriptor<bool> color;
        extern PBD::PropertyDescriptor<bool> monitoring;
@@ -71,7 +70,6 @@ class RouteGroup : public SessionObject
        bool is_solo () const { return _solo.val(); }
        bool is_recenable () const { return _recenable.val(); }
        bool is_select () const { return _select.val(); }
-       bool is_edit () const { return _edit.val(); }
        bool is_route_active () const { return _route_active.val(); }
        bool is_color () const { return _color.val(); }
        bool is_monitoring() const { return _monitoring.val(); }
@@ -91,7 +89,6 @@ class RouteGroup : public SessionObject
        void set_solo (bool yn);
        void set_recenable (bool yn);
        void set_select (bool yn);
-       void set_edit (bool yn);
        void set_route_active (bool yn);
        void set_color (bool yn);
        void set_monitoring (bool yn);
@@ -147,7 +144,6 @@ private:
        PBD::Property<bool> _solo;
        PBD::Property<bool> _recenable;
        PBD::Property<bool> _select;
-       PBD::Property<bool> _edit;
        PBD::Property<bool> _route_active;
        PBD::Property<bool> _color;
        PBD::Property<bool> _monitoring;

diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc
index ed684d3c9fe2619b74458f88d57f0b5731a13984..55183bd0b8424b676878bafaa530bdf5b0cab262 100644 (file)
--- a/libs/ardour/route_group.cc
+++ b/libs/ardour/route_group.cc
@@ -46,7 +46,6 @@ namespace ARDOUR {
                PropertyDescriptor<bool> solo;
                PropertyDescriptor<bool> recenable;
                PropertyDescriptor<bool> select;
-               PropertyDescriptor<bool> edit;
                PropertyDescriptor<bool> route_active;
                PropertyDescriptor<bool> color;
                PropertyDescriptor<bool> monitoring;
@@ -72,8 +71,6 @@ RouteGroup::make_property_quarks ()
         DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for recenable = %1\n",  Properties::recenable.property_id));
        Properties::select.property_id = g_quark_from_static_string (X_("select"));
         DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for select = %1\n",     Properties::select.property_id));
-       Properties::edit.property_id = g_quark_from_static_string (X_("edit"));
-        DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for edit = %1\n",       Properties::edit.property_id));
        Properties::route_active.property_id = g_quark_from_static_string (X_("route-active"));
         DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for route-active = %1\n", Properties::route_active.property_id));
        Properties::color.property_id = g_quark_from_static_string (X_("color"));
@@ -90,7 +87,6 @@ RouteGroup::make_property_quarks ()
        , _solo (Properties::solo, false) \
        , _recenable (Properties::recenable, false) \
        , _select (Properties::select, false) \
-       , _edit (Properties::edit, false) \
        , _route_active (Properties::route_active, false) \
        , _color (Properties::color, false) \
        , _monitoring (Properties::monitoring, false)
@@ -110,7 +106,6 @@ RouteGroup::RouteGroup (Session& s, const string &n)
        add_property (_solo);
        add_property (_recenable);
        add_property (_select);
-       add_property (_edit);
        add_property (_route_active);
        add_property (_color);
        add_property (_monitoring);
@@ -286,7 +281,6 @@ RouteGroup::set_state_2X (const XMLNode& node, int /*version*/)
                _mute = true;
                _solo = true;
                _recenable = true;
-               _edit = false;
                _route_active = true;
                _color = false;
        } else if (node.name() == "EditGroup") {
@@ -294,7 +288,6 @@ RouteGroup::set_state_2X (const XMLNode& node, int /*version*/)
                _mute = false;
                _solo = false;
                _recenable = false;
-               _edit = true;
                _route_active = false;
                _color = false;
        }
@@ -352,16 +345,6 @@ RouteGroup::set_select (bool yn)
        send_change (PropertyChange (Properties::select));
 }
 
-void
-RouteGroup::set_edit (bool yn)
-{
-       if (is_edit() == yn) {
-               return;
-       }
-       _edit = yn;
-       send_change (PropertyChange (Properties::edit));
-}
-
 void
 RouteGroup::set_route_active (bool yn)
 {