diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-01 13:36:50 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-01 13:36:50 +0000 |
| commit | 0d6515a24349be9add8d3919d4c6c4d509bac687 (patch) | |
| tree | eca75aee7588424eddd30b558098321acf686c65 /gtk2_ardour/rc_option_editor.cc | |
| parent | 4df4574be472b599e149af2ef161ed505088e71a (diff) | |
separate solo & listen. some minor fixes and additional related fixes still to come
git-svn-id: svn://localhost/ardour2/branches/3.0@5298 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/rc_option_editor.cc')
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index bddc9d5b07..6a3fe486ee 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1158,18 +1158,26 @@ RCOptionEditor::RCOptionEditor () add_option (_("Audio"), new OptionEditorHeading (_("Solo"))); - ComboOption<SoloModel>* sm = new ComboOption<SoloModel> ( - "solo-model", - _("Solo button controls"), - mem_fun (*_rc_config, &RCConfiguration::get_solo_model), - mem_fun (*_rc_config, &RCConfiguration::set_solo_model) + + add_option (_("Audio"), + new BoolOption ( + "solo-control-is-listen-control", + _("Solo controls are Listen controls"), + mem_fun (*_rc_config, &RCConfiguration::get_solo_control_is_listen_control), + mem_fun (*_rc_config, &RCConfiguration::set_solo_control_is_listen_control) + )); + + ComboOption<ListenPosition>* lp = new ComboOption<ListenPosition> ( + "listen-position", + _("Listen Position"), + mem_fun (*_rc_config, &RCConfiguration::get_listen_position), + mem_fun (*_rc_config, &RCConfiguration::set_listen_position) ); - sm->add (SoloInPlace, _("solo in place")); - sm->add (SoloAFL, _("post-fader listen via monitor bus")); - sm->add (SoloPFL, _("pre-fader listen via monitor bus")); + lp->add (AfterFaderListen, _("after-fader listen")); + lp->add (PreFaderListen, _("pre-fader listen")); - add_option (_("Audio"), sm); + add_option (_("Audio"), lp); add_option (_("Audio"), new SoloMuteOptions (_rc_config)); add_option (_("Audio"), |