From 88acb20c73c1818705d49add9d330f4df683999c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 21 Dec 2006 19:02:20 +0000 Subject: minor tweaks to get region names right for imports git-svn-id: svn://localhost/ardour2/trunk@1242 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/import.cc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'libs') diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 015b34c1b4..e6be0f4fc2 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -215,8 +215,13 @@ Session::import_audiofile (import_status& status) sources.push_back(newfiles[n]); } - boost::shared_ptr r (boost::dynamic_pointer_cast (RegionFactory::create (sources, 0, newfiles[0]->length(), region_name_from_path (basepath, true), - 0, AudioRegion::Flag (AudioRegion::DefaultFlags | AudioRegion::WholeFile)))); + bool strip_paired_suffixes = (newfiles.size() > 1); + + boost::shared_ptr r (boost::dynamic_pointer_cast + (RegionFactory::create (sources, 0, + newfiles[0]->length(), + region_name_from_path (basepath, strip_paired_suffixes), + 0, AudioRegion::Flag (AudioRegion::DefaultFlags | AudioRegion::WholeFile)))); status.new_regions.push_back (r); @@ -229,11 +234,14 @@ Session::import_audiofile (import_status& status) /* The sources had zero-length when created, which means that the Session did not bother to create whole-file AudioRegions for them. Do it now. + + Note: leave any trailing paired indicators from the file names as part + of the region name. */ status.new_regions.push_back (boost::dynamic_pointer_cast (RegionFactory::create (boost::static_pointer_cast (newfiles[n]), 0, newfiles[n]->length(), - region_name_from_path (newfiles[n]->name(), true), + region_name_from_path (newfiles[n]->name(), false), 0, AudioRegion::Flag (AudioRegion::DefaultFlags | AudioRegion::WholeFile | AudioRegion::Import)))); } } -- cgit v1.2.3