diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-08 17:22:48 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-08 17:22:48 -0400 |
| commit | 963b56b1c6eb49e0f5e7cc005159a682c94e235d (patch) | |
| tree | edbb0fa98866ba57444fc631bacb59c3f84b6da9 | |
| parent | 88b0e0cd0b152729bc7178d54824b05cb05d66bd (diff) | |
| parent | 72416e94322107d98ab651c33af6c11940e7095e (diff) | |
Merge branch 'ovenwerks-master'
| -rw-r--r-- | libs/surfaces/mackie/button.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libs/surfaces/mackie/button.h b/libs/surfaces/mackie/button.h index f14060da4b..61f09d7a03 100644 --- a/libs/surfaces/mackie/button.h +++ b/libs/surfaces/mackie/button.h @@ -70,10 +70,6 @@ public: Busses, Outputs, User, - Shift, - Option, - Ctrl, - CmdAlt, Read, Write, Trim, @@ -107,6 +103,13 @@ public: FinalGlobalButton, + /* Global buttons that users should not redefine */ + + Shift, + Option, + Ctrl, + CmdAlt, + /* Strip buttons */ RecEnable, |