From 830910c787386ccfee9095a51cb811145afb00de Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 26 Oct 2023 05:46:11 +0200 Subject: [PATCH] Region list columns do not use property_markup This fixes an issue with frozen region "Foo" being displayed as "<F1<Foo" in the sidebar. --- gtk2_ardour/region_list_base.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/region_list_base.cc b/gtk2_ardour/region_list_base.cc index 919bf79896..2b7117c9af 100644 --- a/gtk2_ardour/region_list_base.cc +++ b/gtk2_ardour/region_list_base.cc @@ -613,7 +613,7 @@ RegionListBase::populate_row_opaque (std::shared_ptr region, TreeModel:: void RegionListBase::populate_row_name (std::shared_ptr region, TreeModel::Row const& row) { - row[_columns.name] = Gtkmm2ext::markup_escape_text (region->name ()); + row[_columns.name] = region->name (); if (region->data_type () == DataType::MIDI) { row[_columns.channels] = 0; /*TODO: some better recognition of midi regions*/ @@ -629,9 +629,9 @@ RegionListBase::populate_row_source (std::shared_ptr region, TreeModel:: { std::shared_ptr source = region->source (); if (std::dynamic_pointer_cast (source)) { - row[_columns.path] = _("MISSING ") + Gtkmm2ext::markup_escape_text (source->name ()); + row[_columns.path] = _("MISSING ") + source->name (); } else { - row[_columns.path] = Gtkmm2ext::markup_escape_text (source->name ()); + row[_columns.path] = source->name (); std::shared_ptr fs = std::dynamic_pointer_cast (source); if (fs) { @@ -639,14 +639,14 @@ RegionListBase::populate_row_source (std::shared_ptr region, TreeModel:: if (afs) { const string audio_directory = _session->session_directory ().sound_path (); if (!PBD::path_is_within (audio_directory, fs->path ())) { - row[_columns.path] = Gtkmm2ext::markup_escape_text (fs->path ()); + row[_columns.path] = fs->path (); } } std::shared_ptr mfs = std::dynamic_pointer_cast (source); if (mfs) { const string midi_directory = _session->session_directory ().midi_path (); if (!PBD::path_is_within (midi_directory, fs->path ())) { - row[_columns.path] = Gtkmm2ext::markup_escape_text (fs->path ()); + row[_columns.path] = fs->path (); } } }