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/monitor_section.cc | |
| parent | 79142a262ec0a02f9a43a71dd226f78a1d7cbeed (diff) | |
rework 8b80fe0, use std::string, not char*
Diffstat (limited to 'gtk2_ardour/monitor_section.cc')
| -rw-r--r-- | gtk2_ardour/monitor_section.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 6ff9de091e..f246871aca 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -27,6 +27,7 @@ #include "gtkmm2ext/tearoff.h" #include "gtkmm2ext/actions.h" #include "gtkmm2ext/motionfeedback.h" +#include "gtkmm2ext/utils.h" #include <gtkmm/menu.h> #include <gtkmm/menuitem.h> @@ -1352,7 +1353,7 @@ MonitorSection::update_output_display () char * tooltip_cstr; io_count = _route->n_outputs().n_total(); - tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(_route->name().c_str())); + tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Gtkmm2ext::markup_escape_text (_route->name())); for (io_index = 0; io_index < io_count; ++io_index) { @@ -1378,12 +1379,12 @@ MonitorSection::update_output_display () } if (io_connection_count == 0) { - tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)).c_str() + tooltip << endl << Gtkmm2ext::markup_escape_text (port->name().substr(port->name().find("/") + 1)) << " -> " - << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ).c_str(); + << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn ); } else { tooltip << ", " - << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ).c_str(); + << Gtkmm2ext::markup_escape_text ( pn.empty() ? connection_name : pn ); } if (connection_name.find("ardour:") == 0) { |