X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frc_option_editor.cc;h=421e4c56c2dc0025b249aeb56191423de1912963;hb=9e5b7db89f381c70232fab35dc21fd885863f998;hp=efaccc7be611ef20c887c7a400f50b30c969043b;hpb=6554f0f93d5cfdc06a9f6f5407a080c32c6864a4;p=ardour.git

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index efaccc7be6..421e4c56c2 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1053,7 +1053,7 @@ public:
 
 		_box->pack_start (*h, false, false);
 
-		set_note (_("Adjusting the scale require an application restart to re-layout."));
+		set_note (_("Adjusting the scale requires an application restart to re-layout."));
 
 		_dpi_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &FontScalingOptions::dpi_changed));
 	}
@@ -2019,6 +2019,7 @@ RCOptionEditor::RCOptionEditor ()
 	_ltc_port->set_popdown_strings (physical_inputs);
 
 	populate_sync_options ();
+	AudioEngine::instance()->Running.connect (engine_started_connection, MISSING_INVALIDATOR, boost::bind (&RCOptionEditor::populate_sync_options, this), gui_context());
 
 	add_option (_("Transport"), _ltc_port);
 
@@ -2107,6 +2108,14 @@ if (!Profile->get_mixbus()) {
 			    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_zoom_tools),
 			    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_zoom_tools)
 			    ));
+
+	add_option (_("Editor"),
+		    new BoolOption (
+			    "use-mouse-position-as-zoom-focus-on-scroll",
+			    _("Always use mouse cursor position as zoom focus when zooming using mouse scroll wheel"),
+			    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_use_mouse_position_as_zoom_focus_on_scroll),
+			    sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_use_mouse_position_as_zoom_focus_on_scroll)
+			    ));
 }  // !mixbus
 
 	add_option (_("Editor"),
@@ -2815,6 +2824,16 @@ if (!Profile->get_mixbus()) {
 	add_option (_("Plugins"), bo);
 	Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(),
 					    _("<b>When enabled</b> 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."));
+
+	add_option (_("Plugins"),
+			new RcActionButton (_("Clear"),
+				sigc::mem_fun (*this, &RCOptionEditor::clear_au_cache),
+				_("AU Cache:")));
+
+	add_option (_("Plugins"),
+			new RcActionButton (_("Clear"),
+				sigc::mem_fun (*this, &RCOptionEditor::clear_au_blacklist),
+				_("AU Blacklist:")));
 #endif
 
 #if (defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined AUDIOUNIT_SUPPORT || defined HAVE_LV2)
@@ -3178,8 +3197,9 @@ void RCOptionEditor::clear_au_blacklist () {
 }
 
 void RCOptionEditor::edit_lxvst_path () {
+	Glib::RefPtr<Gdk::Window> win = get_parent_window ();
 	Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
-			_("Set Linux VST Search Path"),
+			*this, _("Set Linux VST Search Path"),
 			_rc_config->get_plugin_path_lxvst(),
 			PluginManager::instance().get_default_lxvst_path()
 			);
@@ -3193,7 +3213,7 @@ void RCOptionEditor::edit_lxvst_path () {
 
 void RCOptionEditor::edit_vst_path () {
 	Gtkmm2ext::PathsDialog *pd = new Gtkmm2ext::PathsDialog (
-			_("Set Windows VST Search Path"),
+			*this, _("Set Windows VST Search Path"),
 			_rc_config->get_plugin_path_vst(),
 			PluginManager::instance().get_default_windows_vst_path()
 			);
@@ -3224,4 +3244,6 @@ RCOptionEditor::populate_sync_options ()
 			_rc_config->set_sync_source(sync_opts.front());
 		}
 	}
+
+	parameter_changed ("sync-source");
 }