diff options
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/amp.cc | 19 | ||||
-rw-r--r-- | libs/ardour/port.cc | 13 |
2 files changed, 11 insertions, 21 deletions
diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index 154d909560..28edaf43a0 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -240,28 +240,13 @@ Amp::set_gain (gain_t val, void *src) //cerr << "set desired gain to " << val << " when curgain = " << _gain_control->get_value () << endl; if (src != _gain_control.get()) { - _gain_control->set_value(val); + _gain_control->set_value (val); // bit twisty, this will come back and call us again // (this keeps control in sync with reality) return; } - { - // Glib::Mutex::Lock dm (declick_lock); - _gain_control->set_float(val, false); - } - - if (_session.transport_stopped()) { - // _gain = val; - } - - /* - if (_session.transport_stopped() && src != 0 && src != this && _gain_control->automation_write()) { - _gain_control->list()->add (_session.transport_frame(), val); - - } - */ - + _gain_control->set_float(val, false); _session.set_dirty(); } diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc index ebe31a1fde..247357d16b 100644 --- a/libs/ardour/port.cc +++ b/libs/ardour/port.cc @@ -238,15 +238,20 @@ Port::reconnect () return 0; } -/** @param n Short name */ +/** @param n Short or long name */ int Port::set_name (std::string const & n) { - assert (_name.find_first_of (':') == std::string::npos); + if (n == _name) { + return 0; + } + + string const s = _engine->make_port_name_non_relative (n); + + int const r = jack_port_set_name (_jack_port, s.c_str()); - int const r = jack_port_set_name (_jack_port, n.c_str()); if (r == 0) { - _name = n; + _name = n; // short form, probably } return r; |