X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas_vars.h;h=7688f0c62903b967ce3f381a0ee99d35fa517084;hb=e3d9a971a735174687067cb7d7b9419c7ecbb114;hp=deb5d03a3bf8e04b1ec96a9ce80b6b1d05d5e481;hpb=bde8437387ccd5bfd86d641d15444f76532b5e2b;p=ardour.git

diff --git a/gtk2_ardour/canvas_vars.h b/gtk2_ardour/canvas_vars.h
index deb5d03a3b..7688f0c629 100644
--- a/gtk2_ardour/canvas_vars.h
+++ b/gtk2_ardour/canvas_vars.h
@@ -139,22 +139,22 @@ CANVAS_VARIABLE(canvasvar_ZoomRect, "zoom rect")
 CANVAS_VARIABLE(canvasvar_MonitorSectionKnob, "monitor knob")
 
 #define BUTTON_VARS(root,name) \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderStart, name " border start") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderEnd, name " border end") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderStartSelected, name " border start selected") \
-CANVAS_VARIABLE(canvasvar_ ## root ## BorderEndSelected, name " border end selected") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillStart, name " fill start") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillEnd, name " fill end") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillStartActive, name " fill start active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillEndActive, name " fill end active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillStartMid, name " fill start mid") \
-CANVAS_VARIABLE(canvasvar_ ## root ## FillEndMid, name " fill end mid") \
-CANVAS_VARIABLE(canvasvar_ ## root ## LED, name " led") \
-CANVAS_VARIABLE(canvasvar_ ## root ## LEDActive, name " led active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## LEDMid, name " led mid") \
-CANVAS_VARIABLE(canvasvar_ ## root ## Text, name " text") \
-CANVAS_VARIABLE(canvasvar_ ## root ## TextActive, name " text active") \
-CANVAS_VARIABLE(canvasvar_ ## root ## TextMid, name " text mid") 
+CANVAS_VARIABLE(canvasvar_ ## root ## BorderStart, name ": border start") \
+CANVAS_VARIABLE(canvasvar_ ## root ## BorderEnd, name ": border end") \
+CANVAS_VARIABLE(canvasvar_ ## root ## BorderStartSelected, name ": border start selected") \
+CANVAS_VARIABLE(canvasvar_ ## root ## BorderEndSelected, name ": border end selected") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillStart, name ": fill start") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillEnd, name ": fill end") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillStartActive, name ": fill start active") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillEndActive, name ": fill end active") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillStartMid, name ": fill start mid") \
+CANVAS_VARIABLE(canvasvar_ ## root ## FillEndMid, name ": fill end mid") \
+CANVAS_VARIABLE(canvasvar_ ## root ## LED, name ": led") \
+CANVAS_VARIABLE(canvasvar_ ## root ## LEDActive, name ": led active") \
+CANVAS_VARIABLE(canvasvar_ ## root ## LEDMid, name ": led mid") \
+CANVAS_VARIABLE(canvasvar_ ## root ## Text, name ": text") \
+CANVAS_VARIABLE(canvasvar_ ## root ## TextActive, name ": text active") \
+CANVAS_VARIABLE(canvasvar_ ## root ## TextMid, name ": text mid") 
 
 BUTTON_VARS(ProcessorPreFader, "processor prefader")
 BUTTON_VARS(ProcessorFader, "processor fader")
@@ -167,9 +167,40 @@ BUTTON_VARS(MonitorSectionDimButton, "monitor section dim")
 BUTTON_VARS(MonitorSectionSoloButton, "monitor section solo")
 BUTTON_VARS(MonitorSectionInvertButton, "monitor section invert")
 BUTTON_VARS(MonitorSectionMonoButton, "monitor section mono")
+BUTTON_VARS(MonitorSectionSoloModelButton, "monitor section solo model")
 BUTTON_VARS(MonitorSectionSoloOverrideButton, "monitor solo override")
 BUTTON_VARS(MonitorSectionSoloExclusiveButton, "monitor solo exclusive")
 BUTTON_VARS(RudeSolo, "rude solo")
 BUTTON_VARS(RudeIsolate, "rude isolate")
 BUTTON_VARS(RudeAudition, "rude audition")
+BUTTON_VARS(FeedbackAlert, "feedback alert")
+BUTTON_VARS(MuteButton, "mute button")
+BUTTON_VARS(SoloButton, "solo button")
+BUTTON_VARS(RecEnableButton, "record enable button")
+BUTTON_VARS(SendButton, "send alert button")
+BUTTON_VARS(TransportButton, "transport button")
+BUTTON_VARS(TransportRecenableButton, "transport recenable button")
+BUTTON_VARS(TransportOptionButton, "transport option button")
+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(ZoomButton, "zoom button")
+BUTTON_VARS(RouteButton, "route button")
 
+#define CLOCK_VARS(root,name) \
+	CANVAS_VARIABLE(canvasvar_ ## root ## Background, name ": background") \
+	CANVAS_VARIABLE(canvasvar_ ## root ## Text, name ": text") \
+	CANVAS_VARIABLE(canvasvar_ ## root ## EditedText, name ": edited text") \
+	CANVAS_VARIABLE(canvasvar_ ## root ## Cursor, name ": cursor") 
+
+CLOCK_VARS(TransportClock, "transport clock")
+CLOCK_VARS(SecondaryClock, "secondary clock")
+CLOCK_VARS(TransportDeltaClock, "transport delta clock")
+CLOCK_VARS(SecondaryDeltaClock, "secondary delta clock")
+CLOCK_VARS(BigClock, "big clock")
+CLOCK_VARS(BigClockActive, "big clock active")
+CLOCK_VARS(PunchClock, "punch clock")
+CLOCK_VARS(SelectionClock, "selection clock")
+CLOCK_VARS(NudgeClock, "nudge clock")
+CLOCK_VARS(GenericClock, "clock")