diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-30 12:41:10 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-30 12:41:10 +0000 |
| commit | 8a17b0fb9073bb21ef2c718113f9e41359faf4fe (patch) | |
| tree | 5f107df91c6412b45c715bf7d47d6318f3a50935 /gtk2_ardour/mixer_ui.cc | |
| parent | 59a61c4357b44aa54f03224ae3ba282cf46c0366 (diff) | |
make generic MIDI control track remote control ID changes; fixup messes in the editor+mixer that caused excessive calls to SyncOrderKey stuff. generic MIDI still doesn't track editor/mixer order changes if we're not syncing both windows
git-svn-id: svn://localhost/ardour2/branches/3.0@6413 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index b750f8a470..87c48a4348 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -689,7 +689,9 @@ void Mixer_UI::track_list_reorder (const TreeModel::Path&, const TreeModel::iterator&, int* /*new_order*/) { strip_redisplay_does_not_sync_order_keys = true; - _session->set_remote_control_ids(); + if (!strip_redisplay_does_not_reset_order_keys) { + _session->set_remote_control_ids(); + } redisplay_track_list (); strip_redisplay_does_not_sync_order_keys = false; } @@ -699,7 +701,6 @@ Mixer_UI::track_list_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel:: { // never reset order keys because of a property change strip_redisplay_does_not_reset_order_keys = true; - _session->set_remote_control_ids(); redisplay_track_list (); strip_redisplay_does_not_reset_order_keys = false; } @@ -709,7 +710,6 @@ Mixer_UI::track_list_delete (const Gtk::TreeModel::Path&) { /* this could require an order sync */ if (_session && !_session->deletion_in_progress()) { - _session->set_remote_control_ids(); redisplay_track_list (); } } |