remove auto-return-target stuff from preferences; Ardour exposes this via auto-return...
[ardour.git] / gtk2_ardour / rc_option_editor.cc
index 5210206ce280e8d4ff18bc3192cd9d418cd5fe9a..7dc7a1b0a9a5438691d7baa445608a75af611cec 100644 (file)
@@ -50,6 +50,7 @@
 #include "ardour_window.h"
 #include "ardour_dialog.h"
 #include "gui_thread.h"
+#include "meter_patterns.h"
 #include "midi_tracer.h"
 #include "rc_option_editor.h"
 #include "utils.h"
@@ -67,122 +68,6 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
 
-class AutoReturnTargetOptions : public OptionEditorBox
-{
-    public:
-       AutoReturnTargetOptions (RCConfiguration* c, Gtk::Window* p)
-               : _rc_config (c)
-               , range_selection_button (_("Play Range Selection"))
-               , last_roll_button (_("Play from Last Roll"))
-               , loop_button (_("Play Loop"))
-               , region_selection_button (_("Play Region Selection"))
-               , toggle_button (_("Enable/Disable all options"))
-       {
-               _box->pack_start (range_selection_button, false, false);
-               range_selection_button.signal_toggled().connect (sigc::mem_fun (*this, &AutoReturnTargetOptions::range_selection_toggled));
-
-               _box->pack_start (loop_button, false, false);
-               loop_button.signal_toggled().connect (sigc::mem_fun (*this, &AutoReturnTargetOptions::loop_toggled));
-
-               _box->pack_start (region_selection_button, false, false);
-               region_selection_button.signal_toggled().connect (sigc::mem_fun (*this, &AutoReturnTargetOptions::region_selection_toggled));
-
-               _box->pack_start (last_roll_button, false, false);
-               last_roll_button.signal_toggled().connect (sigc::mem_fun (*this, &AutoReturnTargetOptions::last_roll_toggled));
-
-               HBox* hbox = manage (new HBox);
-               /* keep the toggle button small */
-               hbox->pack_start (toggle_button, false, false);
-               _box->pack_start (*hbox, false, false);
-
-               toggle_button.signal_clicked().connect (sigc::mem_fun (*this, &AutoReturnTargetOptions::toggle));
-
-               Gtkmm2ext::UI::instance()->set_tip (range_selection_button,
-                                                   _("If enabled, playhead will always start from the beginning of the current range selection.\n\nIf disabled or no range selection, see the next choice in this list"));
-               Gtkmm2ext::UI::instance()->set_tip (loop_button,
-                                                   _("If enabled, playhead will always start from the beginning of the loop range.\n\nIf disabled or no loop range, see the next choice in this list"));
-               Gtkmm2ext::UI::instance()->set_tip (region_selection_button,
-                                                   _("If enabled, playhead will always start from the beginning of the first selected region.\n\nIf disabled or no region selection, see the next choice in this list"));
-               Gtkmm2ext::UI::instance()->set_tip (last_roll_button,
-                                                   _("If enabled, playhead will always start from the last position where it was started.\n\nIf disabled it will start from wherever it is currently located"));
-
-               Gtkmm2ext::UI::instance()->set_tip (toggle_button,
-                                                   _("Change status of all buttons above to all enabled or all disabled"));
-       }
-                       
-       void parameter_changed (string const & p)
-       {
-               if (p == "auto-return-target-list") {
-                       AutoReturnTarget art = _rc_config->get_auto_return_target_list();
-                       cerr << "ARTO, reset buttons with " << enum_2_string (art) << endl;
-                       range_selection_button.set_active (art & RangeSelectionStart);
-                       loop_button.set_active (art & Loop);
-                       region_selection_button.set_active (art & RegionSelectionStart);
-                       last_roll_button.set_active (art & LastLocate);
-               }
-       }
-                                
-       void set_state_from_config ()
-       {
-               parameter_changed ("auto-return-target-list");
-       }
-
-    private:
-
-       void range_selection_toggled () {
-               AutoReturnTarget art = _rc_config->get_auto_return_target_list ();
-               if (range_selection_button.get_active ()) {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (art | RangeSelectionStart));
-               } else {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (art & ~RangeSelectionStart));
-               }
-       }
-       void last_roll_toggled () {
-               AutoReturnTarget art = _rc_config->get_auto_return_target_list ();
-               if (range_selection_button.get_active ()) {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (art | LastLocate));
-               } else {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (art & ~LastLocate));
-               }
-       }
-       void region_selection_toggled () {
-               AutoReturnTarget art = _rc_config->get_auto_return_target_list ();
-               if (range_selection_button.get_active ()) {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (art | RegionSelectionStart));
-               } else {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (art & ~RegionSelectionStart));
-               }
-       }
-       void loop_toggled () {
-               AutoReturnTarget art = _rc_config->get_auto_return_target_list ();
-               if (range_selection_button.get_active ()) {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (art | Loop));
-               } else {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (art & ~Loop));
-               }
-       }
-
-       void toggle () {
-               AutoReturnTarget art = _rc_config->get_auto_return_target_list ();
-               if (art) {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (0));
-               } else {
-                       _rc_config->set_auto_return_target_list (AutoReturnTarget (RangeSelectionStart|
-                                                                                  RegionSelectionStart|
-                                                                                  Loop|
-                                                                                  LastLocate));
-               }
-       }
-       
-       RCConfiguration* _rc_config;
-
-       Gtk::CheckButton range_selection_button;
-       Gtk::CheckButton last_roll_button;
-       Gtk::CheckButton loop_button;
-       Gtk::CheckButton region_selection_button;
-       Gtk::Button      toggle_button;
-};
-
 class ClickOptions : public OptionEditorBox
 {
 public:
@@ -1154,13 +1039,34 @@ public:
                 , _playback_slider (_playback_adjustment)
                , _capture_slider (_capture_adjustment)
        {
+               vector<string> presets;
+
+               /* these must match the order of the enums for BufferingPreset */
+               
+               presets.push_back (_("Small sessions (4-16 tracks)"));
+               presets.push_back (_("Medium sessions (16-64 tracks)"));
+               presets.push_back (_("Large sessions (64+ tracks)"));
+               presets.push_back (_("Custom (set by sliders below)"));
+
+               set_popdown_strings (_buffering_presets_combo, presets);
+
+               Label* l = manage (new Label (_("Preset:")));
+               l->set_name ("OptionsLabel");
+               HBox* h = manage (new HBox);
+               h->set_spacing (12);
+               h->pack_start (*l, false, false);
+               h->pack_start (_buffering_presets_combo, true, true);
+               _box->pack_start (*h, false, false);
+
+               _buffering_presets_combo.signal_changed().connect (sigc::mem_fun (*this, &BufferingOptions::preset_changed));
+               
                _playback_adjustment.set_value (_rc_config->get_audio_playback_buffer_seconds());
 
-               Label* l = manage (new Label (_("Playback (seconds of buffering):")));
+               l = manage (new Label (_("Playback (seconds of buffering):")));
                l->set_name ("OptionsLabel");
 
                _playback_slider.set_update_policy (UPDATE_DISCONTINUOUS);
-               HBox* h = manage (new HBox);
+               h = manage (new HBox);
                h->set_spacing (4);
                h->pack_start (*l, false, false);
                h->pack_start (_playback_slider, true, true);
@@ -1186,6 +1092,31 @@ public:
 
        void parameter_changed (string const & p)
        {
+               if (p == "buffering-preset") {
+                       switch (_rc_config->get_buffering_preset()) {
+                       case Small:
+                               _playback_slider.set_sensitive (false);
+                               _capture_slider.set_sensitive (false);
+                               _buffering_presets_combo.set_active (0);
+                               break;
+                       case Medium:
+                               _playback_slider.set_sensitive (false);
+                               _capture_slider.set_sensitive (false);
+                               _buffering_presets_combo.set_active (1);
+                               break;
+                       case Large:
+                               _playback_slider.set_sensitive (false);
+                               _capture_slider.set_sensitive (false);
+                               _buffering_presets_combo.set_active (2);
+                               break;
+                       case Custom:
+                               _playback_slider.set_sensitive (true);
+                               _capture_slider.set_sensitive (true);
+                               _buffering_presets_combo.set_active (3);
+                               break;
+                       }
+               }
+
                if (p == "playback-buffer-seconds") {
                        _playback_adjustment.set_value (_rc_config->get_audio_playback_buffer_seconds());
                } else if (p == "capture-buffer-seconds") {
@@ -1195,12 +1126,38 @@ public:
 
        void set_state_from_config ()
        {
+               parameter_changed ("buffering-preset");
                parameter_changed ("playback-buffer-seconds");
                parameter_changed ("capture-buffer-seconds");
        }
 
 private:
 
+       void preset_changed ()
+       {
+               int index = _buffering_presets_combo.get_active_row_number ();
+               if (index < 0) {
+                       return;
+               }
+               switch (index) {
+               case 0:
+                       _rc_config->set_buffering_preset (Small);
+                       break;
+               case 1:
+                       _rc_config->set_buffering_preset (Medium);
+                       break;
+               case 2:
+                       _rc_config->set_buffering_preset (Large);
+                       break;
+               case 3:
+                       _rc_config->set_buffering_preset (Custom);
+                       break;
+               default:
+                       error << string_compose (_("programming error: unknown buffering preset string, index = %1"), index) << endmsg;
+                       break;
+               }
+       }
+       
        void playback_changed ()
        {
                _rc_config->set_audio_playback_buffer_seconds ((long) _playback_adjustment.get_value());
@@ -1216,6 +1173,7 @@ private:
        Adjustment _capture_adjustment;
        HScale _playback_slider;
        HScale _capture_slider;
+       ComboBoxText _buffering_presets_combo;
 };
 
 class ControlSurfacesOptions : public OptionEditorBox
@@ -1515,6 +1473,7 @@ public:
                , _display_plugin_scan_progress (_("Always Display Plugin Scan Progress"))
                , _discover_vst_on_start (_("Scan for [new] VST Plugins on Application Start"))
                , _discover_au_on_start (_("Scan for AudioUnit Plugins on Application Start"))
+               , _verbose_plugin_scan (_("Verbose Plugin Scan"))
                , _timeout_adjustment (0, 0, 3000, 50, 50)
                , _timeout_slider (_timeout_adjustment)
        {
@@ -1587,6 +1546,12 @@ public:
                b = manage (new Button (_("Edit")));
                b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_vst_path_clicked));
                t->attach (*b, 1, 2, n, n+1, FILL); ++n;
+
+               // currently verbose logging is only implemented for Windows VST.
+               t->attach (_verbose_plugin_scan, 0, 2, n, n+1); ++n;
+               _verbose_plugin_scan.signal_toggled().connect (sigc::mem_fun (*this, &PluginOptions::verbose_plugin_scan_toggled));
+               Gtkmm2ext::UI::instance()->set_tip (_verbose_plugin_scan,
+                                           _("<b>When enabled</b> additional information for every plugin is added to the Log Window."));
 #endif
 #endif // any VST
 
@@ -1634,6 +1599,10 @@ public:
                        bool const x = _rc_config->get_discover_audio_units();
                        _discover_au_on_start.set_active (x);
                }
+               else if (p == "verbose-plugin-scan") {
+                       bool const x = _rc_config->get_verbose_plugin_scan();
+                       _verbose_plugin_scan.set_active (x);
+               }
        }
 
        void set_state_from_config () {
@@ -1641,6 +1610,7 @@ public:
                parameter_changed ("discover-vst-on-start");
                parameter_changed ("vst-scan-timeout");
                parameter_changed ("discover-audio-units");
+               parameter_changed ("verbose-plugin-scan");
        }
 
 private:
@@ -1649,6 +1619,7 @@ private:
        CheckButton _display_plugin_scan_progress;
        CheckButton _discover_vst_on_start;
        CheckButton _discover_au_on_start;
+       CheckButton _verbose_plugin_scan;
        Adjustment _timeout_adjustment;
        HScale _timeout_slider;
 
@@ -1667,6 +1638,11 @@ private:
                _rc_config->set_discover_audio_units(x);
        }
 
+       void verbose_plugin_scan_toggled () {
+               bool const x = _verbose_plugin_scan.get_active();
+               _rc_config->set_verbose_plugin_scan(x);
+       }
+
        void timeout_changed () {
                int x = floor(_timeout_adjustment.get_value());
                _rc_config->set_vst_scan_timeout(x);
@@ -1900,8 +1876,6 @@ RCOptionEditor::RCOptionEditor ()
 
        /* TRANSPORT */
 
-       add_option (_("Transport"), new OptionEditorHeading (S_("Playhead Behaviour")));
-       add_option (_("Transport"), new AutoReturnTargetOptions (_rc_config, this));
        add_option (_("Transport"), new OptionEditorHeading (S_("Transport Options")));
 
        BoolOption* tsf;
@@ -2389,23 +2363,23 @@ RCOptionEditor::RCOptionEditor ()
        int dmsize = 1;
        dm->add (DenormalNone, _("no processor handling"));
 
-       FPU fpu;
+       FPU* fpu = FPU::instance();
 
-       if (fpu.has_flush_to_zero()) {
+       if (fpu->has_flush_to_zero()) {
                ++dmsize;
                dm->add (DenormalFTZ, _("use FlushToZero"));
        } else if (_rc_config->get_denormal_model() == DenormalFTZ) {
                _rc_config->set_denormal_model(DenormalNone);
        }
 
-       if (fpu.has_denormals_are_zero()) {
+       if (fpu->has_denormals_are_zero()) {
                ++dmsize;
                dm->add (DenormalDAZ, _("use DenormalsAreZero"));
        } else if (_rc_config->get_denormal_model() == DenormalDAZ) {
                _rc_config->set_denormal_model(DenormalNone);
        }
 
-       if (fpu.has_flush_to_zero() && fpu.has_denormals_are_zero()) {
+       if (fpu->has_flush_to_zero() && fpu->has_denormals_are_zero()) {
                ++dmsize;
                dm->add (DenormalFTZDAZ, _("use FlushToZero and DenormalsAreZero"));
        } else if (_rc_config->get_denormal_model() == DenormalFTZDAZ) {
@@ -2902,12 +2876,10 @@ RCOptionEditor::RCOptionEditor ()
        mfo->add (METER_FALLOFF_OFF,      _("off"));
        mfo->add (METER_FALLOFF_SLOWEST,  _("slowest [6.6dB/sec]"));
        mfo->add (METER_FALLOFF_SLOW,     _("slow [8.6dB/sec] (BBC PPM, EBU PPM)"));
-       mfo->add (METER_FALLOFF_SLOWISH,  _("slowish [12.0dB/sec] (DIN)"));
-       mfo->add (METER_FALLOFF_MODERATE, _("moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"));
-       mfo->add (METER_FALLOFF_MEDIUM,   _("medium [20dB/sec]"));
-       mfo->add (METER_FALLOFF_FAST,     _("fast [32dB/sec]"));
-       mfo->add (METER_FALLOFF_FASTER,   _("faster [46dB/sec]"));
-       mfo->add (METER_FALLOFF_FASTEST,  _("fastest [70dB/sec]"));
+       mfo->add (METER_FALLOFF_SLOWISH,  _("moderate [12.0dB/sec] (DIN)"));
+       mfo->add (METER_FALLOFF_MODERATE, _("medium [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"));
+       mfo->add (METER_FALLOFF_MEDIUM,   _("fast [20dB/sec]"));
+       mfo->add (METER_FALLOFF_FAST,     _("very fast [32dB/sec]"));
 
        add_option (S_("Preferences|Metering"), mfo);
 
@@ -2965,6 +2937,54 @@ RCOptionEditor::RCOptionEditor ()
                        sigc::mem_fun (*_ui_config, &UIConfiguration::set_meter_peak)
                        );
 
+
+       ComboOption<MeterType>* mtm = new ComboOption<MeterType> (
+               "meter-type-master",
+               _("Default Meter Type for Master Bus"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_master),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_master)
+               );
+       mtm->add (MeterPeak,    ArdourMeter::meter_type_string(MeterPeak));
+       mtm->add (MeterK20,     ArdourMeter::meter_type_string(MeterK20));
+       mtm->add (MeterK14,     ArdourMeter::meter_type_string(MeterK14));
+       mtm->add (MeterK12,     ArdourMeter::meter_type_string(MeterK12));
+       mtm->add (MeterIEC1DIN, ArdourMeter::meter_type_string(MeterIEC1DIN));
+       mtm->add (MeterIEC1NOR, ArdourMeter::meter_type_string(MeterIEC1NOR));
+       mtm->add (MeterIEC2BBC, ArdourMeter::meter_type_string(MeterIEC2BBC));
+       mtm->add (MeterIEC2EBU, ArdourMeter::meter_type_string(MeterIEC2EBU));
+
+       add_option (S_("Preferences|Metering"), mtm);
+
+
+       ComboOption<MeterType>* mtb = new ComboOption<MeterType> (
+               "meter-type-bus",
+               _("Default Meter Type for Busses"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_bus),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_bus)
+               );
+       mtb->add (MeterPeak,    ArdourMeter::meter_type_string(MeterPeak));
+       mtb->add (MeterK20,     ArdourMeter::meter_type_string(MeterK20));
+       mtb->add (MeterK14,     ArdourMeter::meter_type_string(MeterK14));
+       mtb->add (MeterK12,     ArdourMeter::meter_type_string(MeterK12));
+       mtb->add (MeterIEC1DIN, ArdourMeter::meter_type_string(MeterIEC1DIN));
+       mtb->add (MeterIEC1NOR, ArdourMeter::meter_type_string(MeterIEC1NOR));
+       mtb->add (MeterIEC2BBC, ArdourMeter::meter_type_string(MeterIEC2BBC));
+       mtb->add (MeterIEC2EBU, ArdourMeter::meter_type_string(MeterIEC2EBU));
+
+       add_option (S_("Preferences|Metering"), mtb);
+
+       ComboOption<MeterType>* mtt = new ComboOption<MeterType> (
+               "meter-type-track",
+               _("Default Meter Type for Tracks"),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::get_meter_type_track),
+               sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_type_track)
+               );
+       mtt->add (MeterPeak,    ArdourMeter::meter_type_string(MeterPeak));
+       mtt->add (MeterPeak0dB, ArdourMeter::meter_type_string(MeterPeak0dB));
+
+       add_option (S_("Preferences|Metering"), mtt);
+
+
        Gtkmm2ext::UI::instance()->set_tip
                (mpks->tip_widget(),
                 _("Specify the audio signal level in dbFS at and above which the meter-peak indicator will flash red."));