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 eaf58c0a9bca120ba15eef119a4cdd4417090d9e..cb8dc539a24e3063cec8af3ddcd262e25b08d6a3 100644 (file)
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -55,8 +55,6 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Mute
        , _current_gain (1.0)
        , _output_offset (0)
        , _no_outs_cuz_we_no_monitor (false)
-       , _solo_level (0)
-       , _solo_isolated (false)
        , _mute_master (mm)
        , no_panner_reset (false)
 {
@@ -79,8 +77,6 @@ Delivery::Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const string&
        , _current_gain (1.0)
        , _output_offset (0)
        , _no_outs_cuz_we_no_monitor (false)
-       , _solo_level (0)
-       , _solo_isolated (false)
        , _mute_master (mm)
        , no_panner_reset (false)
 {
@@ -255,7 +251,6 @@ Delivery::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nfra
        tgain = target_gain ();
 
        if (tgain != _current_gain) {
-
                /* target gain has changed */
 
                Amp::apply_gain (bufs, nframes, _current_gain, tgain);
@@ -290,15 +285,18 @@ Delivery::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nfra
                }
 
        } else {
+
                // Do a 1:1 copy of data to output ports
 
                if (bufs.count().n_audio() > 0 && ports.count().n_audio () > 0) {
                        _output->copy_to_outputs (bufs, DataType::AUDIO, nframes, _output_offset);
-               }
+                }
 
                if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
                        _output->copy_to_outputs (bufs, DataType::MIDI, nframes, _output_offset);
                }
+                
+                        
        }
 
   out:
@@ -448,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);
        }
@@ -483,49 +481,38 @@ Delivery::target_gain ()
                return 0.0;
        }
 
-       gain_t desired_gain = -1.0f;
-
-        if (_solo_level) {
-
-               desired_gain = 1.0;
-
-        } else {
-
-                if (_role == Listen && _session.monitor_out() && !_session.soloing()) {
-
-                        /* nobody is soloed, so control/monitor/listen bus gets its
-                           signal from master out, we should be silent
-                        */
-                        desired_gain = 0.0;
+        MuteMaster::MutePoint mp;
+        
+        switch (_role) {
+        case Main:
+                mp = MuteMaster::Main;
+                break;
+        case Listen:
+                mp = MuteMaster::Listen;
+                break;
+        case Send:
+        case Insert:
+        case Aux:
+               if (_pre_fader) {
+                       mp = MuteMaster::PreFader;
+               } else {
+                       mp = MuteMaster::PostFader;
+               }
+                break;
+        }
 
-                } else {
+        gain_t desired_gain = _mute_master->mute_gain_at (mp);
+        
+        if (_role == Listen && _session.monitor_out() && !_session.listening()) {
                 
-                        MuteMaster::MutePoint mp;
+                /* nobody is soloed, and this delivery is a listen-send to the
+                   control/monitor/listen bus, we should be silent since
+                   it gets its signal from the master out.
+                */
                 
-                        switch (_role) {
-                        case Main:
-                                mp = MuteMaster::Main;
-                                break;
-                        case Listen:
-                                mp = MuteMaster::Listen;
-                                break;
-                        case Send:
-                        case Insert:
-                        case Aux:
-                                /* XXX FIX ME this is wrong, we need per-delivery muting */
-                                mp = MuteMaster::PreFader;
-                                break;
-                        }
-                        
-                        if (!_solo_isolated && _session.soloing()) {
-                                desired_gain = min (Config->get_solo_mute_gain(), _mute_master->mute_gain_at (mp));
-                                
-                        } else {
-                                
-                                desired_gain = _mute_master->mute_gain_at (mp);
-                        }
-                }
-        }
+                desired_gain = 0.0;
+                
+        } 
 
        return desired_gain;
 }