diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-29 18:12:13 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:38 -0400 |
| commit | 4d14ae4e23bc58e356dcda387213d0ba4ab6364b (patch) | |
| tree | cbc6fe9183a5dfe6deadb66fa1b496301afeec01 /gtk2_ardour | |
| parent | d2c405416c0c86d01f8b701ad2781e53d87410ae (diff) | |
mostly restore VCA state on session loading.
This does not restore VCA assignments
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 591b4f4250..673bce61d1 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -2516,7 +2516,7 @@ MixerStrip::vca_button_release (GdkEventButton* ev, uint32_t which) return false; } - VCAManager::VCAS vcas (_session->vca_manager().vcas()); + VCAList vcas (_session->vca_manager().vcas()); if (vcas.empty()) { /* XXX should probably show a message saying "No VCA masters" */ @@ -2527,7 +2527,7 @@ MixerStrip::vca_button_release (GdkEventButton* ev, uint32_t which) MenuList& items = menu->items(); RadioMenuItem::Group group; - for (VCAManager::VCAS::iterator v = vcas.begin(); v != vcas.end(); ++v) { + for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) { items.push_back (RadioMenuElem (group, (*v)->name(), sigc::bind (sigc::mem_fun (*this, &MixerStrip::vca_menu_toggle), (*v)->number()))); } diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 3efb1ce0f1..f847678df8 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -1286,6 +1286,8 @@ Mixer_UI::initial_track_display () Unwinder<bool> uw2 (ignore_reorder, true); track_model->clear (); + VCAList vcas = _session->vca_manager().vcas(); + add_masters (vcas); add_strips (copy); } |