Merge pull request #9 from molleweide/development

feat: add grid line movement and bindings to adjust grid size
gwatcha · May 27, 2020 · 1def8ed · 1def8ed
2 parents 726d22f + 15ab615
commit 1def8ed
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 3 deletions.
diff --git a/definitions/actions.lua b/definitions/actions.lua
@@ -96,6 +96,28 @@ return {
       GoToEnd = {40037, midiCommand=true},
       GoToLastItemAndRecord = {"LastItemEnd", "RecordNormal"},
       GoToStart = {40036, midiCommand=true},
+      GridSetTo1by1 = 40781,
+      GridSetTo1by2 = 40780,
+      GridSetTo1by3 = 42000,
+      GridSetTo1by4 = 40779,
+      GridSetTo1by5 = 42005,
+      GridSetTo1by6 = 41214,
+      GridSetTo1by7 = 42004,
+      GridSetTo1by8 = 40778,
+      GridSetTo1by9 = 42003,
+      GridSetTo1by10 = 42002,
+      GridSetTo1by12 = 40777,
+      GridSetTo1by16 = 40776,
+      GridSetTo1by18 = 42001,
+      GridSetTo1by24 = 41213,
+      GridSetTo1by32 = 40775,
+      GridSetTo1by48 = 41212,
+      GridSetTo1by64 = 40774,
+      GridSetTo1by128 = 41047,
+      GridSetTo2by1 = 41210,
+      GridSetTo2by3 = 42007,
+      GridSetTo3by1 = 42006,
+      GridSetTo4by1 = 41211,
       GroupItems = 40032,
       GrowItemLeft = {"TimeSelectionEnd", "SelectItemsUnderEditCursor", "TimeSelectionStart", "TrimSelectedItemLeftEdgeToEditCursor"},
       GrowItemRight = {"TimeSelectionStart", "SelectItemsUnderEditCursor", "TimeSelectionEnd", "TrimSelectedItemRightEdgeToEditCursor"},
@@ -149,6 +171,8 @@ return {
       MixerShowHideChildrenOfSelectedTrack = 41665,
       Mouse = 40514,
       MouseAndSnap = 40513,
+      MoveEditCursorToLeftGridDivision = 40646,
+      MoveEditCursorToRightGridDivision = 40647,
       MoveEditCursorToNextTransientInSelectedItems = 40375,
       MoveEditCursorToPrevTransientInSelectedItems = 40376,
       MoveNoteDownOctave= {40180, midiCommand=true},

diff --git a/definitions/global.lua b/definitions/global.lua
@@ -22,8 +22,8 @@ return {
     ["<M-l>"] = "Right10Pix",
     ["<M-H>"] = "Left40Pix",
     ["<M-L>"] = "Right40Pix",
-    ["h"] = "PrevBeat",
-    ["l"] = "NextBeat",
+    ["h"] = "MoveEditCursorToLeftGridDivision",
+    ["l"] = "MoveEditCursorToRightGridDivision",
     ["H"] = "PrevMeasure",
     ["L"] = "NextMeasure",
     ["<C-h>"] = "Prev4Beats",
@@ -253,6 +253,34 @@ return {
                 ["d"] = "CloseProject",
                 ["x"] = "CleanProjectDirectory",
             }},
+    ["G"] = {"+grid",{
+            ["z"] = "GridSetTo1by1", -- low left hand
+            ["x"] = "GridSetTo1by2",
+            ["c"] = "GridSetTo1by3",
+            ["v"] = "GridSetTo1by4",
+            ["b"] = "GridSetTo1by5",
+
+            ["a"] = "GridSetTo1by6", -- mid left hand
+            ["s"] = "GridSetTo1by7",
+            ["d"] = "GridSetTo1by8",
+            ["f"] = "GridSetTo1by9",
+            ["g"] = "GridSetTo1by10",
+
+            ["q"] = "GridSetTo1by12", -- upper left hand
+            ["w"] = "GridSetTo1by16",
+            ["e"] = "GridSetTo1by18",
+            ["r"] = "GridSetTo1by24",
+            ["t"] = "GridSetTo1by32",
+
+            ["n"] = "GridSetTo1by48", -- lower right
+            ["m"] = "GridSetTo1by64",
+            [","] = "GridSetTo1by128",
+            ["."] = "GridSetTo2by1",
+            ["/"] = "GridSetTo2by3",
+
+            ["h"] = "GridSetTo3by1", -- mid right
+            ["j"] = "GridSetTo4by1",
+        }},
     }},
   },
 }
diff --git a/definitions/midi.lua b/definitions/midi.lua
@@ -23,7 +23,7 @@ return {
     ["-"] = "MidiZoomOutVert",
     ["<C-+>"] = "MidiZoomInHoriz",
     ["<C-->"] = "MidiZoomOutHoriz",
-    ["-"] = "MidiZoomOutVert",
+    ["-"] = "MidiZoomOutVert", -- dupl of abover?
     ["p"] = "MidiPaste",
     ["<ESC>"] = "CloseWindow",
     ["S"] = "ClearNoteSelection",