allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

migrate plugin-ui settings to ui-config

Browse Source
This commit is contained in:
Robin Gareus
2016-03-15 15:15:23 +01:00
parent c8d25f37bc
commit 204e50bf89
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/processor_box.cc
View File

@@ -158,7 +158,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
std::max (60.f, rintf(80.f * UIConfiguration::instance().get_ui_scale())));
_vbox.pack_start (*_plugin_display);
_plugin_display->set_no_show_all (true);
if (Config->get_show_inline_display_by_default ()) {
if (UIConfiguration::instance().get_show_inline_display_by_default ()) {
_plugin_display->show ();
}
}
@@ -2039,8 +2039,8 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins)
weird_plugin_dialog (**p, err_streams);
return true;
// XXX SHAREDPTR delete plugin here .. do we even need to care?
} else if (plugins.size() == 1 && Config->get_open_gui_after_adding_plugin()) {
if (boost::dynamic_pointer_cast<PluginInsert>(processor)->plugin()->has_inline_display() && Config->get_prefer_inline_over_gui()) {
} else if (plugins.size() == 1 && UIConfiguration::instance().get_open_gui_after_adding_plugin()) {
if (boost::dynamic_pointer_cast<PluginInsert>(processor)->plugin()->has_inline_display() && UIConfiguration::instance().get_prefer_inline_over_gui()) {
;
} else if (_session->engine().connected () && processor_can_be_edited (processor)) {
if ((*p)->has_editor ()) {

17
gtk2_ardour/rc_option_editor.cc
View File

@@ -1787,6 +1787,9 @@ RCOptionEditor::RCOptionEditor ()
, _rc_config (Config)
, _mixer_strip_visibility ("mixer-element-visibility")
{
UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &RCOptionEditor::parameter_changed));
/* MISC */
uint32_t hwcpus = hardware_concurrency ();
@@ -2905,8 +2908,8 @@ if (!Profile->get_mixbus()) {
new BoolOption (
"open-gui-after-adding-plugin",
_("Automatically open the plugin GUI when adding a new plugin"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_open_gui_after_adding_plugin),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_open_gui_after_adding_plugin)
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_open_gui_after_adding_plugin),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_open_gui_after_adding_plugin)
));
#ifdef LV2_SUPPORT
@@ -2914,15 +2917,15 @@ if (!Profile->get_mixbus()) {
new BoolOption (
"show-inline-display-by-default",
_("Show Plugin Inline Display on Mixerstrip by default"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_inline_display_by_default),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_inline_display_by_default)
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_show_inline_display_by_default),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_show_inline_display_by_default)
));
_plugin_prefer_inline = new BoolOption (
"prefer-inline-over-gui",
_("Don't automatically open the plugin GUI when the plugin has an inline display mode"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_prefer_inline_over_gui),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_prefer_inline_over_gui)
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_prefer_inline_over_gui),
sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_prefer_inline_over_gui)
);
add_option (_("Plugins"), _plugin_prefer_inline);
#endif
@@ -3252,7 +3255,7 @@ RCOptionEditor::parameter_changed (string const & p)
_ltc_volume_slider->set_sensitive (s);
} else if (p == "open-gui-after-adding-plugin" || p == "show-inline-display-by-default") {
#ifdef LV2_SUPPORT
_plugin_prefer_inline->set_sensitive (Config->get_open_gui_after_adding_plugin() && Config->get_show_inline_display_by_default());
_plugin_prefer_inline->set_sensitive (UIConfiguration::instance().get_open_gui_after_adding_plugin() && UIConfiguration::instance().get_show_inline_display_by_default());
#endif
}
}

3
gtk2_ardour/ui_config_vars.h
View File

@@ -77,3 +77,6 @@ UI_CONFIG_VARIABLE (bool, cairo_image_surface, "cairo-image-surface", false)
UI_CONFIG_VARIABLE (uint64_t, waveform_cache_size, "waveform-cache-size", 100) /* units of megagbytes */
UI_CONFIG_VARIABLE (int32_t, recent_session_sort, "recent-session-sort", 0)
UI_CONFIG_VARIABLE (std::string, xjadeo_binary, "xjadeo-binary", "")
UI_CONFIG_VARIABLE (bool, open_gui_after_adding_plugin, "open-gui-after-adding-plugin", true)
UI_CONFIG_VARIABLE (bool, show_inline_display_by_default, "show-inline-display-by-default", true)
UI_CONFIG_VARIABLE (bool, prefer_inline_over_gui, "prefer-inline-over-gui", true)