X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audiotrack.cc;h=4693ea8790246f959b7a69ac8b74e5c9f13d8ef9;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=a60a25cefd1de9dbb9bc396cdfefe4c6b46024ee;hpb=97c68cc2b1f302521244e139a8a49019702038e7;p=ardour.git

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index a60a25cefd..4693ea8790 100644
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -21,15 +21,15 @@
 
 #include "canvas/canvas.h"
 
-#include "ardour_ui.h"
 #include "editor.h"
 #include "editing.h"
 #include "audio_time_axis.h"
 #include "route_time_axis.h"
 #include "audio_region_view.h"
 #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 ();
@@ -69,7 +69,8 @@ Editor::stop_updating_meters ()
 void
 Editor::toggle_meter_updating()
 {
-	if (Config->get_show_track_meters()) {
+	DisplaySuspender ds;
+	if (UIConfiguration::instance().get_show_track_meters()) {
 		start_updating_meters ();
 	} else {
 		stop_updating_meters ();