X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_track.cc;h=8f83c19161ca6d843dcbb6b5cfa61872e532dceb;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=1b544bfb57f0a9dd19d046816d0158423ec65f17;hpb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;p=ardour.git

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 1b544bfb57..8f83c19161 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -44,7 +44,7 @@
 #include "ardour/source.h"
 #include "ardour/utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -375,16 +375,6 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 		return dret;
 	}
 
-	if (_mute_control->list() && _mute_control->automation_playback()) {
-		bool        valid = false;
-		const float mute  = _mute_control->list()->rt_safe_eval(transport_frame, valid);
-		if (mute >= 0.5 && !muted()) {
-			_mute_control->set_value_unchecked(1.0);  // mute
-		} else if (mute < 0.5 && muted()) {
-			_mute_control->set_value_unchecked(0.0);  // unmute
-		}
-	}
-
 	_silent = false;
 	_amp->apply_gain_automation(false);
 
@@ -393,7 +383,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 	fill_buffers_with_input (bufs, _input, nframes);
 
 	if (_meter_point == MeterInput && ((_monitoring_control->monitoring_choice() & MonitorInput) || _diskstream->record_enabled())) {
-		_meter->run (bufs, start_frame, end_frame, nframes, true);
+		_meter->run (bufs, start_frame, end_frame, 1.0 /*speed()*/, nframes, true);
 	}
 
 	if ((dret = diskstream->process (bufs, transport_frame, nframes, playback_distance, (monitoring_state() == MonitoringDisk))) != 0) {