From e4a588901b3015b330321f73ce837f55dfef7e04 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 5 Jun 2016 15:09:53 -0400 Subject: change property names (not quark/strings) for RouteGroup properties to avoid collisions with new ones --- libs/ardour/ardour/route_group.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libs/ardour/ardour/route_group.h') diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h index b4c6393e7a..0fc185ea0d 100644 --- a/libs/ardour/ardour/route_group.h +++ b/libs/ardour/ardour/route_group.h @@ -38,17 +38,17 @@ namespace ARDOUR { namespace Properties { - LIBARDOUR_API extern PBD::PropertyDescriptor relative; + LIBARDOUR_API extern PBD::PropertyDescriptor group_relative; + LIBARDOUR_API extern PBD::PropertyDescriptor group_gain; + LIBARDOUR_API extern PBD::PropertyDescriptor group_mute; + LIBARDOUR_API extern PBD::PropertyDescriptor group_solo; + LIBARDOUR_API extern PBD::PropertyDescriptor group_recenable; + LIBARDOUR_API extern PBD::PropertyDescriptor group_select; + LIBARDOUR_API extern PBD::PropertyDescriptor group_route_active; + LIBARDOUR_API extern PBD::PropertyDescriptor group_color; + LIBARDOUR_API extern PBD::PropertyDescriptor group_monitoring; LIBARDOUR_API extern PBD::PropertyDescriptor active; - LIBARDOUR_API extern PBD::PropertyDescriptor gain; - LIBARDOUR_API extern PBD::PropertyDescriptor mute; - LIBARDOUR_API extern PBD::PropertyDescriptor solo; - LIBARDOUR_API extern PBD::PropertyDescriptor recenable; - LIBARDOUR_API extern PBD::PropertyDescriptor select; - LIBARDOUR_API extern PBD::PropertyDescriptor route_active; - LIBARDOUR_API extern PBD::PropertyDescriptor color; - LIBARDOUR_API extern PBD::PropertyDescriptor monitoring; - /* we use this, but its declared in region.cc */ + /* we use these declared in region.cc */ LIBARDOUR_API extern PBD::PropertyDescriptor hidden; }; -- cgit v1.2.3