Route::set_meter_point() is now conceptually RT safe, although it still takes a write lock on the processor list. this allows it to be called when setting rec-enable status on a route. not thoroughly tested, and still incomplete - single route rec-enables should probably use this pathway, and there is still no cross-thread cleanup from an RT route op request

git-svn-id: svn://localhost/ardour2/branches/3.0@6320 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 3 insertions, 11 deletions

diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index acf0c50e18..373829413c 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -66,12 +66,6 @@ Track::~Track ()
 	DEBUG_TRACE (DEBUG::Destruction, string_compose ("track %1 destructor\n", _name));
 }
 
-void
-Track::set_meter_point (MeterPoint p, void *src)
-{
-	Route::set_meter_point (p, src);
-}
-
 XMLNode&
 Track::get_state ()
 {
@@ -192,17 +186,15 @@ Track::set_record_enable (bool yn, void *src)
 
 	_diskstream->set_record_enabled (yn);
 
-#if 0
 	if (_diskstream->record_enabled()) {
-		set_meter_point (MeterInput, this);
+		if (_meter_point != MeterCustom) {
+			set_meter_point (MeterInput, this);
+		}
 	} else {
 		set_meter_point (_saved_meter_point, this);
 	}
-#endif
 
-	cerr << "4\n";
 	_rec_enable_control->Changed ();
-	cerr << "5\n";
 }