a) moved metering and meter falloff code into libardour

b) added initial "big meter" mode for tranzport
c) fixed some lock issues in ARDOUR::IO objects
d) generic_midi control surface module now compiles and loads


git-svn-id: svn://localhost/trunk/ardour2@450 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 0 insertions, 29 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 79c81992dc..846eca6096 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -497,27 +497,12 @@ ARDOUR_UI::every_second ()
 	update_cpu_load ();
 	update_buffer_load ();
 	update_disk_space ();
-	// update_disk_rate ();
 	return TRUE;
 }
 
 gint
 ARDOUR_UI::every_point_one_seconds ()
 {
-	struct timeval now;
-	struct timeval diff;
-	
-	/* do not attempt to grab peak power more than once per cycle.
-	 */
-
-	gettimeofday (&now, 0);
-	timersub (&now, &last_peak_grab, &diff);
-
-	if ((diff.tv_usec + (diff.tv_sec * 1000000)) >= engine->usecs_per_cycle()) {
-		IO::GrabPeakPower(); /* EMIT_SIGNAL */
-		last_peak_grab = now;
-	} 
-
 	update_speed_display ();
 	RapidScreenUpdate(); /* EMIT_SIGNAL */
 	return TRUE;
@@ -568,20 +553,6 @@ ARDOUR_UI::update_cpu_load ()
 }
 
 void
-ARDOUR_UI::update_disk_rate ()
-{
-	char buf[64];
-
-	if (session) {
-		snprintf (buf, sizeof (buf), _("Disk r:%5.1f w:%5.1f MB/s"), 
-			  session->read_data_rate()/1048576.0f, session->write_data_rate()/1048576.0f);
-		disk_rate_label.set_text (buf);
-	} else {
-		disk_rate_label.set_text ("");
-	}
-}
-
-void
 ARDOUR_UI::update_buffer_load ()
 {
 	char buf[64];