diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-06 23:42:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-06 23:42:07 +0000 |
| commit | 2dd0b9321c87838e9f2276c02f5942daac2b836e (patch) | |
| tree | 662e7204c0d3a3eea3183a9407a6b46871d0d152 /gtk2_ardour/editor_region_list.cc | |
| parent | facf6168681010134085145b5b480d864d780cd4 (diff) | |
modified fix from carl for region copy-moves-original-to-start bug; change verbose canvas cursor color to be more distinct and readable; fix naming issues with imported files containing ':'; make sure [N] channels count shows up for whole files in region list; fix #1575, a subtle and nasty bug; improve positioning of verbose canvas cursor for ruler drags (but has a wierd side effect
git-svn-id: svn://localhost/ardour2/trunk@1675 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_region_list.cc')
| -rw-r--r-- | gtk2_ardour/editor_region_list.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc index 56196623ed..df23ac503c 100644 --- a/gtk2_ardour/editor_region_list.cc +++ b/gtk2_ardour/editor_region_list.cc @@ -21,6 +21,7 @@ #include <cmath> #include <algorithm> #include <string> +#include <sstream> #include <pbd/basename.h> @@ -138,12 +139,13 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio if (region->source()->name()[0] == '/') { // external file if (region->whole_file()) { - str = ".../"; boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(region->source()); + str = ".../"; + if (afs) { - str += region_name_from_path (afs->path(), region->n_channels() > 1); + str = region_name_from_path (afs->path(), region->n_channels() > 1); } else { str += region->source()->name(); } @@ -158,6 +160,14 @@ Editor::add_audio_region_to_region_display (boost::shared_ptr<AudioRegion> regio } + if (region->n_channels() > 1) { + std::stringstream foo; + foo << region->n_channels (); + str += " ["; + str += foo.str(); + str += ']'; + } + if (missing_source) { str += _(" (MISSING)"); } |