From e984220eaaa318d9b51ebb20995d1bccae389389 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 25 May 2011 12:19:24 +0000 Subject: correct the logic used when building a compound region to include a whole-file (whole-source) region as a parent for the region list git-svn-id: svn://localhost/ardour2/branches/3.0@9584 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/region_factory.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libs/ardour/region_factory.cc') diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 9dbd0ded37..f4fd209fea 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -488,9 +488,13 @@ RegionFactory::region_name (string& result, string base, bool newlevel) } string -RegionFactory::compound_region_name (const string& playlist, uint32_t compound_ops, uint32_t depth) +RegionFactory::compound_region_name (const string& playlist, uint32_t compound_ops, uint32_t depth, bool whole_source) { - return string_compose (_("%1 compound-%2.1 (%3)"), playlist, compound_ops+1, depth+1); + if (whole_source) { + return string_compose (_("%1 compound-%2 (%3)"), playlist, compound_ops+1, depth+1); + } else { + return string_compose (_("%1 compound-%2.1 (%3)"), playlist, compound_ops+1, depth+1); + } } string -- cgit v1.2.3