- if (fs) {
- region_name = region_name_from_path (fs->path(), false, false, sources.size(), n);
- } else{
- region_name = (*x)->name();
+ if (sources.size() > 1 && disposition == ImportDistinctChannels) {
+
+ /* generate a per-channel region name so that things work as
+ * intended
+ */
+
+ string path;
+
+ if (fs) {
+ region_name = basename_nosuffix (fs->path());
+ } else {
+ region_name = (*x)->name();
+ }
+
+ if (sources.size() == 2) {
+ if (n == 0) {
+ region_name += "-L";
+ } else {
+ region_name += "-R";
+ }
+ } else if (sources.size() > 2) {
+ region_name += string_compose ("-%1", n+1);
+ }
+
+ track_names.push_back (region_name);
+
+ } else {
+ if (fs) {
+ region_name = region_name_from_path (fs->path(), false, false, sources.size(), n);
+ } else {
+ region_name = (*x)->name();
+ }
+
+ if (SMFSource::safe_midi_file_extension (paths.front())) {
+ string track_name = string_compose ("%1-t%2", PBD::basename_nosuffix (fs->path()), (n + 1));
+ track_names.push_back (track_name);
+ } else {
+ track_names.push_back (PBD::basename_nosuffix (paths[n]));
+ }