diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-29 19:40:19 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-29 19:40:19 +0000 |
| commit | 780cd2fabcf15e666fa219fc94720c8c67da204b (patch) | |
| tree | 261965c42c274c39073014c81642826f361db910 /gtk2_ardour | |
| parent | bde8437387ccd5bfd86d641d15444f76532b5e2b (diff) | |
move some solo/listen related options to correct prefs tab
git-svn-id: svn://localhost/ardour2/branches/3.0@10339 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index bf6fbaa05c..df2c7ed227 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1110,6 +1110,8 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model) ); + add_option (_("Audio"), mm); + #ifndef __APPLE__ /* no JACK monitoring on CoreAudio */ if (AudioEngine::instance()->can_request_hardware_monitoring()) { @@ -1119,32 +1121,6 @@ RCOptionEditor::RCOptionEditor () mm->add (SoftwareMonitoring, _("ardour")); mm->add (ExternalMonitoring, _("audio hardware")); - add_option (_("Audio"), mm); - - ComboOption<PFLPosition>* pp = new ComboOption<PFLPosition> ( - "pfl-position", - _("PFL signals come from"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_pfl_position), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_pfl_position) - ); - - pp->add (PFLFromBeforeProcessors, _("before pre-fader processors")); - pp->add (PFLFromAfterProcessors, _("pre-fader but after pre-fader processors")); - - add_option (_("Audio"), pp); - - ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> ( - "afl-position", - _("AFL signals come from"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_afl_position), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_afl_position) - ); - - pa->add (AFLFromBeforeProcessors, _("post-fader but before post-fader processors")); - pa->add (AFLFromAfterProcessors, _("after post-fader processors")); - - add_option (_("Audio"), pa); - add_option (_("Audio"), new BoolOption ( "tape-machine-mode", @@ -1291,11 +1267,35 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_listen_position) ); - _listen_position->add (AfterFaderListen, _("after-fader listen")); - _listen_position->add (PreFaderListen, _("pre-fader listen")); + _listen_position->add (AfterFaderListen, _("after-fader (AFL)")); + _listen_position->add (PreFaderListen, _("pre-fader (PFL)")); add_option (_("Solo / mute"), _listen_position); + ComboOption<PFLPosition>* pp = new ComboOption<PFLPosition> ( + "pfl-position", + _("PFL signals come from"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_pfl_position), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_pfl_position) + ); + + pp->add (PFLFromBeforeProcessors, _("before pre-fader processors")); + pp->add (PFLFromAfterProcessors, _("pre-fader but after pre-fader processors")); + + add_option (_("Solo / mute"), pp); + + ComboOption<AFLPosition>* pa = new ComboOption<AFLPosition> ( + "afl-position", + _("AFL signals come from"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_afl_position), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_afl_position) + ); + + pa->add (AFLFromBeforeProcessors, _("post-fader but before post-fader processors")); + pa->add (AFLFromAfterProcessors, _("after post-fader processors")); + + add_option (_("Solo / mute"), pa); + parameter_changed ("use-monitor-bus"); add_option (_("Solo / mute"), |