diff options
| author | Robin Gareus <robin@gareus.org> | 2015-10-15 11:24:15 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-15 11:24:15 +0200 |
| commit | 696b89b71a895dff732c734cdaa30a2e119292c8 (patch) | |
| tree | 6251564deae520b45c88e9477dc659a7cb2f0c8c /gtk2_ardour/editor_regions.cc | |
| parent | 79142a262ec0a02f9a43a71dd226f78a1d7cbeed (diff) | |
rework 8b80fe0, use std::string, not char*
Diffstat (limited to 'gtk2_ardour/editor_regions.cc')
| -rw-r--r-- | gtk2_ardour/editor_regions.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 12503e1ab7..0968c4052b 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -35,6 +35,7 @@ #include "gtkmm2ext/choice.h" #include "gtkmm2ext/treeutils.h" +#include "gtkmm2ext/utils.h" #include "audio_clock.h" #include "editor.h" @@ -390,14 +391,14 @@ EditorRegions::add_region (boost::shared_ptr<Region> region) row[_columns.property_toggles_visible] = false; if (missing_source) { - row[_columns.path] = _("(MISSING) ") + std::string(Glib::Markup::escape_text (region->source()->name())); + row[_columns.path] = _("(MISSING) ") + Gtkmm2ext::markup_escape_text (region->source()->name()); } else { boost::shared_ptr<FileSource> fs = boost::dynamic_pointer_cast<FileSource>(region->source()); if (fs) { - row[_columns.path] = Glib::Markup::escape_text (fs->path()).c_str(); + row[_columns.path] = Gtkmm2ext::markup_escape_text (fs->path()); } else { - row[_columns.path] = Glib::Markup::escape_text (region->source()->name()).c_str(); + row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name()); } } @@ -949,9 +950,9 @@ void EditorRegions::populate_row_name (boost::shared_ptr<Region> region, TreeModel::Row const &row) { if (region->n_channels() > 1) { - row[_columns.name] = string_compose("%1 [%2]", Glib::Markup::escape_text (region->name()).c_str(), region->n_channels()); + row[_columns.name] = string_compose("%1 [%2]", Gtkmm2ext::markup_escape_text (region->name()), region->n_channels()); } else { - row[_columns.name] = Glib::Markup::escape_text (region->name()).c_str(); + row[_columns.name] = Gtkmm2ext::markup_escape_text (region->name()); } } @@ -959,9 +960,9 @@ void EditorRegions::populate_row_source (boost::shared_ptr<Region> region, TreeModel::Row const &row) { if (boost::dynamic_pointer_cast<SilentFileSource>(region->source())) { - row[_columns.path] = _("MISSING ") + std::string(Glib::Markup::escape_text (region->source()->name())); + row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (region->source()->name()); } else { - row[_columns.path] = Glib::Markup::escape_text (region->source()->name()).c_str(); + row[_columns.path] = Gtkmm2ext::markup_escape_text (region->source()->name()); } } |