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/ardour | |
| 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/ardour')
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/region_factory.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 5eaf10273d..5406886faa 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -139,7 +139,7 @@ public: void partition (framepos_t start, framepos_t end, bool cut = false); void duplicate (boost::shared_ptr<Region>, framepos_t position, float times); void nudge_after (framepos_t start, framecnt_t distance, bool forwards); - boost::shared_ptr<Region> combine (const RegionList&, const std::string&); + boost::shared_ptr<Region> combine (const RegionList&); void uncombine (boost::shared_ptr<Region>); void shuffle (boost::shared_ptr<Region>, int dir); diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index 7feca25495..90716f8718 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -91,7 +91,7 @@ public: static int region_name (std::string &, std::string, bool new_level = false); static std::string new_region_name (std::string); - static std::string compound_region_name (const std::string& playlist, uint32_t compound_ops, uint32_t depth); + static std::string compound_region_name (const std::string& playlist, uint32_t compound_ops, uint32_t depth, bool whole_source); /* when we make a compound region, for every region involved there * are two "instances" - the original, which is removed from this |