smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

Browse source 
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
This commit is contained in:
John Emmas 2013-09-21 09:17:25 +01:00
commit 19bb2b33a8
252 changed files with 136617 additions and 7632 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/generic_pluginui.cc
View file

@ -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;