diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
commit | cb413146428ce5db5e281d70f2b3b7df27c1aaab (patch) | |
tree | 4961e9dcb107f2ca1f0a4298faf5135ba8611d92 /gtk2_ardour/io_selector.cc | |
parent | 9aa8af5a28abbb86c9ae86c6991838eb6828d0a9 (diff) |
merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/io_selector.cc')
-rw-r--r-- | gtk2_ardour/io_selector.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index cecea98470..f0d589c138 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -45,6 +45,13 @@ IOSelector::IOSelector (ARDOUR::Session& session, boost::shared_ptr<ARDOUR::IO> } else { _io->output_changed.connect (mem_fun(*this, &IOSelector::ports_changed)); } + +#ifdef FIXME + /* these got lost in a merge from 2.0 */ + set_button_sensitivity (); + io->name_changed.connect (mem_fun(*this, &IOSelector::name_changed)); +#endif + } @@ -88,7 +95,6 @@ IOSelector::get_state (int r, std::string const & p) const } int k = 0; - for (vector<string>::iterator i = connections.begin(); i != connections.end(); ++i) { if ((*i)== p) { |