diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-20 16:50:46 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-20 16:50:46 +0000 |
| commit | 3e577fee98555166cc92b78af3e8873e3cabb7d6 (patch) | |
| tree | a4fc63510efb7b33fb9e85cf8f06768bdc88f305 /gtk2_ardour/editor_actions.cc | |
| parent | 502057064c93980f239c58b905f5c3d15aefb31b (diff) | |
move BWF header options into Configuration option, rationalize crossfade parameter names, ensure full GUI display of crossfade parameters (in menus)
git-svn-id: svn://localhost/ardour2/trunk@996 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_actions.cc')
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 6fb8950047..0485f4cc8a 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -782,13 +782,13 @@ Editor::toggle_auto_xfade () void Editor::toggle_xfades_active () { - ActionManager::toggle_config_state ("Editor", "toggle-xfades-active", &Configuration::set_crossfades_active, &Configuration::get_crossfades_active); + ActionManager::toggle_config_state ("Editor", "toggle-xfades-active", &Configuration::set_xfades_active, &Configuration::get_xfades_active); } void Editor::toggle_xfade_visibility () { - ActionManager::toggle_config_state ("Editor", "toggle-xfades-visibility", &Configuration::set_crossfades_visible, &Configuration::get_crossfades_visible); + ActionManager::toggle_config_state ("Editor", "toggle-xfades-visibility", &Configuration::set_xfades_visible, &Configuration::get_xfades_visible); } void @@ -811,12 +811,14 @@ Editor::parameter_changed (const char* parameter_name) update_just_smpte (); } else if (PARAM_IS ("video-pullup")) { update_video_pullup (); - } else if (PARAM_IS ("crossfades-active")) { - ActionManager::map_some_state ("Editor", "toggle-xfades-active", &Configuration::get_crossfades_active); - } else if (PARAM_IS ("crossfades-visible")) { - ActionManager::map_some_state ("Editor", "toggle-xfades-visible", &Configuration::get_crossfades_visible); + } else if (PARAM_IS ("xfades-active")) { + ActionManager::map_some_state ("Editor", "toggle-xfades-active", &Configuration::get_xfades_active); + } else if (PARAM_IS ("xfades-visible")) { + ActionManager::map_some_state ("Editor", "toggle-xfades-visible", &Configuration::get_xfades_visible); } else if (PARAM_IS ("auto-xfade")) { ActionManager::map_some_state ("Editor", "toggle-auto-xfades", &Configuration::get_auto_xfade); + } else if (PARAM_IS ("xfade-model")) { + update_crossfade_model (); } else if (PARAM_IS ("edit-mode")) { edit_mode_selector.set_active_text (edit_mode_to_string (Config->get_edit_mode())); } |