X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audiotrack.cc;h=b6ba2074d46606fad6f9652dddf0f84aca228faf;hb=eeb20bc392c1aae0545010c6fcf2c7096bb9c650;hp=87fa8a06b854deac76e4cfa4861f0e64a27f1684;hpb=f7f9d6fdc40248b190ec9c6e1a886261d55777ae;p=ardour.git

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 87fa8a06b8..b6ba2074d4 100644
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,14 +17,17 @@
 
 */
 
-#include <ardour/location.h>
-#include <ardour/audio_diskstream.h>
+#include "ardour/rc_configuration.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"
 
@@ -32,62 +35,47 @@ using namespace ARDOUR;
 using namespace PBD;
 
 void
-Editor::set_loop_from_selection (bool play)
+Editor::start_updating_meters ()
 {
-	if (session == 0 || selection->time.empty()) {
-		return;
-	}
-
-	nframes_t start = selection->time[clicked_selection].start;
-	nframes_t end = selection->time[clicked_selection].end;
-	
-	set_loop_range (start, end,  _("set loop range from selection"));
+	RouteTimeAxisView* rtv;
 
-	if (play) {
-		session->request_play_loop (true);
-		session->request_locate (start, true);
-	}
-}
-
-void
-Editor::set_punch_from_selection ()
-{
-	if (session == 0 || selection->time.empty()) {
-		return;
+	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 ();
+			}
+		}
 	}
 
-	nframes_t start = selection->time[clicked_selection].start;
-	nframes_t end = selection->time[clicked_selection].end;
-	
-	set_punch_range (start, end,  _("set punch range from selection"));
+	meters_running = true;
 }
 
 void
-Editor::set_show_waveforms (bool yn)
+Editor::stop_updating_meters ()
 {
-	AudioTimeAxisView* atv;
+	RouteTimeAxisView* rtv;
+
+	meters_running = false;
 
-	if (_show_waveforms != yn) {
-		_show_waveforms = yn;
+	if (contents().is_mapped() && _session) {
 		for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-			if ((atv = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-				atv->set_show_waveforms (yn);
+			if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
+				rtv->hide_meter ();
 			}
 		}
 	}
 }
 
 void
-Editor::set_show_waveforms_recording (bool yn)
+Editor::toggle_meter_updating()
 {
-	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);
-			}
-		}
+	DisplaySuspender ds;
+	if (UIConfiguration::instance().get_show_track_meters()) {
+		start_updating_meters ();
+	} else {
+		stop_updating_meters ();
 	}
+
+	track_canvas_viewport_allocate (_track_canvas->get_allocation());
 }
+