Merge branch 'waveview_hacks' of https://github.com/nmains/ardour into cairocanvas