X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_audiotrack.cc;h=997bf41a3ffd2107b7860d86f40006aba687b0ff;hb=2d81a5636dcf5532769a1bf4ddaafb2fa91b990a;hp=6c74146d754884230a56c6378236dc9681d936ab;hpb=666e0870554705f4fb466fc6b188fe9b4000ca49;p=ardour.git

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 6c74146d75..997bf41a3f 100644
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -17,67 +17,99 @@
 
 */
 
-#include <ardour/location.h>
-#include <ardour/audio_diskstream.h>
+#include "ardour/location.h"
+#include "ardour/audio_diskstream.h"
 
+#include "ardour_ui.h"
 #include "editor.h"
 #include "editing.h"
 #include "audio_time_axis.h"
-#include "region_view.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::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;
+	AudioTimeAxisView* atv;
 
-	Location* loc = transport_loop_location();
+	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);
+			}
+		}
+	}
+}
 
-	if (loc) {
-		
-		loc->set (start, end);
+gint
+Editor::start_updating ()
+{
+	RouteTimeAxisView* rtv;
 
-		// enable looping, reposition and start rolling
-		session->request_play_loop (true);
-		session->request_locate (loc->start(), true);
+	//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 ();
+			}
+		}
 	}
 
+	if (!meters_running) {
+		fast_screen_update_connection = ARDOUR_UI::SuperRapidScreenUpdate.connect (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;
-
-	if (_show_waveforms != yn) {
-		_show_waveforms = yn;
+	RouteTimeAxisView* rtv;
+	
+	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 ();
 			}
 		}
 	}
 }
+