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, 2 insertions, 28 deletions

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 8874b47cf3..55ffac2063 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -318,10 +318,8 @@ GainMeter::update_meters ()
                 if ((*i).packed) {
                         peak = _io.peak_input_power (n);
 
-			if (_session.meter_falloff() == 0.0f || peak > (*i).meter->get_user_level()) {
-				(*i).meter->set (log_meter (peak), peak);
-			}
-
+			(*i).meter->set (log_meter (peak), peak);
+			
                         if (peak > max_peak) {
                                 max_peak = peak;
                                 /* set peak display */
@@ -334,33 +332,9 @@ GainMeter::update_meters ()
                         }
                 }
         }
-
 }
 
 void
-GainMeter::update_meters_falloff ()
-{
-	vector<MeterInfo>::iterator i;
-	uint32_t n;
-	float dbpeak;
-	
-	for (n = 0, i = meters.begin(); i != meters.end(); ++i, ++n) {
-		if ((*i).packed) {
-			// just do falloff
-			//peak = (*i).meter->get_level() * _falloff_rate;
-			dbpeak = (*i).meter->get_user_level() - _session.meter_falloff();
-
-			dbpeak = std::max(dbpeak, -200.0f);
-			
-			// cerr << "tmplevel: " << tmplevel << endl;
-			(*i).meter->set (log_meter (dbpeak), dbpeak);
-		}
-	}
-	
-}
-
-
-void
 GainMeter::meter_hold_changed()
 {
 	ENSURE_GUI_THREAD(mem_fun(*this, &GainMeter::meter_hold_changed));