add left/right side trim cursors and use them for region trimming, as appropriate

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

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 5861e5ea2c70d3c0858b05c0e609bda92b45da7c..cb8dc539a24e3063cec8af3ddcd262e25b08d6a3 100644 (file)
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -446,7 +446,7 @@ Delivery::flush (nframes_t nframes, nframes64_t time)
        /* io_lock, not taken: function must be called from Session::process() calltree */
 
        PortSet& ports (_output->ports());
-
+        
        for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
                (*i).flush_buffers (nframes, time, _output_offset);
        }
@@ -481,8 +481,6 @@ Delivery::target_gain ()
                return 0.0;
        }
 
-       gain_t desired_gain = -1.0f;
-
         MuteMaster::MutePoint mp;
         
         switch (_role) {
@@ -495,13 +493,15 @@ Delivery::target_gain ()
         case Send:
         case Insert:
         case Aux:
-                /* XXX FIX ME this is wrong, we need per-delivery muting */
-                mp = MuteMaster::PreFader;
+               if (_pre_fader) {
+                       mp = MuteMaster::PreFader;
+               } else {
+                       mp = MuteMaster::PostFader;
+               }
                 break;
         }
 
-        // cerr << name() << ' ';
-        desired_gain = _mute_master->mute_gain_at (mp);
+        gain_t desired_gain = _mute_master->mute_gain_at (mp);
         
         if (_role == Listen && _session.monitor_out() && !_session.listening()) {