Merge branch 'master' into cairocanvas

[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 2044282862490c3cd7a75e51dc509657f309d52c..04b3b5a8c2a134426f8b8cb88d4a49fe5c2bf53b 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -31,8 +31,6 @@
 #include "pbd/fpu.h"
 #include "pbd/cpus.h"
 
-#include "midi++/manager.h"
-
 #include "ardour/audioengine.h"
 #include "ardour/dB.h"
 #include "ardour/rc_configuration.h"
@@ -1315,6 +1313,14 @@ RCOptionEditor::RCOptionEditor ()
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_track_meters)
                     ));
 
+       add_option (_("Editor"),
+            new BoolOption (
+                    "show-editor-meter",
+                    _("Display master-meter in the toolbar"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_editor_meter),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_editor_meter)
+                    ));
+
        bco = new BoolComboOption (
                     "use-overlap-equivalency",
                     _("Regions in active edit groups are edited together"),
@@ -1392,14 +1398,6 @@ 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)
-                           ));
-
        add_option (_("Editor"),
                    new BoolOption (
                            "update-editor-during-summary-drag",
@@ -1460,8 +1458,8 @@ RCOptionEditor::RCOptionEditor ()
 
 #ifndef __APPLE__
         /* no JACK monitoring on CoreAudio */
-        if (AudioEngine::instance()->can_request_hardware_monitoring()) {
-                mm->add (HardwareMonitoring, _("JACK"));
+        if (AudioEngine::instance()->port_engine().can_monitor_input()) {
+                mm->add (HardwareMonitoring, _("via Audio Driver"));
         }
 #endif
        mm->add (SoftwareMonitoring, _("ardour"));
@@ -1938,10 +1936,25 @@ RCOptionEditor::RCOptionEditor ()
        mlu->add (MeteringLineUp18, _("-18dBFS (EBU, BBC)"));
        mlu->add (MeteringLineUp15, _("-15dBFS (DIN)"));
 
-       Gtkmm2ext::UI::instance()->set_tip (mlu->tip_widget(), _("Configure meter-ticks and color-knee point for dBFS scale DPM, set reference/offset level for IEC PPM."));
+       Gtkmm2ext::UI::instance()->set_tip (mlu->tip_widget(), _("Configure meter-marks and color-knee point for dBFS scale DPM, set reference level for IEC1/Nordic, IEC2 PPM and VU meter."));
 
        add_option (S_("Preferences|GUI"), mlu);
 
+       ComboOption<MeterLineUp>* mld = new ComboOption<MeterLineUp> (
+               "meter-line-up-din",
+               _("IEC1/DIN Meter line-up level; 0dBu"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_line_up_din),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_line_up_din)
+               );
+
+       mld->add (MeteringLineUp24, _("-24dBFS (SMPTE US: 4dBu = -20dBFS)"));
+       mld->add (MeteringLineUp20, _("-20dBFS (SMPTE RP.0155)"));
+       mld->add (MeteringLineUp18, _("-18dBFS (EBU, BBC)"));
+       mld->add (MeteringLineUp15, _("-15dBFS (DIN)"));
+
+       Gtkmm2ext::UI::instance()->set_tip (mld->tip_widget(), _("Reference level for IEC1/DIN meter."));
+
+       add_option (S_("Preferences|GUI"), mld);
 
        ComboOption<VUMeterStandard>* mvu = new ComboOption<VUMeterStandard> (
                "meter-vu-standard",
@@ -1953,6 +1966,7 @@ RCOptionEditor::RCOptionEditor ()
        mvu->add (MeteringVUfrench,   _("0VU = -2dBu (France)"));
        mvu->add (MeteringVUamerican, _("0VU = 0dBu (North America, Australia)"));
        mvu->add (MeteringVUstandard, _("0VU = +4dBu (standard)"));
+       mvu->add (MeteringVUeight,    _("0VU = +8dBu"));
 
        add_option (S_("Preferences|GUI"), mvu);
 
@@ -1969,6 +1983,15 @@ RCOptionEditor::RCOptionEditor ()
                 _("Specify the audio signal level in dbFS at and above which the meter-peak indicator will flash red."));
 
        add_option (S_("Preferences|GUI"), mpks);
+
+       add_option (S_("Preferences|GUI"),
+            new BoolOption (
+                    "meter-style-led",
+                    _("LED meter style"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_style_led),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_style_led)
+                    ));
+
 }
 
 void