X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frc_option_editor.cc;h=a53e98871272aa437a0da6ec6edb559d89ec2689;hb=b092cfc21638e4b89164f36ed708136c6cf9c8e0;hp=e9fb88a6de25d1315b6f71208a450a8cf9df350a;hpb=14b0ca31bcb62e5b7e9e77634ef9cd2e8cf65800;p=ardour.git

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index e9fb88a6de..a53e988712 100644
--- 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 },
@@ -723,10 +727,9 @@ public:
 		}
 
 		_db_slider = manage (new HSliderController (pix,
-							    &_db_adjustment,
-							    false,
-							    115));
-
+		 					    &_db_adjustment,
+		 					    115,
+							    false));
 
 		parameter_changed ("solo-mute-gain");
 
@@ -1079,6 +1082,14 @@ RCOptionEditor::RCOptionEditor ()
 		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_disable_disarm_during_roll)
 		     ));
 
+	add_option (_("Transport"),
+	     new BoolOption (
+		     "quieten_at_speed",
+		     _("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)
+		     ));
+
 	/* EDITOR */
 
 	add_option (_("Editor"),
@@ -1153,11 +1164,18 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (_("Editor"), wfsh);
 
+	add_option (_("Editor"),
+	     new BoolOption (
+		     "show-waveforms-while-recording",
+		     _("Show waveforms for audio while it is being recorded"),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_waveforms_while_recording),
+		     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_waveforms_while_recording)
+		     ));
+
 	/* AUDIO */
 
 	add_option (_("Audio"), new OptionEditorHeading (_("Solo")));
 
-
 	add_option (_("Audio"),
 	     new BoolOption (
 		     "solo-control-is-listen-control",
@@ -1181,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"),
@@ -1198,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)
 		     ));
@@ -1220,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"));