X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_audiotrack.cc;h=df0b50cbbd682b6ebc0aea2a19a46674ea7b3908;hb=3600f60a030de8bd5cca3fa983f3e926a084a1c0;hp=7e821f0e5ee67fe8680c829a27d0448d9804ad4f;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git

diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index 7e821f0e5e..df0b50cbbd 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,8 +17,9 @@
 
 */
 
-#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"
@@ -34,42 +35,11 @@ using namespace ARDOUR;
 using namespace PBD;
 
 void
-Editor::set_show_waveforms (bool yn)
-{
-	AudioTimeAxisView* atv;
-
-	if (_show_waveforms != yn) {
-		_show_waveforms = yn;
-		for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-			if ((atv = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
-				atv->set_show_waveforms (yn);
-			}
-		}
-	}
-}
-
-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);
-			}
-		}
-	}
-}
-
-gint
-Editor::start_updating ()
+Editor::start_updating_meters ()
 {
 	RouteTimeAxisView* rtv;
 
-	//cerr << "Editor::start_updating () called" << endl;//DEBUG
-	if (is_mapped() && session) {
+	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 ();
@@ -77,54 +47,34 @@ Editor::start_updating ()
 		}
 	}
 
-	if (!meters_running) {
-		fast_screen_update_connection = ARDOUR_UI::SuperRapidScreenUpdate.connect (mem_fun(*this, &Editor::fast_update_strips));
-		meters_running = true;
-	}
-    return 0;
+	meters_running = true;
 }
 
-gint
-Editor::stop_updating ()
+void
+Editor::stop_updating_meters ()
 {
 	RouteTimeAxisView* rtv;
-	
+
 	meters_running = false;
-	fast_screen_update_connection.disconnect();
-	//cerr << "Editor::stop_updating () called" << endl;//DEBUG
-	if (is_mapped() && session) {
+
+	if (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 ();
 			}
 		}
 	}
-
-    return 0;
 }
 
 void
 Editor::toggle_meter_updating()
 {
 	if (Config->get_show_track_meters()) {
-		start_updating();
+		start_updating_meters ();
 	} else {
-		stop_updating ();
-	}
-	track_canvas_allocate(track_canvas->get_allocation());
-}
-
-void
-Editor::fast_update_strips ()
-{
-	RouteTimeAxisView* rtv;
-
-	if (is_mapped() && session) {
-		for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-			if ((rtv = dynamic_cast<RouteTimeAxisView*>(*i)) != 0) {
-				rtv->fast_update ();
-			}
-		}
+		stop_updating_meters ();
 	}
+	
+	track_canvas_allocate (track_canvas->get_allocation());
 }