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

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index bf6fbaa05c94055ca0f1567ae8a8bf0f721b423d..df2c7ed2274e9a992f0ae954eba8296ac122c16e 100644 (file)
--- 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"),