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

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 87fa8a06b8..ea703c415c 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,12 +17,15 @@
 
 */
 
-#include <ardour/location.h>
-#include <ardour/audio_diskstream.h>
+#include "ardour/location.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/rc_configuration.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"
 
@@ -32,62 +35,82 @@ using namespace ARDOUR;
 using namespace PBD;
 
 void
-Editor::set_loop_from_selection (bool play)
+Editor::set_show_waveforms_recording (bool yn)
 {
-	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"));
+	AudioTimeAxisView* atv;
 
-	if (play) {
-		session->request_play_loop (true);
-		session->request_locate (start, true);
+	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::set_punch_from_selection ()
+gint
+Editor::start_updating ()
 {
-	if (session == 0 || selection->time.empty()) {
-		return;
+	RouteTimeAxisView* rtv;
+
+	//cerr << "Editor::start_updating () called" << endl;//DEBUG
+	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 ();
+			}
+		}
 	}
 
-	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"));
+	if (!meters_running) {
+		fast_screen_update_connection = ARDOUR_UI::SuperRapidScreenUpdate.connect (sigc::mem_fun(*this, &Editor::fast_update_strips));
+		meters_running = true;
+	}
+    return 0;
 }
 
-void
-Editor::set_show_waveforms (bool yn)
+gint
+Editor::stop_updating ()
 {
-	AudioTimeAxisView* atv;
+	RouteTimeAxisView* rtv;
 
-	if (_show_waveforms != yn) {
-		_show_waveforms = yn;
+	meters_running = false;
+	fast_screen_update_connection.disconnect();
+	//cerr << "Editor::stop_updating () called" << endl;//DEBUG
+	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 ();
 			}
 		}
 	}
+
+    return 0;
 }
 
 void
-Editor::set_show_waveforms_recording (bool yn)
+Editor::toggle_meter_updating()
 {
-	AudioTimeAxisView* atv;
+	if (Config->get_show_track_meters()) {
+		start_updating();
+	} else {
+		stop_updating ();
+	}
+	track_canvas_allocate(track_canvas->get_allocation());
+}
 
-	if (_show_waveforms_recording != yn) {
-		_show_waveforms_recording = yn;
+void
+Editor::fast_update_strips ()
+{
+	RouteTimeAxisView* rtv;
+
+	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_recording (yn);
+			if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
+				rtv->fast_update ();
 			}
 		}
 	}
 }
+