various fixes to named selection mgmt and display, plus fixes for xfade mgmt and...
[ardour.git] / libs / ardour / route.cc
index b47981a47eff732c1025dd838eb33c368ec441c1..a322c10068bf81fd9719441440baed3691e5dc1b 100644 (file)
@@ -24,6 +24,7 @@
 
 #include <sigc++/bind.h>
 #include <pbd/xml++.h>
+#include <pbd/enumwriter.h>
 
 #include <ardour/timestamps.h>
 #include <ardour/buffer.h>
@@ -55,19 +56,19 @@ uint32_t Route::order_key_cnt = 0;
 Route::Route (Session& sess, string name, int input_min, int input_max, int output_min, int output_max, Flag flg, DataType default_type)
        : IO (sess, name, input_min, input_max, output_min, output_max, default_type),
          _flags (flg),
-         _solo_control (*this, ToggleControllable::SoloControl),
-         _mute_control (*this, ToggleControllable::MuteControl)
+         _solo_control (X_("solo"), *this, ToggleControllable::SoloControl),
+         _mute_control (X_("mute"), *this, ToggleControllable::MuteControl)
 {
        init ();
 }
 
-Route::Route (Session& sess, const XMLNode& node)
-       : IO (sess, "route"),
-         _solo_control (*this, ToggleControllable::SoloControl),
-         _mute_control (*this, ToggleControllable::MuteControl)
+Route::Route (Session& sess, const XMLNode& node, DataType default_type)
+       : IO (sess, *node.child ("IO"), default_type),
+         _solo_control (X_("solo"), *this, ToggleControllable::SoloControl),
+         _mute_control (X_("mute"), *this, ToggleControllable::MuteControl)
 {
        init ();
-       set_state (node);
+       _set_state (node, false);
 }
 
 void
@@ -89,7 +90,8 @@ Route::init ()
        _declickable = false;
        _pending_declick = true;
        _remote_control_id = 0;
-
+       _ignore_gain_on_deliver = true;
+       
        _edit_group = 0;
        _mix_group = 0;
 
@@ -111,7 +113,6 @@ Route::init ()
 
 Route::~Route ()
 {
-       GoingAway (); /* EMIT SIGNAL */
        clear_redirects (this);
 
        if (_control_outs) {
@@ -216,8 +217,8 @@ Route::set_gain (gain_t val, void *src)
 
 void
 Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
-                              jack_nframes_t start_frame, jack_nframes_t end_frame, 
-                              jack_nframes_t nframes, jack_nframes_t offset, bool with_redirects, int declick,
+                              nframes_t start_frame, nframes_t end_frame, 
+                              nframes_t nframes, nframes_t offset, bool with_redirects, int declick,
                               bool meter)
 {
        uint32_t n;
@@ -229,9 +230,18 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
        IO *co;
        bool mute_audible;
        bool solo_audible;
-       bool no_monitor = (Config->get_use_hardware_monitoring() || !Config->get_use_sw_monitoring ());
+       bool no_monitor;
        gain_t* gab = _session.gain_automation_buffer();
 
+       switch (Config->get_monitoring_model()) {
+       case HardwareMonitoring:
+       case ExternalMonitoring:
+               no_monitor = true;
+               break;
+       default:
+               no_monitor = false;
+       }
+
        declick = _pending_declick;
 
        {
@@ -263,17 +273,17 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
           -------------------------------------------------------------------------------------------------- */
 
        if (declick > 0) {
-               apply_declick (bufs, nbufs, nframes, 0.0, 1.0, _phase_invert);
+               apply_declick (bufs, nbufs, nframes, 0.0, 1.0, false);
                _pending_declick = 0;
        } else if (declick < 0) {
-               apply_declick (bufs, nbufs, nframes, 1.0, 0.0, _phase_invert);
+               apply_declick (bufs, nbufs, nframes, 1.0, 0.0, false);
                _pending_declick = 0;
        } else {
 
                /* no global declick */
 
                if (solo_gain != dsg) {
-                       apply_declick (bufs, nbufs, nframes, solo_gain, dsg, _phase_invert);
+                       apply_declick (bufs, nbufs, nframes, solo_gain, dsg, false);
                        solo_gain = dsg;
                }
        }
@@ -290,7 +300,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
        }
 
        if (!_soloed && _mute_affects_pre_fader && (mute_gain != dmg)) {
-               apply_declick (bufs, nbufs, nframes, mute_gain, dmg, _phase_invert);
+               apply_declick (bufs, nbufs, nframes, mute_gain, dmg, false);
                mute_gain = dmg;
                mute_declick_applied = true;
        }
@@ -312,7 +322,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                        
                        // TODO: this is probably wrong
 
-                       (no_monitor && record_enabled() && (!_session.get_auto_input() || _session.actively_recording()))
+                       (no_monitor && record_enabled() && (!Config->get_auto_input() || _session.actively_recording()))
 
                        ) {
                        
@@ -336,7 +346,13 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                                for (i = _redirects.begin(); i != _redirects.end(); ++i) {
                                        switch ((*i)->placement()) {
                                        case PreFader:
-                                               (*i)->run (bufs, nbufs, nframes, offset);
+                                               if (dsg == 0) {
+                                                       if (boost::dynamic_pointer_cast<Send>(*i) || boost::dynamic_pointer_cast<PortInsert>(*i)) {
+                                                               (*i)->silence (nframes, offset);
+                                                       }
+                                               } else {
+                                                       (*i)->run (bufs, nbufs, nframes, offset);
+                                               }
                                                break;
                                        case PostFader:
                                                post_fader_work = true;
@@ -360,7 +376,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
 
 
        if (!_soloed && (mute_gain != dmg) && !mute_declick_applied && _mute_affects_post_fader) {
-               apply_declick (bufs, nbufs, nframes, mute_gain, dmg, _phase_invert);
+               apply_declick (bufs, nbufs, nframes, mute_gain, dmg, false);
                mute_gain = dmg;
                mute_declick_applied = true;
        }
@@ -391,7 +407,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                        
                        // rec-enabled but not s/w monitoring 
                        
-                       (no_monitor && record_enabled() && (!_session.get_auto_input() || _session.actively_recording()))
+                       (no_monitor && record_enabled() && (!Config->get_auto_input() || _session.actively_recording()))
 
                        ) {
                        
@@ -418,11 +434,11 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                
                // h/w monitoring not in use 
                
-               (!Config->get_use_hardware_monitoring() && 
+               (!Config->get_monitoring_model() == HardwareMonitoring && 
 
                 // AND software monitoring required
 
-                Config->get_use_sw_monitoring())) { 
+                Config->get_monitoring_model() == SoftwareMonitoring)) { 
                
                if (apply_gain_automation) {
                        
@@ -430,7 +446,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                                for (n = 0; n < nbufs; ++n)  {
                                        Sample *sp = bufs[n];
                                        
-                                       for (jack_nframes_t nx = 0; nx < nframes; ++nx) {
+                                       for (nframes_t nx = 0; nx < nframes; ++nx) {
                                                sp[nx] *= -gab[nx];
                                        }
                                }
@@ -438,7 +454,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                                for (n = 0; n < nbufs; ++n) {
                                        Sample *sp = bufs[n];
                                        
-                                       for (jack_nframes_t nx = 0; nx < nframes; ++nx) {
+                                       for (nframes_t nx = 0; nx < nframes; ++nx) {
                                                sp[nx] *= gab[nx];
                                        }
                                }
@@ -475,7 +491,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                                
                                for (n = 0; n < nbufs; ++n) {
                                        Sample *sp = bufs[n];
-                                       apply_gain_to_buffer(sp,nframes,this_gain);
+                                       Session::apply_gain_to_buffer(sp,nframes,this_gain);
                                }
 
                        } else if (_gain == 0) {
@@ -507,7 +523,13 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                                        case PreFader:
                                                break;
                                        case PostFader:
-                                               (*i)->run (bufs, nbufs, nframes, offset);
+                                               if (dsg == 0) {
+                                                       if (boost::dynamic_pointer_cast<Send>(*i) || boost::dynamic_pointer_cast<PortInsert>(*i)) {
+                                                               (*i)->silence (nframes, offset);
+                                                       }
+                                               } else {
+                                                       (*i)->run (bufs, nbufs, nframes, offset);
+                                               }
                                                break;
                                        }
                                }
@@ -526,7 +548,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
        }
 
        if (!_soloed && (mute_gain != dmg) && !mute_declick_applied && _mute_affects_control_outs) {
-               apply_declick (bufs, nbufs, nframes, mute_gain, dmg, _phase_invert);
+               apply_declick (bufs, nbufs, nframes, mute_gain, dmg, false);
                mute_gain = dmg;
                mute_declick_applied = true;
        }
@@ -554,7 +576,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
 
                    // recording but not s/w monitoring 
                        
-                       (no_monitor && record_enabled() && (!_session.get_auto_input() || _session.actively_recording()))
+                       (no_monitor && record_enabled() && (!Config->get_auto_input() || _session.actively_recording()))
 
                        ) {
 
@@ -571,7 +593,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
           ----------------------------------------------------------------------*/
 
        if (!_soloed && (mute_gain != dmg) && !mute_declick_applied && _mute_affects_main_outs) {
-               apply_declick (bufs, nbufs, nframes, mute_gain, dmg, _phase_invert);
+               apply_declick (bufs, nbufs, nframes, mute_gain, dmg, false);
                mute_gain = dmg;
                mute_declick_applied = true;
        }
@@ -587,7 +609,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
            
            /* relax */
 
-       } else if (no_monitor && record_enabled() && (!_session.get_auto_input() || _session.actively_recording())) {
+       } else if (no_monitor && record_enabled() && (!Config->get_auto_input() || _session.actively_recording())) {
                
                IO::silence (nframes, offset);
                
@@ -599,7 +621,7 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                    
                    // muted by solo of another track, but not using control outs for solo
 
-                   (!solo_audible && (_session.solo_model() != Session::SoloBus)) ||
+                   (!solo_audible && (Config->get_solo_model() != SoloBus)) ||
                    
                    // muted by mute of this track
 
@@ -619,7 +641,9 @@ Route::process_output_buffers (vector<Sample*>& bufs, uint32_t nbufs,
                        
                } else {
                        
-                       if (_session.transport_speed() > 1.5f || _session.transport_speed() < -1.5f) {
+                       if ((_session.transport_speed() > 1.5f || 
+                            _session.transport_speed() < -1.5f) &&
+                           Config->get_quieten_at_speed()) {
                                pan (bufs, nbufs, nframes, offset, speed_quietning); 
                        } else {
                                // cerr << _name << " panner state = " << _panner->automation_state() << endl;
@@ -664,7 +688,7 @@ Route::n_process_buffers ()
 
 void
 
-Route::passthru (jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t nframes, jack_nframes_t offset, int declick, bool meter_first)
+Route::passthru (nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset, int declick, bool meter_first)
 {
        vector<Sample*>& bufs = _session.get_passthru_buffers();
        uint32_t limit = n_process_buffers ();
@@ -806,7 +830,10 @@ Route::add_redirect (boost::shared_ptr<Redirect> redirect, void *src, uint32_t*
                        _peak_power.push_back(0);
                }
                while (_visible_peak_power.size() < potential_max_streams) {
-                       _visible_peak_power.push_back(0);
+                       _visible_peak_power.push_back(-INFINITY);
+               }
+               while (_max_peak_power.size() < potential_max_streams) {
+                       _max_peak_power.push_back(-INFINITY);
                }
 
                _redirects.push_back (redirect);
@@ -864,7 +891,10 @@ Route::add_redirects (const RedirectList& others, void *src, uint32_t* err_strea
                                _peak_power.push_back(0);
                        }
                        while (_visible_peak_power.size() < potential_max_streams) {
-                               _visible_peak_power.push_back(0);
+                               _visible_peak_power.push_back(-INFINITY);
+                       }
+                       while (_max_peak_power.size() < potential_max_streams) {
+                               _max_peak_power.push_back(-INFINITY);
                        }
 
                        _redirects.push_back (*i);
@@ -900,6 +930,10 @@ Route::clear_redirects (void *src)
 
        {
                Glib::RWLock::WriterLock lm (redirect_lock);
+               RedirectList::iterator i;
+               for (i = _redirects.begin(); i != _redirects.end(); ++i) {
+                       (*i)->drop_references ();
+               }
                _redirects.clear ();
        }
 
@@ -996,6 +1030,8 @@ Route::remove_redirect (boost::shared_ptr<Redirect> redirect, void *src, uint32_
                reset_panner ();
        }
 
+       redirect->drop_references ();
+
        redirects_changed (src); /* EMIT SIGNAL */
        return 0;
 }
@@ -1015,7 +1051,7 @@ Route::_reset_plugin_counts (uint32_t* err_streams)
        uint32_t i_cnt;
        uint32_t s_cnt;
        map<Placement,list<InsertCount> > insert_map;
-       jack_nframes_t initial_streams;
+       nframes_t initial_streams;
 
        redirect_max_outs = 0;
        i_cnt = 0;
@@ -1324,13 +1360,11 @@ XMLNode&
 Route::state(bool full_state)
 {
        XMLNode *node = new XMLNode("Route");
-       XMLNode *aevents;
        RedirectList:: iterator i;
        char buf[32];
 
        if (_flags) {
-               snprintf (buf, sizeof (buf), "0x%x", _flags);
-               node->add_property("flags", buf);
+               node->add_property("flags", enum_2_string (_flags));
        }
        
        node->add_property("default-type", _default_type.to_string());
@@ -1371,6 +1405,8 @@ Route::state(bool full_state)
        node->add_property ("order-keys", order_string);
 
        node->add_child_nocopy (IO::state (full_state));
+       node->add_child_nocopy (_solo_control.get_state ());
+       node->add_child_nocopy (_mute_control.get_state ());
 
        if (_control_outs) {
                XMLNode* cnode = new XMLNode (X_("ControlOuts"));
@@ -1383,26 +1419,6 @@ Route::state(bool full_state)
                cmt->add_content (_comment);
        }
 
-       if (full_state) {
-               string path;
-
-               path = _session.snap_name();
-               path += "-gain-";
-               path += legalize_for_path (_name);
-               path += ".automation";
-
-               /* XXX we didn't ask for a state save, we asked for the current state.
-                  FIX ME!
-               */
-
-               if (save_automation (path)) {
-                       error << _("Could not get state of route.  Problem with save_automation") << endmsg;
-               }
-
-               aevents = node->add_child ("Automation");
-               aevents->add_property ("path", path);
-       }       
-
        for (i = _redirects.begin(); i != _redirects.end(); ++i) {
                node->add_child_nocopy((*i)->state (full_state));
        }
@@ -1489,6 +1505,12 @@ Route::add_redirect_from_xml (const XMLNode& node)
 
 int
 Route::set_state (const XMLNode& node)
+{
+       return _set_state (node, true);
+}
+
+int
+Route::_set_state (const XMLNode& node, bool call_base)
 {
        XMLNodeList nlist;
        XMLNodeConstIterator niter;
@@ -1501,28 +1523,26 @@ Route::set_state (const XMLNode& node)
                return -1;
        }
 
-       if ((prop = node.property ("flags")) != 0) {
-               int x;
-               sscanf (prop->value().c_str(), "0x%x", &x);
-               _flags = Flag (x);
+       if ((prop = node.property (X_("flags"))) != 0) {
+               _flags = Flag (string_2_enum (prop->value(), _flags));
        } else {
                _flags = Flag (0);
        }
        
-       if ((prop = node.property ("default-type")) != 0) {
+       if ((prop = node.property (X_("default-type"))) != 0) {
                _default_type = DataType(prop->value());
                assert(_default_type != DataType::NIL);
        }
 
-       if ((prop = node.property ("phase-invert")) != 0) {
+       if ((prop = node.property (X_("phase-invert"))) != 0) {
                set_phase_invert(prop->value()=="yes"?true:false, this);
        }
 
-       if ((prop = node.property ("active")) != 0) {
+       if ((prop = node.property (X_("active"))) != 0) {
                set_active (prop->value() == "yes");
        }
 
-       if ((prop = node.property ("muted")) != 0) {
+       if ((prop = node.property (X_("muted"))) != 0) {
                bool yn = prop->value()=="yes"?true:false; 
 
                /* force reset of mute status */
@@ -1532,7 +1552,7 @@ Route::set_state (const XMLNode& node)
                mute_gain = desired_mute_gain;
        }
 
-       if ((prop = node.property ("soloed")) != 0) {
+       if ((prop = node.property (X_("soloed"))) != 0) {
                bool yn = prop->value()=="yes"?true:false; 
 
                /* force reset of solo status */
@@ -1542,23 +1562,23 @@ Route::set_state (const XMLNode& node)
                solo_gain = desired_solo_gain;
        }
 
-       if ((prop = node.property ("mute-affects-pre-fader")) != 0) {
+       if ((prop = node.property (X_("mute-affects-pre-fader"))) != 0) {
                _mute_affects_pre_fader = (prop->value()=="yes")?true:false;
        }
 
-       if ((prop = node.property ("mute-affects-post-fader")) != 0) {
+       if ((prop = node.property (X_("mute-affects-post-fader"))) != 0) {
                _mute_affects_post_fader = (prop->value()=="yes")?true:false;
        }
 
-       if ((prop = node.property ("mute-affects-control-outs")) != 0) {
+       if ((prop = node.property (X_("mute-affects-control-outs"))) != 0) {
                _mute_affects_control_outs = (prop->value()=="yes")?true:false;
        }
 
-       if ((prop = node.property ("mute-affects-main-outs")) != 0) {
+       if ((prop = node.property (X_("mute-affects-main-outs"))) != 0) {
                _mute_affects_main_outs = (prop->value()=="yes")?true:false;
        }
 
-       if ((prop = node.property ("edit-group")) != 0) {
+       if ((prop = node.property (X_("edit-group"))) != 0) {
                RouteGroup* edit_group = _session.edit_group_by_name(prop->value());
                if(edit_group == 0) {
                        error << string_compose(_("Route %1: unknown edit group \"%2 in saved state (ignored)"), _name, prop->value()) << endmsg;
@@ -1567,7 +1587,7 @@ Route::set_state (const XMLNode& node)
                }
        }
 
-       if ((prop = node.property ("order-keys")) != 0) {
+       if ((prop = node.property (X_("order-keys"))) != 0) {
 
                long n;
 
@@ -1604,7 +1624,7 @@ Route::set_state (const XMLNode& node)
                delete deferred_state;
        }
 
-       deferred_state = new XMLNode("deferred state");
+       deferred_state = new XMLNode(X_("deferred state"));
 
        /* set parent class properties before anything else */
 
@@ -1612,7 +1632,7 @@ Route::set_state (const XMLNode& node)
 
                child = *niter;
 
-               if (child->name() == IO::state_node_name) {
+               if (child->name() == IO::state_node_name && call_base) {
 
                        IO::set_state (*child);
                        break;
@@ -1623,7 +1643,7 @@ Route::set_state (const XMLNode& node)
 
                child = *niter;
                        
-               if (child->name() == "Send") {
+               if (child->name() == X_("Send")) {
 
 
                        if (!IO::ports_legal) {
@@ -1634,7 +1654,7 @@ Route::set_state (const XMLNode& node)
                                add_redirect_from_xml (*child);
                        }
 
-               } else if (child->name() == "Insert") {
+               } else if (child->name() == X_("Insert")) {
                        
                        if (!IO::ports_legal) {
                                
@@ -1645,21 +1665,13 @@ Route::set_state (const XMLNode& node)
                                add_redirect_from_xml (*child);
                        }
 
-               } else if (child->name() == "Automation") {
-
-                       XMLPropertyList plist;
-                       XMLPropertyConstIterator piter;
-                       XMLProperty *prop;
+               } else if (child->name() == X_("Automation")) {
                        
-                       plist = child->properties();
-                       for (piter = plist.begin(); piter != plist.end(); ++piter) {
-                               prop = *piter;
-                               if (prop->name() == "path") {
-                                       load_automation (prop->value());
-                               }
+                       if ((prop = child->property (X_("path"))) != 0)  {
+                               load_automation (prop->value());
                        }
 
-               } else if (child->name() == "ControlOuts") {
+               } else if (child->name() == X_("ControlOuts")) {
                        
                        string coutname = _name;
                        coutname += _("[control]");
@@ -1667,19 +1679,25 @@ Route::set_state (const XMLNode& node)
                        _control_outs = new IO (_session, coutname);
                        _control_outs->set_state (**(child->children().begin()));
 
-               } else if (child->name() == "Comment") {
+               } else if (child->name() == X_("Comment")) {
 
                        /* XXX this is a terrible API design in libxml++ */
 
                        XMLNode *cmt = *(child->children().begin());
                        _comment = cmt->content();
 
-               } else if (child->name() == "extra") {
+               } else if (child->name() == X_("extra")) {
                        _extra_xml = new XMLNode (*child);
+               } else if (child->name() == X_("solo")) {
+                       _solo_control.set_state (*child);
+                       _session.add_controllable (&_solo_control);
+               } else if (child->name() == X_("mute")) {
+                       _mute_control.set_state (*child);
+                       _session.add_controllable (&_mute_control);
                }
        }
 
-       if ((prop = node.property ("mix-group")) != 0) {
+       if ((prop = node.property (X_("mix-group"))) != 0) {
                RouteGroup* mix_group = _session.mix_group_by_name(prop->value());
                if (mix_group == 0) {
                        error << string_compose(_("Route %1: unknown mix group \"%2 in saved state (ignored)"), _name, prop->value()) << endmsg;
@@ -1699,7 +1717,7 @@ Route::curve_reallocate ()
 }
 
 void
-Route::silence (jack_nframes_t nframes, jack_nframes_t offset)
+Route::silence (nframes_t nframes, nframes_t offset)
 {
        if (!_silent) {
 
@@ -1936,7 +1954,7 @@ Route::set_active (bool yn)
 void
 Route::handle_transport_stopped (bool abort_ignored, bool did_locate, bool can_flush_redirects)
 {
-       jack_nframes_t now = _session.transport_frame();
+       nframes_t now = _session.transport_frame();
 
        {
                Glib::RWLock::ReaderLock lm (redirect_lock);
@@ -1961,19 +1979,6 @@ Route::handle_transport_stopped (bool abort_ignored, bool did_locate, bool can_f
        _roll_delay = _initial_delay;
 }
 
-UndoAction
-Route::get_memento() const
-{
-       void (Route::*pmf)(state_id_t) = &Route::set_state;
-       return sigc::bind (mem_fun (*(const_cast<Route *>(this)), pmf), _current_state_id);
-}
-
-void
-Route::set_state (state_id_t id)
-{
-       return;
-}
-
 void
 Route::input_change_handler (IOChange change, void *ignored)
 {
@@ -2005,7 +2010,7 @@ Route::pans_required () const
 }
 
 int 
-Route::no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, 
+Route::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, 
                   bool session_state_changing, bool can_record, bool rec_monitors_input)
 {
        if (n_outputs() == 0) {
@@ -2028,8 +2033,8 @@ Route::no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes
        return 0;
 }
 
-jack_nframes_t
-Route::check_initial_delay (jack_nframes_t nframes, jack_nframes_t& offset, jack_nframes_t& transport_frame)
+nframes_t
+Route::check_initial_delay (nframes_t nframes, nframes_t& offset, nframes_t& transport_frame)
 {
        if (_roll_delay > nframes) {
 
@@ -2054,7 +2059,7 @@ Route::check_initial_delay (jack_nframes_t nframes, jack_nframes_t& offset, jack
 }
 
 int
-Route::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, int declick,
+Route::roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, int declick,
             bool can_record, bool rec_monitors_input)
 {
        {
@@ -2065,13 +2070,13 @@ Route::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t
                        automation_snapshot (_session.transport_frame());
                }
        }
-               
+
        if ((n_outputs() == 0 && _redirects.empty()) || n_inputs() == 0 || !_active) {
                silence (nframes, offset);
                return 0;
        }
        
-       jack_nframes_t unused = 0;
+       nframes_t unused = 0;
 
        if ((nframes = check_initial_delay (nframes, offset, unused)) == 0) {
                return 0;
@@ -2086,7 +2091,7 @@ Route::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t
                
                if (am.locked() && _session.transport_rolling()) {
                        
-                       jack_nframes_t start_frame = end_frame - nframes;
+                       nframes_t start_frame = end_frame - nframes;
                        
                        if (gain_automation_playback()) {
                                apply_gain_automation = _gain_automation_curve.rt_safe_get_vector (start_frame, end_frame, _session.gain_automation_buffer(), nframes);
@@ -2100,7 +2105,7 @@ Route::roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t
 }
 
 int
-Route::silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame, jack_nframes_t offset, 
+Route::silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, nframes_t offset, 
                    bool can_record, bool rec_monitors_input)
 {
        silence (nframes, offset);
@@ -2111,7 +2116,7 @@ void
 Route::toggle_monitor_input ()
 {
        for (vector<Port*>::iterator i = _inputs.begin(); i != _inputs.end(); ++i) {
-               (*i)->request_monitor_input(!(*i)->monitoring_input());
+               (*i)->ensure_monitor_input(!(*i)->monitoring_input());
        }
 }
 
@@ -2167,7 +2172,7 @@ Route::set_meter_point (MeterPoint p, void *src)
        }
 }
 
-jack_nframes_t
+nframes_t
 Route::update_total_latency ()
 {
        _own_latency = 0;
@@ -2193,7 +2198,7 @@ Route::update_total_latency ()
 }
 
 void
-Route::set_latency_delay (jack_nframes_t longest_session_latency)
+Route::set_latency_delay (nframes_t longest_session_latency)
 {
        _initial_delay = longest_session_latency - _own_latency;
 
@@ -2203,7 +2208,7 @@ Route::set_latency_delay (jack_nframes_t longest_session_latency)
 }
 
 void
-Route::automation_snapshot (jack_nframes_t now)
+Route::automation_snapshot (nframes_t now)
 {
        IO::automation_snapshot (now);
 
@@ -2212,8 +2217,8 @@ Route::automation_snapshot (jack_nframes_t now)
        }
 }
 
-Route::ToggleControllable::ToggleControllable (Route& s, ToggleType tp)
-       : route (s), type(tp)
+Route::ToggleControllable::ToggleControllable (std::string name, Route& s, ToggleType tp)
+       : Controllable (name), route (s), type(tp)
 {
        
 }
@@ -2255,7 +2260,7 @@ Route::ToggleControllable::get_value (void) const
 }
 
 void 
-Route::set_block_size (jack_nframes_t nframes)
+Route::set_block_size (nframes_t nframes)
 {
        for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
                (*i)->set_block_size (nframes);