allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

remove "edit" property from track/bus groups; use "select" property which should force region selection to propagate, and then rely on "edit-applies-to-selection"

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13734 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2012-12-26 17:50:29 +00:00
parent b5431ab2fc
commit 54ce76e8fd
10 changed files with 26 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/route_group.h
View File

@@ -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;

17
libs/ardour/route_group.cc
View File

@@ -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)
{