diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-22 19:19:24 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
commit | 9b9a7beb130d183fc08a57927a3eaf4441be6809 (patch) | |
tree | 2857fa4cdf41c3949d262634fbff8af9ac6f95f0 /gtk2_ardour/ardour_ui_dependents.cc | |
parent | ec65e351acea329de1d09b8ce518a023001dfdab (diff) |
cleanup various merge conflict resolution errors/omissions
Diffstat (limited to 'gtk2_ardour/ardour_ui_dependents.cc')
-rw-r--r-- | gtk2_ardour/ardour_ui_dependents.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index 7f75c174eb..ddeebdef83 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -40,6 +40,7 @@ #include "mixer_ui.h" #include "keyboard.h" #include "splash.h" +#include "rc_option_editor.h" #include "route_params_ui.h" #include "opts.h" #include "utils.h" @@ -104,7 +105,7 @@ ARDOUR_UI::we_have_dependents () boost::function<void (std::string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); Config->map_parameters (pc); - ARDOUR_UI_UTILS::reset_dpi (); + UIConfiguration::instance().reset_dpi (); } void |