X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fcanvas_vars.h;h=3b39f33a10e3cc0ed9c2a71940ffc1d25b32c205;hb=0d160a865b1f48a83d1b03d02ceff22a21715831;hp=e2f1f42766142d0afe133384e397d3cedcc6068d;hpb=580520b12f90251e38d94a1a5d6a199b76142b0b;p=ardour.git

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index e2f1f42766..3b39f33a10 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -51,6 +51,7 @@ 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")
+CANVAS_VARIABLE(canvasvar_InactiveFadeHandle, "inactive fade handle")
 CANVAS_VARIABLE(canvasvar_LocationCDMarker, "location cd marker")
 CANVAS_VARIABLE(canvasvar_LocationLoop, "location loop")
 CANVAS_VARIABLE(canvasvar_LocationMarker, "location marker")
@@ -65,6 +66,7 @@ CANVAS_VARIABLE(canvasvar_MeasureLineBar, "measure line bar")
 CANVAS_VARIABLE(canvasvar_MeasureLineBeat, "measure line beat")
 CANVAS_VARIABLE(canvasvar_MeterBar, "meter bar")
 CANVAS_VARIABLE(canvasvar_MeterBridgePeakLabel, "meterbridge peaklabel")
+CANVAS_VARIABLE(canvasvar_MeterColorBBC, "meter color BBC")
 CANVAS_VARIABLE(canvasvar_MeterColor0, "meter fill: 0")
 CANVAS_VARIABLE(canvasvar_MeterColor1, "meter fill: 1")
 CANVAS_VARIABLE(canvasvar_MeterColor2, "meter fill: 2")
@@ -130,6 +132,8 @@ 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_RulerBase, "ruler base")
+CANVAS_VARIABLE(canvasvar_RulerText, "ruler text")
 CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorLine, "selected crossfade editor line")
 CANVAS_VARIABLE(canvasvar_SelectedCrossfadeEditorWave, "selected crossfade editor wave")
 CANVAS_VARIABLE(canvasvar_SelectedFrameBase, "selected region base")
@@ -201,6 +205,7 @@ BUTTON_VARS(ProcessorControlButton, "processor control button")
 BUTTON_VARS(MonitorButton, "monitor button")
 BUTTON_VARS(SoloIsolateButton, "solo isolate")
 BUTTON_VARS(SoloSafeButton, "solo safe")
+BUTTON_VARS(MidiDeviceButton, "midi device")
 BUTTON_VARS(MonitorSectionCutButton, "monitor section cut")
 BUTTON_VARS(MonitorSectionDimButton, "monitor section dim")
 BUTTON_VARS(MonitorSectionSoloButton, "monitor section solo")
@@ -225,11 +230,14 @@ BUTTON_VARS(TransportActiveOptionButton, "transport active option button")
 BUTTON_VARS(PluginBypassButton, "plugin bypass button")
 BUTTON_VARS(PunchButton, "punch button")
 BUTTON_VARS(MouseModeButton, "mouse mode button")
+BUTTON_VARS(NudgeButton, "nudge button")
 BUTTON_VARS(ZoomButton, "zoom button")
+BUTTON_VARS(ZoomMenu, "zoom menu")
 BUTTON_VARS(RouteButton, "route button")
 BUTTON_VARS(MixerStripButton, "mixer strip button")
 BUTTON_VARS(MixerStripNameButton, "mixer strip name button")
 BUTTON_VARS(MidiInputButton, "midi input button")
+BUTTON_VARS(GenericButton, "generic button")
 
 #define CLOCK_VARS(root,name) \
 	CANVAS_VARIABLE(canvasvar_ ## root ## Background, name ": background") \
@@ -247,3 +255,45 @@ CLOCK_VARS(PunchClock, "punch clock")
 CLOCK_VARS(SelectionClock, "selection clock")
 CLOCK_VARS(NudgeClock, "nudge clock")
 CLOCK_VARS(GenericClock, "clock")
+
+CANVAS_STRING_VARIABLE(canvasvar_SmallFont, "small font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallerFont, "smaller font")
+CANVAS_STRING_VARIABLE(canvasvar_NormalFont, "normal font")
+CANVAS_STRING_VARIABLE(canvasvar_BigFont, "big font")
+CANVAS_STRING_VARIABLE(canvasvar_LargeFont, "large font")
+CANVAS_STRING_VARIABLE(canvasvar_LargerFont, "larger font")
+CANVAS_STRING_VARIABLE(canvasvar_HugerFont, "huger font")
+CANVAS_STRING_VARIABLE(canvasvar_MassiveFont, "massive font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallBoldFont, "small bold font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallerBoldFont, "smaller bold font")
+CANVAS_STRING_VARIABLE(canvasvar_NormalBoldFont, "normal bold font")
+CANVAS_STRING_VARIABLE(canvasvar_BigBoldFont, "big bold font")
+CANVAS_STRING_VARIABLE(canvasvar_LargeBoldFont, "large bold font")
+CANVAS_STRING_VARIABLE(canvasvar_LargerBoldFont, "larger bold font")
+CANVAS_STRING_VARIABLE(canvasvar_HugerBoldFont, "huger bold font")
+CANVAS_STRING_VARIABLE(canvasvar_MassiveBoldFont, "massive bold font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallItalicFont, "small italic font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallerItalicFont, "smaller italic font")
+CANVAS_STRING_VARIABLE(canvasvar_NormalItalicFont, "normal italic font")
+CANVAS_STRING_VARIABLE(canvasvar_BigItalicFont, "big italic font")
+CANVAS_STRING_VARIABLE(canvasvar_LargeItalicFont, "large italic font")
+CANVAS_STRING_VARIABLE(canvasvar_LargerItalicFont, "larger italic font")
+CANVAS_STRING_VARIABLE(canvasvar_HugerItalicFont, "huger italic font")
+CANVAS_STRING_VARIABLE(canvasvar_MassiveItalicFont, "massive italic font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallMonospaceFont, "small monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallerMonospaceFont, "smaller monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_NormalMonospaceFont, "normal monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_BigMonospaceFont, "big monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_LargeMonospaceFont, "large monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_LargerMonospaceFont, "larger monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_HugerMonospaceFont, "huger monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_MassiveMonospaceFont, "massive monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallBoldMonospaceFont, "small bold monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_SmallerBoldMonospaceFont, "smaller bold monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_NormalBoldMonospaceFont, "normal bold monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_BigBoldMonospaceFont, "big bold monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_LargeBoldMonospaceFont, "large bold monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_LargerBoldMonospaceFont, "larger bold monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_HugerBoldMonospaceFont, "huger bold monospace font")
+CANVAS_STRING_VARIABLE(canvasvar_MassiveBoldMonospaceFont, "massive bold monospace font")
+