merge 12436:12607 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12608 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-06-08 14:03:30 +00:00
parent 6ef90ffe5c
commit f228d2c68e
86 changed files with 6512 additions and 4626 deletions

View file

@ -46,13 +46,18 @@ CanvasPatchChange::CanvasPatchChange(
double y,
string& model_name,
string& custom_device_mode,
ARDOUR::MidiModel::PatchChangePtr patch)
ARDOUR::MidiModel::PatchChangePtr patch,
bool active_channel)
: CanvasFlag(
region,
parent,
height,
ARDOUR_UI::config()->canvasvar_MidiPatchChangeOutline.get(),
ARDOUR_UI::config()->canvasvar_MidiPatchChangeFill.get(),
active_channel ?
ARDOUR_UI::config()->canvasvar_MidiPatchChangeOutline.get() :
ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelOutline.get(),
active_channel ?
ARDOUR_UI::config()->canvasvar_MidiPatchChangeFill.get() :
ARDOUR_UI::config()->canvasvar_MidiPatchChangeInactiveChannelFill.get(),
x,
y)
, _model_name(model_name)