diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-25 12:19:24 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-25 12:19:24 +0000 |
| commit | e984220eaaa318d9b51ebb20995d1bccae389389 (patch) | |
| tree | 9e1eb88a532f642c2f5682817198ea0ae6414cb9 /libs/ardour/region_factory.cc | |
| parent | 49785b8fbb3f21080c75bb1162f387db914faae2 (diff) | |
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
Diffstat (limited to 'libs/ardour/region_factory.cc')
| -rw-r--r-- | libs/ardour/region_factory.cc | 8 |
1 files changed, 6 insertions, 2 deletions
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 |