use C++ for PortManager::make_port_name_relative()

[ardour.git] / libs / ardour / amp.cc

diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc
index b7e639b9f5fdb357b833c30f2cd086d45abc2cd4..c62bb7ff69574c86271825777d2a1bad85175b2c 100644 (file)
--- a/libs/ardour/amp.cc
+++ b/libs/ardour/amp.cc
@@ -59,7 +59,7 @@ Amp::Amp (Session& s, std::string type)
 std::string
 Amp::display_name() const
 {
-       return _("Fader");
+       return _type == "trim" ? _("Trim") : _("Fader");
 }
 
 bool
@@ -133,19 +133,9 @@ Amp::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_frame*/,
 
                                _current_gain = Amp::apply_gain (bufs, _session.nominal_frame_rate(), nframes, _current_gain, dg, _midi_amp);
 
-                       } else if (_current_gain == GAIN_COEFF_ZERO) {
-
-                               /* gain has not changed, and is zero. small
-                                * optimization here.
-                                */
-
-                               bufs.silence (nframes, 0);
-
                        } else if (_current_gain != GAIN_COEFF_UNITY) {
 
-                               /* gain has not changed, but its non-unity and
-                                * isn't zero, so we have to do something
-                                */
+                               /* gain has not changed, but its non-unity */
 
                                if (_midi_amp) {
                                        /* don't Trim midi velocity -- only relevant for Midi on Audio tracks */