X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frc_option_editor.cc;h=a4d2b5dee2325c9052eb3ec604eb816c0c5569fd;hb=3ddd797e46b232235deb8d79c34b40f35bb2153b;hp=940a601ce99ba808290d26cc715ddc4e70087aad;hpb=e36f74e071d4c14862d23da5ff0d49df0940d536;p=ardour.git diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 940a601ce9..a4d2b5dee2 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -44,6 +44,7 @@ #include "canvas/wave_view.h" +#include "ardour_ui.h" #include "ardour_window.h" #include "ardour_dialog.h" #include "gui_thread.h" @@ -60,6 +61,7 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace PBD; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; class ClickOptions : public OptionEditorBox { @@ -581,7 +583,7 @@ class ClipLevelOptions : public OptionEditorBox public: ClipLevelOptions (RCConfiguration* c) : _rc_config (c) - , _clip_level_adjustment (0, -128.0, 2.0, 0.1, 1.0) /* units of dB */ + , _clip_level_adjustment (-.5, -50.0, 0.0, 0.1, 1.0) /* units of dB */ , _clip_level_slider (_clip_level_adjustment) { _clip_level_adjustment.set_value (_rc_config->get_waveform_clip_level ()); @@ -793,17 +795,7 @@ private: if (!was_enabled) { ControlProtocolManager::instance().activate (*cpi); } else { - Gtk::Window* win = r[_model.editor]; - if (win) { - win->hide (); - } - ControlProtocolManager::instance().deactivate (*cpi); - - if (win) { - delete win; - r[_model.editor] = 0; - } } } @@ -815,8 +807,8 @@ private: } } - void edit_clicked (GdkEventButton* ev) - { + void edit_clicked (GdkEventButton* ev) + { if (ev->type != GDK_2BUTTON_PRESS) { return; } @@ -826,26 +818,32 @@ private: TreeModel::Row row; row = *(_view.get_selection()->get_selected()); - - Window* win = row[_model.editor]; - if (win && !win->is_visible()) { - win->present (); - } else { - cpi = row[_model.protocol_info]; - - if (cpi && cpi->protocol && cpi->protocol->has_editor ()) { - Box* box = (Box*) cpi->protocol->get_gui (); - if (box) { - string title = row[_model.name]; - ArdourWindow* win = new ArdourWindow (_parent, title); - win->set_title ("Control Protocol Options"); - win->add (*box); - box->show (); - win->present (); - row[_model.editor] = win; - } - } + if (!row[_model.enabled]) { + return; + } + cpi = row[_model.protocol_info]; + if (!cpi || !cpi->protocol || !cpi->protocol->has_editor ()) { + return; + } + Box* box = (Box*) cpi->protocol->get_gui (); + if (!box) { + return; + } + if (box->get_parent()) { + static_cast(box->get_parent())->present(); + return; } + string title = row[_model.name]; + /* once created, the window is managed by the surface itself (as ->get_parent()) + * Surface's tear_down_gui() is called on session close, when de-activating + * or re-initializing a surface. + * tear_down_gui() hides an deletes the Window if it exists. + */ + ArdourWindow* win = new ArdourWindow (_parent, title); + win->set_title ("Control Protocol Options"); + win->add (*box); + box->show (); + win->present (); } class ControlSurfacesModelColumns : public TreeModelColumnRecord @@ -858,14 +856,12 @@ private: add (enabled); add (feedback); add (protocol_info); - add (editor); } TreeModelColumn name; TreeModelColumn enabled; TreeModelColumn feedback; TreeModelColumn protocol_info; - TreeModelColumn editor; }; Glib::RefPtr _store; @@ -1228,7 +1224,7 @@ private: RCOptionEditor::RCOptionEditor () : OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME)) , _rc_config (Config) - , _mixer_strip_visibility ("mixer-strip-visibility") + , _mixer_strip_visibility ("mixer-element-visibility") { /* MISC */ @@ -1358,6 +1354,7 @@ RCOptionEditor::RCOptionEditor () Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), string_compose (_("When enabled %1 will stop recording if an over- or underrun is detected by the audio engine"), PROGRAM_NAME)); + add_option (_("Transport"), tsf); tsf = new BoolOption ( "loop-is-mode", @@ -1537,12 +1534,12 @@ RCOptionEditor::RCOptionEditor () /* EDITOR */ - add_option (_("Editor"), + add_option (S_("Editor"), new BoolOption ( - "link-region-and-track-selection", - _("Link selection of regions and tracks"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_region_and_track_selection), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_region_and_track_selection) + "draggable-playhead", + _("Allow dragging of playhead"), + sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_draggable_playhead), + sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_draggable_playhead) )); add_option (_("Editor"), @@ -1569,6 +1566,25 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_editor_meter) )); + ComboOption* fadeshape = new ComboOption ( + "default-fade-shape", + _("Default fade shape"), + sigc::mem_fun (*_rc_config, + &RCConfiguration::get_default_fade_shape), + sigc::mem_fun (*_rc_config, + &RCConfiguration::set_default_fade_shape) + ); + + fadeshape->add (FadeLinear, + _("Linear (for highly correlated material)")); + fadeshape->add (FadeConstantPower, _("Constant power")); + fadeshape->add (FadeSymmetric, _("Symmetric")); + fadeshape->add (FadeSlow, _("Slow")); + fadeshape->add (FadeFast, _("Fast")); + + add_option (_("Editor"), fadeshape); + + bco = new BoolComboOption ( "use-overlap-equivalency", _("Regions in active edit groups are edited together"), @@ -2150,20 +2166,35 @@ RCOptionEditor::RCOptionEditor () add_option (S_("GUI"), new BoolOption ( "super-rapid-clock-update", - _("update transport clock display every 40ms instead of every 100ms"), + _("update transport clock display at FPS instead of every 100ms"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_super_rapid_clock_update), sigc::mem_fun (*_rc_config, &RCConfiguration::set_super_rapid_clock_update) )); + /* Lock GUI timeout */ + + Gtk::Adjustment *lts = manage (new Gtk::Adjustment(0, 0, 1000, 1, 10)); + HSliderOption *slts = new HSliderOption("lock-gui-after-seconds", + _("Lock timeout (seconds)"), + lts, + sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::get_lock_gui_after_seconds), + sigc::mem_fun (*ARDOUR_UI::config(), &UIConfiguration::set_lock_gui_after_seconds) + ); + slts->scale().set_digits (0); + Gtkmm2ext::UI::instance()->set_tip + (slts->tip_widget(), + _("Lock GUI after this many idle seconds (zero to never lock)")); + add_option (S_("Preferences|GUI"), slts); + /* The names of these controls must be the same as those given in MixerStrip for the actual widgets being controlled. */ + _mixer_strip_visibility.add (0, X_("Input"), _("Input")); _mixer_strip_visibility.add (0, X_("PhaseInvert"), _("Phase Invert")); - _mixer_strip_visibility.add (0, X_("SoloSafe"), _("Solo Safe")); - _mixer_strip_visibility.add (0, X_("SoloIsolated"), _("Solo Isolated")); + _mixer_strip_visibility.add (0, X_("RecMon"), _("Record & Monitor")); + _mixer_strip_visibility.add (0, X_("SoloIsoLock"), _("Solo Iso / Lock")); + _mixer_strip_visibility.add (0, X_("Output"), _("Output")); _mixer_strip_visibility.add (0, X_("Comments"), _("Comments")); - _mixer_strip_visibility.add (0, X_("Group"), _("Group")); - _mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point")); add_option ( S_("Preferences|GUI"), @@ -2183,7 +2214,7 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms) )); - add_option (S_("Preferences|GUI"), new OptionEditorHeading (_("Metering"))); + add_option (S_("Preferences|Metering"), new OptionEditorHeading (_("Metering"))); ComboOption* mht = new ComboOption ( "meter-hold", @@ -2197,7 +2228,7 @@ RCOptionEditor::RCOptionEditor () mht->add (MeterHoldMedium, _("medium")); mht->add (MeterHoldLong, _("long")); - add_option (S_("Preferences|GUI"), mht); + add_option (S_("Preferences|Metering"), mht); ComboOption* mfo = new ComboOption ( "meter-falloff", @@ -2216,7 +2247,7 @@ RCOptionEditor::RCOptionEditor () mfo->add (METER_FALLOFF_FASTER, _("faster [46dB/sec]")); mfo->add (METER_FALLOFF_FASTEST, _("fastest [70dB/sec]")); - add_option (S_("Preferences|GUI"), mfo); + add_option (S_("Preferences|Metering"), mfo); ComboOption* mlu = new ComboOption ( "meter-line-up-level", @@ -2232,7 +2263,7 @@ RCOptionEditor::RCOptionEditor () 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); + add_option (S_("Preferences|Metering"), mlu); ComboOption* mld = new ComboOption ( "meter-line-up-din", @@ -2248,7 +2279,7 @@ RCOptionEditor::RCOptionEditor () Gtkmm2ext::UI::instance()->set_tip (mld->tip_widget(), _("Reference level for IEC1/DIN meter.")); - add_option (S_("Preferences|GUI"), mld); + add_option (S_("Preferences|Metering"), mld); ComboOption* mvu = new ComboOption ( "meter-vu-standard", @@ -2262,7 +2293,7 @@ RCOptionEditor::RCOptionEditor () mvu->add (MeteringVUstandard, _("0VU = +4dBu (standard)")); mvu->add (MeteringVUeight, _("0VU = +8dBu")); - add_option (S_("Preferences|GUI"), mvu); + add_option (S_("Preferences|Metering"), mvu); Gtk::Adjustment *mpk = manage (new Gtk::Adjustment(0, -10, 0, .1, .1)); HSliderOption *mpks = new HSliderOption("meter-peak", @@ -2276,9 +2307,9 @@ RCOptionEditor::RCOptionEditor () (mpks->tip_widget(), _("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|Metering"), mpks); - add_option (S_("Preferences|GUI"), + add_option (S_("Preferences|Metering"), new BoolOption ( "meter-style-led", _("LED meter style"),