diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2018-12-03 18:55:52 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2018-12-07 12:57:26 -0600 |
| commit | 65bda27d4218d9d4ebf809d91e716c892e1f1d8b (patch) | |
| tree | 7254c9cb111d64912c78ce62023986d2fe9668a7 /gtk2_ardour/session_option_editor.cc | |
| parent | 19cb8cf13803b52f2e6956ed24d4e328e61bb1b2 (diff) | |
Tweaks to Mixer and Monitor keybindings:
Add Mixer-specific view keybindings for list, vca, mon. (thanks to: the_CLA)
Move monitor keybindings (mute, dim, mono) to be globally-accessible.
Implement new mixer-specific actions to show/hide monitor,vcas,mixbuses (the_CLA)
Move monitor funcs (mute,dim,mono) to globally-accessible actions.
Make a new Monitor group insted of using Transport group.
Allow use-monitor-section to be controlled by both menu and session-options dialog.
Diffstat (limited to 'gtk2_ardour/session_option_editor.cc')
| -rw-r--r-- | gtk2_ardour/session_option_editor.cc | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index 362d28cce4..a2f0227d3f 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -20,6 +20,7 @@ #include "ardour/session.h" #include "ardour/transport_master_manager.h" +#include "actions.h" #include "gui_thread.h" #include "session_option_editor.h" #include "search_path_option.h" @@ -273,11 +274,10 @@ SessionOptionEditor::SessionOptionEditor (Session* s) sigc::mem_fun (*_session_config, &SessionConfiguration::set_auto_input) )); - add_option (_("Monitoring"), new BoolOption ( + add_option (_("Monitoring"), new CheckOption ( "have-monitor-section", _("Use monitor section in this session"), - sigc::mem_fun (*this, &SessionOptionEditor::get_use_monitor_section), - sigc::mem_fun (*this, &SessionOptionEditor::set_use_monitor_section) + ActionManager::get_action(X_("Monitor"), "UseMonitorSection") )); add_option (_("Monitoring"), new OptionEditorBlank ()); @@ -448,34 +448,6 @@ SessionOptionEditor::parameter_changed (std::string const & p) } } -/* the presence of absence of a monitor section is not really a regular session - * property so we provide these two functions to act as setter/getter slots - */ - -bool -SessionOptionEditor::set_use_monitor_section (bool yn) -{ - bool had_monitor_section = _session->monitor_out() != 0; - - if (yn) { - _session->add_monitor_section (); - } else { - _session->remove_monitor_section (); - } - - /* store this choice for any new sessions */ - - Config->set_use_monitor_bus (yn); - - return had_monitor_section != (_session->monitor_out() != 0); -} - -bool -SessionOptionEditor::get_use_monitor_section () -{ - return _session->monitor_out() != 0; -} - void SessionOptionEditor::save_defaults () { |