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/mixer_strip.cc | |
| parent | 79142a262ec0a02f9a43a71dd226f78a1d7cbeed (diff) | |
rework 8b80fe0, use std::string, not char*
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 2ff54512c6..f3ae79dc1f 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1207,10 +1207,10 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt if (for_input) { io_count = route->n_inputs().n_total(); - tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()).c_str()); + tooltip << string_compose (_("<b>INPUT</b> to %1"), Gtkmm2ext::markup_escape_text (route->name())); } else { 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())); } @@ -1244,12 +1244,12 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt } 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) { |