Allow markers to be glued to bar/beat time. Fixes #1815.

[ardour.git] / gtk2_ardour / canvas_vars.h

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index 5f2f5ca2c6c9316166928964d2b06fd0298881ca..d012ab98f52997abc28d735848aa8cecc1882887 100644 (file)
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -1,35 +1,34 @@
 CANVAS_VARIABLE(canvasvar_ActiveCrossfade, "active crossfade")
 CANVAS_VARIABLE(canvasvar_AudioBusBase, "audio bus base")
+CANVAS_VARIABLE(canvasvar_AudioMasterBusBase, "audio master bus base")
 CANVAS_VARIABLE(canvasvar_AudioTrackBase, "audio track base")
 CANVAS_VARIABLE(canvasvar_AutomationLine, "automation line")
 CANVAS_VARIABLE(canvasvar_AutomationTrackFill, "automation track fill")
 CANVAS_VARIABLE(canvasvar_AutomationTrackOutline, "automation track outline")
 CANVAS_VARIABLE(canvasvar_CDMarkerBar, "cd marker bar")
-CANVAS_VARIABLE(canvasvar_ControlPoint, "control point")
-CANVAS_VARIABLE(canvasvar_ControlPointFill, "control point fill")
-CANVAS_VARIABLE(canvasvar_ControlPointOutline, "control point outline")
-CANVAS_VARIABLE(canvasvar_ControlPointSelected, "control point selected")
 CANVAS_VARIABLE(canvasvar_CrossfadeEditorBase, "crossfade editor base")
 CANVAS_VARIABLE(canvasvar_CrossfadeEditorLine, "crossfade editor line")
 CANVAS_VARIABLE(canvasvar_CrossfadeEditorLineShading, "crossfade editor line shading")
 CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointFill, "crossfade editor point fill")
 CANVAS_VARIABLE(canvasvar_CrossfadeEditorPointOutline, "crossfade editor point outline")
 CANVAS_VARIABLE(canvasvar_CrossfadeEditorWave, "crossfade editor wave")
+CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWaveFill, "selected crossfade editor wave fill")
 CANVAS_VARIABLE(canvasvar_CrossfadeLine, "crossfade line")
 CANVAS_VARIABLE(canvasvar_EditPoint, "edit point")
 CANVAS_VARIABLE(canvasvar_EnteredAutomationLine, "entered automation line")
-CANVAS_VARIABLE(canvasvar_EnteredControlPoint, "entered control point")
-CANVAS_VARIABLE(canvasvar_EnteredControlPointOutline, "entered control point outline")
-CANVAS_VARIABLE(canvasvar_EnteredControlPointSelected, "entered control point selected")
+CANVAS_VARIABLE(canvasvar_ControlPointFill, "control point fill")
+CANVAS_VARIABLE(canvasvar_ControlPointOutline, "control point outline")
+CANVAS_VARIABLE(canvasvar_ControlPointSelected, "control point selected")
 CANVAS_VARIABLE(canvasvar_EnteredGainLine, "entered gain line")
 CANVAS_VARIABLE(canvasvar_EnteredMarker, "entered marker")
-CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
 CANVAS_VARIABLE(canvasvar_FrameHandle, "frame handle")
 CANVAS_VARIABLE(canvasvar_GainLine, "gain line")
 CANVAS_VARIABLE(canvasvar_GainLineInactive, "gain line inactive")
 CANVAS_VARIABLE(canvasvar_GhostTrackBase, "ghost track base")
-CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "ghost track wave clip")
+CANVAS_VARIABLE(canvasvar_GhostTrackMidiOutline, "ghost track midi outline")
 CANVAS_VARIABLE(canvasvar_GhostTrackWave, "ghost track wave")
+CANVAS_VARIABLE(canvasvar_GhostTrackWaveFill, "ghost track wave fill")
+CANVAS_VARIABLE(canvasvar_GhostTrackWaveClip, "ghost track wave clip")
 CANVAS_VARIABLE(canvasvar_GhostTrackZeroLine, "ghost track zero line")
 CANVAS_VARIABLE(canvasvar_ImageTrack, "image track")
 CANVAS_VARIABLE(canvasvar_InactiveCrossfade, "inactive crossfade")
@@ -50,16 +49,26 @@ CANVAS_VARIABLE(canvasvar_MeterColorBase, "meter fill min")
 CANVAS_VARIABLE(canvasvar_MeterColorClip, "meter fill clip")
 CANVAS_VARIABLE(canvasvar_MeterColorMid, "meter fill mid")
 CANVAS_VARIABLE(canvasvar_MeterColorTop, "meter fill max")
+CANVAS_VARIABLE(canvasvar_MidiMeterColorBase, "midi meter fill min")
+CANVAS_VARIABLE(canvasvar_MidiMeterColorClip, "midi meter fill clip")
+CANVAS_VARIABLE(canvasvar_MidiMeterColorMid, "midi meter fill mid")
+CANVAS_VARIABLE(canvasvar_MidiMeterColorTop, "midi 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_MidiNoteOutlineMax, "midi note outline max")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMid, "midi note outline mid")
-CANVAS_VARIABLE(canvasvar_MidiNoteOutlineMin, "midi note outline min")
-CANVAS_VARIABLE(canvasvar_MidiNoteSelectedOutline, "midi note selected outline")
+CANVAS_VARIABLE(canvasvar_MidiNoteInactiveChannel, "midi note inactive channel")
+CANVAS_VARIABLE(canvasvar_MidiNoteColorBase, "midi note color min")
+CANVAS_VARIABLE(canvasvar_MidiNoteColorMid, "midi note color mid")
+CANVAS_VARIABLE(canvasvar_MidiNoteColorTop, "midi note color max")
+CANVAS_VARIABLE(canvasvar_SelectedMidiNoteColorBase, "selected midi note color min")
+CANVAS_VARIABLE(canvasvar_SelectedMidiNoteColorMid, "selected midi note color mid")
+CANVAS_VARIABLE(canvasvar_SelectedMidiNoteColorTop, "selected midi note 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")
@@ -75,6 +84,8 @@ CANVAS_VARIABLE(canvasvar_RangeDragBarRect, "range drag bar rect")
 CANVAS_VARIABLE(canvasvar_RangeDragRect, "range drag rect")
 CANVAS_VARIABLE(canvasvar_RangeMarkerBar, "range marker bar")
 CANVAS_VARIABLE(canvasvar_RecordingRect, "recording rect")
+CANVAS_VARIABLE(canvasvar_RecWaveFormFill, "recorded waveform fill")
+CANVAS_VARIABLE(canvasvar_RecWaveForm, "recorded waveform outline")
 CANVAS_VARIABLE(canvasvar_RubberBandRect, "rubber band rect")
 CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line")
 CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave")
@@ -96,8 +107,9 @@ CANVAS_VARIABLE(canvasvar_TrimHandleLocked, "trim handle locked")
 CANVAS_VARIABLE(canvasvar_TrimHandle, "trim handle")
 CANVAS_VARIABLE(canvasvar_VerboseCanvasCursor, "verbose canvas cursor")
 CANVAS_VARIABLE(canvasvar_VestigialFrame, "vestigial frame")
+CANVAS_VARIABLE(canvasvar_FrameBase, "region base")
+CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
 CANVAS_VARIABLE(canvasvar_WaveFormClip, "clipped waveform")
 CANVAS_VARIABLE(canvasvar_WaveFormFill, "waveform fill")
-CANVAS_VARIABLE(canvasvar_WaveForm, "waveform outline")
 CANVAS_VARIABLE(canvasvar_ZeroLine, "zero line")
 CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")