diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-08-30 22:34:21 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-08-30 22:34:21 +0000 |
| commit | b9dca83832afe48f8f3f94e702c571a3f57aef7a (patch) | |
| tree | d692480ec94c80b581527e1de6adb9708e75369d /libs/ardour/diskstream.cc | |
| parent | e528e5038fa791b07bc9f00f64a39227d66f49b3 (diff) | |
Auto-connect outputs that appear as a result of e.g. instruments being added to MIDI tracks. Fixes #3368.
git-svn-id: svn://localhost/ardour2/branches/3.0@7720 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/diskstream.cc')
| -rw-r--r-- | libs/ardour/diskstream.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index aaeb3c9270..0a79aec613 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -98,7 +98,6 @@ Diskstream::Diskstream (Session &sess, const string &name, Flag flag) , overwrite_offset (0) , _pending_overwrite (false) , overwrite_queued (false) - , input_change_pending (NoChange) , wrap_buffer_size (0) , speed_buffer_size (0) , _speed (1.0) @@ -146,7 +145,6 @@ Diskstream::Diskstream (Session& sess, const XMLNode& /*node*/) , overwrite_offset (0) , _pending_overwrite (false) , overwrite_queued (false) - , input_change_pending (NoChange) , wrap_buffer_size (0) , speed_buffer_size (0) , _speed (1.0) @@ -184,7 +182,7 @@ Diskstream::set_track (Track* t) ic_connection.disconnect(); _io->changed.connect_same_thread (ic_connection, boost::bind (&Diskstream::handle_input_change, this, _1, _2)); - input_change_pending = ConfigurationChanged; + input_change_pending = IOChange::ConfigurationChanged; non_realtime_input_change (); set_align_style_from_io (); @@ -196,8 +194,8 @@ Diskstream::handle_input_change (IOChange change, void * /*src*/) { Glib::Mutex::Lock lm (state_lock); - if (!(input_change_pending & change)) { - input_change_pending = IOChange (input_change_pending|change); + if (!(input_change_pending.type & change.type)) { + input_change_pending.type = IOChange::Type (input_change_pending.type | change.type); _session.request_input_change_handling (); } } |