make "exclusive solo" apply to listen as well as SiP

[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 0564d9b32e27945380c629a5bb565abe097c8934..a53e98871272aa437a0da6ec6edb559d89ec2689 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -3,9 +3,13 @@
 #include <gtkmm/scale.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/slider_controller.h>
+
 #include "pbd/fpu.h"
+
 #include "midi++/manager.h"
 #include "midi++/factory.h"
+
+#include "ardour/audioengine.h"
 #include "ardour/dB.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/control_protocol_manager.h"
@@ -443,10 +447,10 @@ static const struct {
        { "Command", GDK_META_MASK },
        { "Control", GDK_CONTROL_MASK },
        { "Option", GDK_MOD1_MASK },
-       { "Command-Shift", GDK_MOD1_MASK|GDK_SHIFT_MASK },
-       { "Command-Option", GDK_MOD1_MASK|GDK_MOD5_MASK },
-       { "Shift-Option", GDK_SHIFT_MASK|GDK_MOD5_MASK },
-       { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_MOD1_MASK },
+       { "Command-Shift", GDK_META_MASK|GDK_SHIFT_MASK },
+       { "Command-Option", GDK_MOD1_MASK|GDK_META_MASK },
+       { "Shift-Option", GDK_SHIFT_MASK|GDK_MOD1_MASK },
+       { "Shift-Command-Option", GDK_MOD5_MASK|GDK_SHIFT_MASK|GDK_META_MASK },
 
 #else
        { "Shift", GDK_SHIFT_MASK },
@@ -1081,7 +1085,7 @@ RCOptionEditor::RCOptionEditor ()
        add_option (_("Transport"),
             new BoolOption (
                     "quieten_at_speed",
-                    _("Reduce output volume when transport is moving quickly"),
+                    _("12dB gain reduction during fast-forward and fast-rewind"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_quieten_at_speed),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
                     ));
@@ -1195,10 +1199,10 @@ RCOptionEditor::RCOptionEditor ()
 
        add_option (_("Audio"),
             new BoolOption (
-                    "solo-latched",
-                    _("Latched solo"),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_latched),
-                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_latched)
+                    "exclusive-solo",
+                    _("Exclusive solo"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_exclusive_solo),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_exclusive_solo)
                     ));
 
        add_option (_("Audio"),
@@ -1212,7 +1216,7 @@ RCOptionEditor::RCOptionEditor ()
        add_option (_("Audio"),
             new BoolOption (
                     "solo-mute-override",
-                    _("Override muting"),
+                    _("Soloing overrides muting"),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_solo_mute_override),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_override)
                     ));
@@ -1234,7 +1238,12 @@ RCOptionEditor::RCOptionEditor ()
                sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model)
                );
 
-       mm->add (HardwareMonitoring, _("JACK"));
+#ifndef __APPLE__
+        /* no JACK monitoring on CoreAudio */
+        if (AudioEngine::instance()->can_request_hardware_monitoring()) {
+                mm->add (HardwareMonitoring, _("JACK"));
+        }
+#endif
        mm->add (SoftwareMonitoring, _("ardour"));
        mm->add (ExternalMonitoring, _("audio hardware"));