X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audiotrack.cc;h=4693ea8790246f959b7a69ac8b74e5c9f13d8ef9;hb=refs%2Ftags%2F5.4;hp=143da8aa08c8c267f4f13d79ed265961a33330ac;hpb=c3b5e572df797fcbe474f99c7ad4f4e499cbb9c7;p=ardour.git

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 143da8aa08..4693ea8790 100644
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -17,44 +17,29 @@
 
 */
 
-#include "ardour/location.h"
-#include "ardour/audio_diskstream.h"
 #include "ardour/rc_configuration.h"
 
-#include "ardour_ui.h"
+#include "canvas/canvas.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;
 
-void
-Editor::set_show_waveforms_recording (bool yn)
-{
-	AudioTimeAxisView* atv;
-
-	if (_show_waveforms_recording != yn) {
-		_show_waveforms_recording = yn;
-		for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-			if ((atv = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-				atv->set_show_waveforms_recording (yn);
-			}
-		}
-	}
-}
-
 void
 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 ();
@@ -72,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 ();
@@ -84,12 +69,13 @@ 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 ();
 	}
-	
-	track_canvas_allocate (track_canvas->get_allocation());
+
+	track_canvas_viewport_allocate (_track_canvas->get_allocation());
 }