smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

rework 8b80fe0, use std::string, not char*

Browse source
This commit is contained in:
Robin Gareus 2015-10-15 11:24:15 +02:00
parent 79142a262e
commit 696b89b71a
13 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
gtk2_ardour/editor_regions.cc
View file

@ -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());
}
}