X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frc_option_editor.cc;h=a4d2b5dee2325c9052eb3ec604eb816c0c5569fd;hb=3ddd797e46b232235deb8d79c34b40f35bb2153b;hp=0331597faca33581f800e012539bb502fd0ca732;hpb=64c2328a8a6cf79eb56a24ad6bdd93375bde4d32;p=ardour.git diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 0331597fac..a4d2b5dee2 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -30,6 +30,7 @@ #include #include #include +#include #include "pbd/fpu.h" #include "pbd/cpus.h" @@ -43,6 +44,7 @@ #include "canvas/wave_view.h" +#include "ardour_ui.h" #include "ardour_window.h" #include "ardour_dialog.h" #include "gui_thread.h" @@ -59,6 +61,7 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace PBD; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; class ClickOptions : public OptionEditorBox { @@ -580,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 ()); @@ -792,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; - } } } @@ -814,8 +807,8 @@ private: } } - void edit_clicked (GdkEventButton* ev) - { + void edit_clicked (GdkEventButton* ev) + { if (ev->type != GDK_2BUTTON_PRESS) { return; } @@ -825,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 @@ -857,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; @@ -998,35 +995,80 @@ class PluginOptions : public OptionEditorBox public: PluginOptions (RCConfiguration* c) : _rc_config (c) - , _display_plugin_scan_progress (_("Display Plugin Scan Progress")) - , _discover_vst_on_start (_("Scan for new VST Plugin on Application Start")) + , _display_plugin_scan_progress (_("Always Display Plugin Scan Progress")) + , _discover_vst_on_start (_("Scan for new VST Plugins on Application Start")) + , _timeout_adjustment (0, 0, 3000, 50, 50) + , _timeout_slider (_timeout_adjustment) { + Label *l; + std::stringstream ss; Table* t = manage (new Table (2, 6)); t->set_spacings (4); Button* b; + int n = 0; + + ss << "" << _("General") << ""; + l = manage (left_aligned_label (ss.str())); + l->set_use_markup (true); + t->attach (*manage (new Label ("")), 0, 3, n, n+1, FILL | EXPAND); ++n; + t->attach (*l, 0, 2, n, n+1, FILL | EXPAND); ++n; - b = manage (new Button (_("Refresh Plugin List"))); + b = manage (new Button (_("Scan for Plugins"))); b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::refresh_clicked)); - t->attach (*b, 0, 2, 0, 1, FILL); + t->attach (*b, 0, 2, n, n+1, FILL); ++n; + + t->attach (_display_plugin_scan_progress, 0, 2, n, n+1); ++n; + _display_plugin_scan_progress.signal_toggled().connect (sigc::mem_fun (*this, &PluginOptions::display_plugin_scan_progress_toggled)); + Gtkmm2ext::UI::instance()->set_tip (_display_plugin_scan_progress, + _("When enabled a popup window showing plugin scan progress is displayed for indexing (cache load) and discovery (detect new plugins)")); + + _timeout_slider.set_digits (0); + _timeout_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &PluginOptions::timeout_changed)); + + Gtkmm2ext::UI::instance()->set_tip(_timeout_slider, + _("Specify the default timeout for plugin instantiation in 1/10 seconds. Plugins that require more time to load will be blacklisted. A value of 0 disables the timeout.")); + + l = manage (left_aligned_label (_("Scan Time Out [deciseconds]")));; + HBox* h = manage (new HBox); + h->set_spacing (4); + h->pack_start (*l, false, false); + h->pack_start (_timeout_slider, true, true); + t->attach (*h, 0, 2, n, n+1); ++n; + + ss.str(""); + ss << "" << _("VST") << ""; + l = manage (left_aligned_label (ss.str())); + l->set_use_markup (true); + t->attach (*manage (new Label ("")), 0, 3, n, n+1, FILL | EXPAND); ++n; + t->attach (*l, 0, 2, n, n+1, FILL | EXPAND); ++n; b = manage (new Button (_("Clear VST Cache"))); b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::clear_vst_cache_clicked)); - t->attach (*b, 0, 2, 1, 2, FILL); + t->attach (*b, 0, 1, n, n+1, FILL); b = manage (new Button (_("Clear VST Blacklist"))); b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::clear_vst_blacklist_clicked)); - t->attach (*b, 0, 2, 2, 3, FILL); + t->attach (*b, 1, 2, n, n+1, FILL); + ++n; - t->attach (_discover_vst_on_start, 0, 2, 3, 4); + t->attach (_discover_vst_on_start, 0, 2, n, n+1); ++n; _discover_vst_on_start.signal_toggled().connect (sigc::mem_fun (*this, &PluginOptions::discover_vst_on_start_toggled)); Gtkmm2ext::UI::instance()->set_tip (_discover_vst_on_start, - _("When enabled VST plugins are searched and tested on application start. When disabled they a Refresh will have to be tiggered manually")); + _("When enabled new VST plugins are searched, tested and added to the cache index on application start. When disabled new plugins will only be available after triggering a 'Scan' manually")); - t->attach (_display_plugin_scan_progress, 0, 2, 4, 5); - _display_plugin_scan_progress.signal_toggled().connect (sigc::mem_fun (*this, &PluginOptions::display_plugin_scan_progress_toggled)); - Gtkmm2ext::UI::instance()->set_tip (_display_plugin_scan_progress, - _("When enabled display a popup window showing plugin scan progress.")); +#ifdef LXVST_SUPPORT + t->attach (*manage (left_aligned_label (_("Linux VST Path:"))), 0, 1, n, n+1); + b = manage (new Button (_("Edit"))); + b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_lxvst_path_clicked)); + t->attach (*b, 1, 2, n, n+1, FILL); ++n; +#endif +#ifdef WINDOWS_VST_SUPPORT + t->attach (*manage (left_aligned_label (_("Windows VST Path:"))), 0, 1, n, n+1); + 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; +#endif _box->pack_start (*t,true,true); } @@ -1040,17 +1082,24 @@ public: bool const x = _rc_config->get_discover_vst_on_start(); _discover_vst_on_start.set_active (x); } + else if (p == "vst-scan-timeout") { + int const x = _rc_config->get_vst_scan_timeout(); + _timeout_adjustment.set_value (x); + } } void set_state_from_config () { parameter_changed ("show-plugin-scan-window"); parameter_changed ("discover-vst-on-start"); + parameter_changed ("vst-scan-timeout"); } private: RCConfiguration* _rc_config; CheckButton _display_plugin_scan_progress; CheckButton _discover_vst_on_start; + Adjustment _timeout_adjustment; + HScale _timeout_slider; void display_plugin_scan_progress_toggled () { bool const x = _display_plugin_scan_progress.get_active(); @@ -1062,6 +1111,11 @@ private: _rc_config->set_discover_vst_on_start(x); } + void timeout_changed () { + int x = floor(_timeout_adjustment.get_value()); + _rc_config->set_vst_scan_timeout(x); + } + void clear_vst_cache_clicked () { PluginManager::instance().clear_vst_cache(); } @@ -1070,6 +1124,35 @@ private: PluginManager::instance().clear_vst_blacklist(); } + void edit_vst_path_clicked () { + Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog ( + _("Set Windows VST Search Path"), + _rc_config->get_plugin_path_vst(), + PluginManager::instance().get_default_windows_vst_path() + ); + ResponseType r = (ResponseType) pd->run (); + pd->hide(); + if (r == RESPONSE_ACCEPT) { + _rc_config->set_plugin_path_vst(pd->get_serialized_paths()); + } + delete pd; + } + + // todo consolidate with edit_vst_path_clicked.. + void edit_lxvst_path_clicked () { + Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog ( + _("Set Linux VST Search Path"), + _rc_config->get_plugin_path_lxvst(), + PluginManager::instance().get_default_lxvst_path() + ); + ResponseType r = (ResponseType) pd->run (); + pd->hide(); + if (r == RESPONSE_ACCEPT) { + _rc_config->set_plugin_path_lxvst(pd->get_serialized_paths()); + } + delete pd; + } + void refresh_clicked () { PluginManager::instance().refresh(); } @@ -1141,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 */ @@ -1273,6 +1356,17 @@ RCOptionEditor::RCOptionEditor () PROGRAM_NAME)); add_option (_("Transport"), tsf); + tsf = new BoolOption ( + "loop-is-mode", + _("Play loop is a transport mode"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_loop_is_mode), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_loop_is_mode) + ); + Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), + (_("When enabled the loop button does not start playback but forces playback to always play the loop\n\n" + "When disabled the loop button starts playing the loop, but stop then cancels loop playback"))); + add_option (_("Transport"), tsf); + tsf = new BoolOption ( "create-xrun-marker", _("Create markers where xruns occur"), @@ -1415,7 +1509,7 @@ RCOptionEditor::RCOptionEditor () _ltc_send_continuously = new BoolOption ( "ltc-send-continuously", - _("send LTC while stopped"), + _("Send LTC while stopped"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_ltc_send_continuously), sigc::mem_fun (*_rc_config, &RCConfiguration::set_ltc_send_continuously) ); @@ -1440,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"), @@ -1472,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"), @@ -1708,6 +1821,8 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_new_plugins_active) )); + add_option (_("Audio"), new OptionEditorHeading (_("Regions"))); + add_option (_("Audio"), new BoolOption ( "auto-analyse-audio", @@ -1929,7 +2044,7 @@ RCOptionEditor::RCOptionEditor () add_option (_("MIDI"), new BoolOption ( - "diplay-first-midi-bank-as-zero", + "display-first-midi-bank-as-zero", _("Display first MIDI bank/program as 0"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_first_midi_bank_is_zero), sigc::mem_fun (*_rc_config, &RCConfiguration::set_first_midi_bank_is_zero) @@ -2014,7 +2129,7 @@ RCOptionEditor::RCOptionEditor () #if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT) /* Plugin options (currrently VST only) */ - add_option (_("Plugin"), new PluginOptions (_rc_config)); + add_option (_("Plugins"), new PluginOptions (_rc_config)); #endif /* INTERFACE */ @@ -2035,6 +2150,14 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_tooltips) )); + add_option (S_("Preferences|GUI"), + new BoolOption ( + "show-name-highlight", + _("Use name highlight bars in region displays"), + sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_name_highlight), + sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_name_highlight) + )); + #ifndef GTKOSX /* font scaling does nothing with GDK/Quartz */ add_option (S_("Preferences|GUI"), new FontScalingOptions (_rc_config)); @@ -2043,19 +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_("MeterPoint"), _("Meter Point")); add_option ( S_("Preferences|GUI"), @@ -2075,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", @@ -2089,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", @@ -2108,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", @@ -2124,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", @@ -2140,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", @@ -2154,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", @@ -2168,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"),