Move get_child_list() into TimeAxisView.

[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 bec67099eaca72174629676e7b9e6276115af263..f77c4c2cceff31f36c6c4418f3cf196d7257189d 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -717,13 +717,13 @@ RCOptionEditor::RCOptionEditor ()
                 
                 ComboOption<uint32_t>* procs = new ComboOption<uint32_t> (
                         "processor-usage",
-                        _("Signal processing uses: "),
+                        _("Signal processing uses"),
                         sigc::mem_fun (*_rc_config, &RCConfiguration::get_processor_usage),
                         sigc::mem_fun (*_rc_config, &RCConfiguration::set_processor_usage)
                         );
                 
-                procs->add (-1, _("All but one"));
-                procs->add (0, _("All available processors"));
+                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));
@@ -1030,7 +1030,7 @@ RCOptionEditor::RCOptionEditor ()
 
        ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> (
                "input-auto-connect",
-               _("Connect track and bus inputs"),
+               _("Connect track inputs"),
                sigc::mem_fun (*_rc_config, &RCConfiguration::get_input_auto_connect),
                sigc::mem_fun (*_rc_config, &RCConfiguration::set_input_auto_connect)
                );
@@ -1048,7 +1048,7 @@ RCOptionEditor::RCOptionEditor ()
                );
 
        oac->add (AutoConnectPhysical, _("automatically to physical outputs"));
-       oac->add (AutoConnectMaster, _("automatically to master outputs"));
+       oac->add (AutoConnectMaster, _("automatically to master bus"));
        oac->add (ManualConnect, _("manually"));
 
        add_option (_("Audio"), oac);
@@ -1210,6 +1210,14 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_mute_affects_main_outs)
                     ));
 
+       add_option (_("MIDI control"),
+                   new BoolOption (
+                           "send-midi-clock",
+                           _("Send MIDI Clock"),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::get_send_midi_clock),
+                           sigc::mem_fun (*_rc_config, &RCConfiguration::set_send_midi_clock)
+                           ));
+
        add_option (_("MIDI control"),
                    new BoolOption (
                            "send-mtc",