From 6b3d53ca7ec4376d42dbd273102dde60c876c93c Mon Sep 17 00:00:00 2001 From: Mark Slee Date: Thu, 24 Oct 2013 09:51:35 -0700 Subject: [PATCH] New HeronLX with fix for patterns not having Deck value set --- _Internals.pde | 4 ++-- code/HeronLX.jar | Bin 69191 -> 69327 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_Internals.pde b/_Internals.pde index 41532f7..f809e93 100644 --- a/_Internals.pde +++ b/_Internals.pde @@ -222,9 +222,9 @@ void draw() { simulationColors = sendColors = glucose.getColors(); String displayMode = uiCrossfader.getDisplayMode(); if (displayMode == "A") { - simulationColors = lx.engine.getDeck(0).getColors(); + simulationColors = lx.engine.getDeck(GLucose.LEFT_DECK).getColors(); } else if (displayMode == "B") { - simulationColors = lx.engine.getDeck(1).getColors(); + simulationColors = lx.engine.getDeck(GLucose.RIGHT_DECK).getColors(); } if (debugMode) { debugUI.maskColors(simulationColors); diff --git a/code/HeronLX.jar b/code/HeronLX.jar index c407dc895a188c6787cafea31b0d9ff7a5ebfd39..23d0fb8c090f2bf08a9959519fe40d858daf0d91 100755 GIT binary patch delta 5483 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