lots of odds and ends to do with solo isolate and its GUI

[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 b3d7364ebdb9878b9093d75732b469e37339498a..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"
@@ -142,7 +146,7 @@ private:
 
                        if ((*i)->input()) {
                                r[_model.online] = !(*i)->input()->offline();
-                               (*i)->input()->OfflineStatusChanged.connect (port_connections, boost::bind (&MIDIPorts::port_offline_changed, this, (*i)), gui_context());
+                               (*i)->input()->OfflineStatusChanged.connect (port_connections, MISSING_INVALIDATOR, boost::bind (&MIDIPorts::port_offline_changed, this, (*i)), gui_context());
                                r[_model.trace_input] = (*i)->input()->tracing();
                        }
 
@@ -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");
 
@@ -924,8 +927,8 @@ private:
 
 
 RCOptionEditor::RCOptionEditor ()
-       : OptionEditor (Config, _("Ardour Preferences")),
-         _rc_config (Config)
+       : OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
+        , _rc_config (Config)
 {
        /* MISC */
 
@@ -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,13 +1216,21 @@ 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)
                     ));
 
        add_option (_("Audio"), new OptionEditorHeading (_("Monitoring")));
 
+       add_option (_("Audio"),
+            new BoolOption (
+                    "use-monitor-bus",
+                    _("Use a monitor bus (allows AFL/PFL and more control)"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_monitor_bus),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_monitor_bus)
+                    ));
+
        ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> (
                "monitoring-model",
                _("Monitoring handled by"),
@@ -1212,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"));