Fix various tooltip markup (ampersand) entity-escape:

[ardour.git] / gtk2_ardour / editor_audiotrack.cc

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index b569037ccc636b6ede64b1522f6ee07cf85afe60..4693ea8790246f959b7a69ac8b74e5c9f13d8ef9 100644 (file)
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -29,7 +29,7 @@
 #include "selection.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -39,7 +39,7 @@ Editor::start_updating_meters ()
 {
        RouteTimeAxisView* rtv;
 
-       if (is_mapped() && _session) {
+       if (contents().is_mapped() && _session) {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                                rtv->reset_meter ();
@@ -57,7 +57,7 @@ Editor::stop_updating_meters ()
 
        meters_running = false;
 
-       if (is_mapped() && _session) {
+       if (contents().is_mapped() && _session) {
                for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                        if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
                                rtv->hide_meter ();