diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-02 01:28:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-03-02 01:28:57 +0000 |
| commit | 97abc198035163e202415fbb9ccb375ea8f90dc8 (patch) | |
| tree | c07b35f24f60097057dca0763a52814fe6dd4e64 /gtk2_ardour | |
| parent | 926e1a000e0aa2757405e1dc90f7b7859e2934fe (diff) | |
remove confusing RC preferences option for get/set use monitor section, and simplymake the RC configuration parameter follow the last session preference setting
git-svn-id: svn://localhost/ardour2/branches/3.0@14114 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/session_option_editor.cc | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 59982baba8..b64c03f4ee 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1332,14 +1332,6 @@ RCOptionEditor::RCOptionEditor () add_option (_("Audio"), new OptionEditorHeading (_("Monitoring"))); - add_option (_("Audio"), - new BoolOption ( - "use-monitor-bus", - _("Use a monitor bus (allows AFL/PFL and more control)"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_monitor_bus), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_monitor_bus) - )); - ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> ( "monitoring-model", _("Record monitoring handled by"), diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index 45c0c803a3..e49e9e33f4 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -293,6 +293,10 @@ SessionOptionEditor::set_use_monitor_section (bool yn) _session->remove_monitor_section (); } + /* store this choice for any new sessions */ + + Config->set_use_monitor_bus (yn); + return had_monitor_section != yn; } |