X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_audiotrack.cc;h=a60a25cefd1de9dbb9bc396cdfefe4c6b46024ee;hb=ce8731b32d5e91f56396cb5f6ca0798bc7fed48a;hp=00a8e1db9f7f981ba800b7e5437a0ac9d13005ca;hpb=79fc27de2ef9db51a8c7c69764b663a9921c5a40;p=ardour.git

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 00a8e1db9f..a60a25cefd 100644
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -1,66 +1,80 @@
-#include <ardour/location.h>
-#include <ardour/audio_diskstream.h>
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "ardour/rc_configuration.h"
+
+#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 "i18n.h"
+
 using namespace ARDOUR;
 using namespace PBD;
 
 void
-Editor::set_route_loop_selection ()
+Editor::start_updating_meters ()
 {
-	if (session == 0 || selection->time.empty()) {
-		return;
-	}
-
-	jack_nframes_t start = selection->time[clicked_selection].start;
-	jack_nframes_t end = selection->time[clicked_selection].end;
-
-	Location* loc = transport_loop_location();
-
-	if (loc) {
-		
-		loc->set (start, end);
+	RouteTimeAxisView* rtv;
 
-		// enable looping, reposition and start rolling
-		session->request_auto_loop (true);
-		session->request_locate (loc->start(), true);
+	if (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 ();
+			}
+		}
 	}
 
+	meters_running = true;
 }
 
 void
-Editor::set_show_waveforms (bool yn)
+Editor::stop_updating_meters ()
 {
-	AudioTimeAxisView* atv;
+	RouteTimeAxisView* rtv;
 
-	if (_show_waveforms != yn) {
-		_show_waveforms = yn;
+	meters_running = false;
+
+	if (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 ();
 			}
 		}
-		DisplayControlChanged (Editing::ShowWaveforms);
 	}
 }
 
 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);
-			}
-		}
-		DisplayControlChanged (Editing::ShowWaveformsRecording);
+	if (Config->get_show_track_meters()) {
+		start_updating_meters ();
+	} else {
+		stop_updating_meters ();
 	}
+
+	track_canvas_viewport_allocate (_track_canvas->get_allocation());
 }
+