fix deadlock in protocol manager startup; fix some other ::set_session() SNAFUs;...

[ardour.git] / gtk2_ardour / canvas_vars.h

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 6f87539dd5e14ac9618fe5522ae99318cda4c5bc..2e917078349ef611e87d9743ef4a38f64a1ea884 100644 (file)
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -56,18 +56,16 @@ CANVAS_VARIABLE(canvasvar_MeterColorTop, "meter fill max")
 CANVAS_VARIABLE(canvasvar_MeterMarker, "meter marker")
 CANVAS_VARIABLE(canvasvar_MidiBusBase, "midi bus base")
 CANVAS_VARIABLE(canvasvar_MidiFrameBase, "midi frame base")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillMax, "midi note fill max")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillMid, "midi note fill mid")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillMin, "midi note fill min")
-CANVAS_VARIABLE(canvasvar_MidiNoteFillInactiveChannel, "midi note fill inactive channel")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMax, "midi note outline max")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMid, "midi note outline mid")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "midi note outline min")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineInactiveChannel, "midi note outline inactive channel")
-CANVAS_VARIABLE(canvasvar_MidiNoteSelectedOutline, "midi note selected outline")
+CANVAS_VARIABLE(canvasvar_MidiNoteInactiveChannel, "midi note inactive channel")
+CANVAS_VARIABLE(canvasvar_MidiNoteMeterColorBase, "midi note meter color min")
+CANVAS_VARIABLE(canvasvar_MidiNoteMeterColorMid, "midi note meter color mid")
+CANVAS_VARIABLE(canvasvar_MidiNoteMeterColorTop, "midi note meter color max")
+CANVAS_VARIABLE(canvasvar_MidiNoteSelected, "midi note selected")
 CANVAS_VARIABLE(canvasvar_MidiNoteVelocityText, "midi note velocity text")
 CANVAS_VARIABLE(canvasvar_MidiProgramChangeFill, "midi program change fill")
 CANVAS_VARIABLE(canvasvar_MidiProgramChangeOutline, "midi program change outline")
+CANVAS_VARIABLE(canvasvar_MidiSysExFill, "midi sysex fill")
+CANVAS_VARIABLE(canvasvar_MidiSysExOutline, "midi sysex outline")
 CANVAS_VARIABLE(canvasvar_MidiSelectRectFill, "midi select rect fill")
 CANVAS_VARIABLE(canvasvar_MidiSelectRectOutline, "midi select rect outline")
 CANVAS_VARIABLE(canvasvar_MidiTrackBase, "midi track base")