X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frc_option_editor.cc;h=5646602e4cd09b0fdf8c1726586b7ae7168a9565;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=c843276683cf8690b64d27b470b34b07544a4166;hpb=e8fc8aa992f7fad798935de227e2a15d0a075c71;p=ardour.git diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index c843276683..5646602e4c 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -54,6 +54,7 @@ #include "midi_port_dialog.h" #include "sfdb_ui.h" #include "keyboard.h" +#include "theme_manager.h" #include "i18n.h" using namespace std; @@ -67,8 +68,7 @@ class ClickOptions : public OptionEditorBox { public: ClickOptions (RCConfiguration* c, Gtk::Window* p) - : _rc_config (c), - _parent (p) + : _rc_config (c) { Table* t = manage (new Table (2, 3)); t->set_spacings (4); @@ -154,7 +154,6 @@ private: } RCConfiguration* _rc_config; - Gtk::Window* _parent; Entry _click_path_entry; Entry _click_emphasis_path_entry; }; @@ -583,7 +582,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 ()); @@ -795,17 +794,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; - } } } @@ -817,8 +806,8 @@ private: } } - void edit_clicked (GdkEventButton* ev) - { + void edit_clicked (GdkEventButton* ev) + { if (ev->type != GDK_2BUTTON_PRESS) { return; } @@ -828,26 +817,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 @@ -860,14 +855,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; @@ -1002,7 +995,8 @@ public: PluginOptions (RCConfiguration* c) : _rc_config (c) , _display_plugin_scan_progress (_("Always Display Plugin Scan Progress")) - , _discover_vst_on_start (_("Scan for new VST Plugins on Application Start")) + , _discover_vst_on_start (_("Scan for [new] VST Plugins on Application Start")) + , _discover_au_on_start (_("Scan for AudioUnit Plugins on Application Start")) , _timeout_adjustment (0, 0, 3000, 50, 50) , _timeout_slider (_timeout_adjustment) { @@ -1028,6 +1022,7 @@ public: 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)")); +#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT) _timeout_slider.set_digits (0); _timeout_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &PluginOptions::timeout_changed)); @@ -1075,6 +1070,14 @@ public: b->signal_clicked().connect (sigc::mem_fun (*this, &PluginOptions::edit_vst_path_clicked)); t->attach (*b, 1, 2, n, n+1, FILL); ++n; #endif +#endif // any VST + +#ifdef AUDIOUNIT_SUPPORT + t->attach (_discover_au_on_start, 0, 2, n, n+1); ++n; + _discover_au_on_start.signal_toggled().connect (sigc::mem_fun (*this, &PluginOptions::discover_au_on_start_toggled)); + Gtkmm2ext::UI::instance()->set_tip (_discover_au_on_start, + _("When enabled Audio Unit Plugins are discovered on application start. When disabled AU plugins will only be available after triggering a 'Scan' manually. The first successful scan will enable AU auto-scan, Any crash during plugin discovery will disable it.")); +#endif _box->pack_start (*t,true,true); } @@ -1092,18 +1095,24 @@ public: int const x = _rc_config->get_vst_scan_timeout(); _timeout_adjustment.set_value (x); } + else if (p == "discover-audio-units") { + bool const x = _rc_config->get_discover_audio_units(); + _discover_au_on_start.set_active (x); + } } void set_state_from_config () { parameter_changed ("show-plugin-scan-window"); parameter_changed ("discover-vst-on-start"); parameter_changed ("vst-scan-timeout"); + parameter_changed ("discover-audio-units"); } private: RCConfiguration* _rc_config; CheckButton _display_plugin_scan_progress; CheckButton _discover_vst_on_start; + CheckButton _discover_au_on_start; Adjustment _timeout_adjustment; HScale _timeout_slider; @@ -1117,6 +1126,11 @@ private: _rc_config->set_discover_vst_on_start(x); } + void discover_au_on_start_toggled () { + bool const x = _discover_au_on_start.get_active(); + _rc_config->set_discover_audio_units(x); + } + void timeout_changed () { int x = floor(_timeout_adjustment.get_value()); _rc_config->set_vst_scan_timeout(x); @@ -1230,7 +1244,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 */ @@ -1540,12 +1554,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"), @@ -2133,21 +2147,13 @@ RCOptionEditor::RCOptionEditor () /* VIDEO Timeline */ add_option (_("Video"), new VideoTimelineOptions (_rc_config)); -#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT) +#if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT) /* Plugin options (currrently VST only) */ add_option (_("Plugins"), new PluginOptions (_rc_config)); #endif /* INTERFACE */ - add_option (S_("Preferences|GUI"), - new BoolOption ( - "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 (S_("Preferences|GUI"), new BoolOption ( "widget-prelight", @@ -2180,7 +2186,7 @@ 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) )); @@ -2203,12 +2209,12 @@ RCOptionEditor::RCOptionEditor () /* 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"), @@ -2228,7 +2234,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", @@ -2242,7 +2248,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", @@ -2261,7 +2267,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", @@ -2277,7 +2283,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", @@ -2293,7 +2299,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", @@ -2307,7 +2313,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", @@ -2321,9 +2327,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"), @@ -2331,6 +2337,10 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_meter_style_led) )); + /* and now the theme manager */ + + ThemeManager* tm = manage (new ThemeManager); + add_page (_("Theme"), *tm); } void