make RouteGroup gain control work again ; fix what solo button label shows under different conditions; other miscellania

git-svn-id: svn://localhost/ardour2/branches/3.0@5262 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2009-06-23 20:02:15 +00:00
parent d45dfa5cb6
commit d13fdaa9d1
10 changed files with 85 additions and 65 deletions

View File

@@ -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();
}

View File

@@ -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;

View File

@@ -34,6 +34,7 @@ class BindableToggleButton : public Gtkmm2ext::StatefulToggleButton
public:
BindableToggleButton (const std::string &label)
: Gtkmm2ext::StatefulToggleButton (label) {}
BindableToggleButton () {}
virtual ~BindableToggleButton() {}