Flesh out RDFF documentation.

[ardour.git] / gtk2_ardour / rc_option_editor.cc

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 72229572a23ad63f3791c1dd27923295bf2f63ba..722612d21c9ffaec7d3c6d863c384c0640119aa3 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -782,8 +782,8 @@ RCOptionEditor::RCOptionEditor ()
                 procs->add (-1, _("all but one processor"));
                 procs->add (0, _("all available processors"));
                 
-                for (uint32_t i = 2; i < hwcpus; ++i) {
-                        procs->add (1, string_compose (_("%1 processors"), i));
+                for (uint32_t i = 1; i <= hwcpus; ++i) {
+                        procs->add (i, string_compose (_("%1 processors"), i));
                 }
                 
                 add_option (_("Misc"), procs);
@@ -1049,6 +1049,14 @@ RCOptionEditor::RCOptionEditor ()
                            sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_zoom_tools)
                            ));
 
+       add_option (_("Editor"),
+                   new BoolOption (
+                           "color-regions-using-track-color",
+                           _("Color regions using their track's color"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_color_regions_using_track_color),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_color_regions_using_track_color)
+                           ));
+
        /* AUDIO */
 
        add_option (_("Audio"), new OptionEditorHeading (_("Buffering")));
@@ -1082,6 +1090,30 @@ RCOptionEditor::RCOptionEditor ()
        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 (
@@ -1212,26 +1244,29 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_gain),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_gain)
                     ));
-                    
-       add_option (_("Solo / mute"),
-            new BoolOption (
-                    "solo-control-is-listen-control",
-                    _("Solo controls are Listen controls"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_control_is_listen_control),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_control_is_listen_control)
-                    ));
 
-       ComboOption<ListenPosition>* lp = new ComboOption<ListenPosition> (
+       _solo_control_is_listen_control = new BoolOption (
+               "solo-control-is-listen-control",
+               _("Solo controls are Listen controls"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_control_is_listen_control),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_control_is_listen_control)
+               );
+
+       add_option (_("Solo / mute"), _solo_control_is_listen_control);
+
+       _listen_position = new ComboOption<ListenPosition> (
                "listen-position",
                _("Listen Position"),
                sigc::mem_fun (*_rc_config, &RCConfiguration::get_listen_position),
                sigc::mem_fun (*_rc_config, &RCConfiguration::set_listen_position)
                );
 
-       lp->add (AfterFaderListen, _("after-fader listen"));
-       lp->add (PreFaderListen, _("pre-fader listen"));
+       _listen_position->add (AfterFaderListen, _("after-fader listen"));
+       _listen_position->add (PreFaderListen, _("pre-fader listen"));
+
+       add_option (_("Solo / mute"), _listen_position);
 
-       add_option (_("Solo / mute"), lp);
+       parameter_changed ("use-monitor-bus");
 
        add_option (_("Solo / mute"),
             new BoolOption (
@@ -1389,4 +1424,18 @@ RCOptionEditor::RCOptionEditor ()
        add_option (_("Keyboard"), new KeyboardOptions);
 }
 
-
+void
+RCOptionEditor::parameter_changed (string const & p)
+{
+       OptionEditor::parameter_changed (p);
+       
+       if (p == "use-monitor-bus") {
+               bool const s = Config->get_use_monitor_bus ();
+               if (!s) {
+                       /* we can't use this if we don't have a monitor bus */
+                       Config->set_solo_control_is_listen_control (false);
+               }
+               _solo_control_is_listen_control->set_sensitive (s);
+               _listen_position->set_sensitive (s);
+       }
+}