diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-12-21 18:38:00 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-12-21 18:38:00 +0000 |
commit | afa29d319007ce20bd1546c343e9277c58c80c1a (patch) | |
tree | 0e1b3ec3bca91a16f3698077031d3872cdcbe96e /gtk2_ardour/editor_region_list.cc | |
parent | 2202912d355fc6f978bd3475c4c1b5cd1a435242 (diff) |
use ustring more; handle embedding of "paired" files as per mantis #1362
git-svn-id: svn://localhost/ardour2/trunk@1241 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_region_list.cc')
-rw-r--r-- | gtk2_ardour/editor_region_list.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc index d12d562237..2f2aea7b7d 100644 --- a/gtk2_ardour/editor_region_list.cc +++ b/gtk2_ardour/editor_region_list.cc @@ -26,7 +26,7 @@ #include <pbd/basename.h> #include <ardour/audioregion.h> -#include <ardour/audiosource.h> +#include <ardour/audiofilesource.h> #include <ardour/session_region.h> #include <gtkmm2ext/stop_signal.h> @@ -131,8 +131,15 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio if (region->whole_file()) { str = ".../"; - str += PBD::basename_nosuffix (region->source()->name()); - + + boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(region->source()); + + if (afs) { + str += region_name_from_path (afs->path(), region->n_channels() > 1); + } else { + str += region->source()->name(); + } + } else { str = region->name(); } |