diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-09-21 09:17:25 +0100 |
| commit | 19bb2b33a89a1291451f0740739a36daebe00bae (patch) | |
| tree | d0cafb4792ec4ff61d04d16c1e86199b2714a36f /gtk2_ardour/generic_pluginui.cc | |
| parent | 66aa6dfc8ecdb7591768bc45866a8c2b0d77e767 (diff) | |
| parent | fd23ebd0886cd61f8ee68d52d6576d00a16c9032 (diff) | |
Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows
Conflicts (hopefully resolved):
gtk2_ardour/marker.cc
gtk2_ardour/midi_region_view.h
gtk2_ardour/region_gain_line.h
gtk2_ardour/utils.cc
gtk2_ardour/video_image_frame.cc
gtk2_ardour/wscript
libs/backends/jack/wscript
Diffstat (limited to 'gtk2_ardour/generic_pluginui.cc')
| -rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 83f091a1e0..ab22d97221 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -675,8 +675,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat 0xcccc00ff, 0xcccc00ff, 0xffaa00ff, 0xffaa00ff, 0xff0000ff, - ARDOUR_UI::config()->canvasvar_MeterBackgroundBot.get(), - ARDOUR_UI::config()->canvasvar_MeterBackgroundTop.get() + ARDOUR_UI::config()->get_canvasvar_MeterBackgroundBot(), + ARDOUR_UI::config()->get_canvasvar_MeterBackgroundTop() ); info->min_unbound = desc.min_unbound; |