X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=DanKaminsky.pde;h=c4ca005970aa093a6762faca7a6568d6d98ab1e0;hb=36e19b7b5b923666a56fd4a941fb0f1ada725093;hp=87bfa3b60da7436c0ca339f587ae95afd18d1eaa;hpb=a22015f47ca6e4286137ed2a449cde23bb8c3a10;p=SugarCubes.git

diff --git a/DanKaminsky.pde b/DanKaminsky.pde
index 87bfa3b..c4ca005 100644
--- a/DanKaminsky.pde
+++ b/DanKaminsky.pde
@@ -3,15 +3,15 @@ class GenericController {
     public void RotateKnob(int type, int num, float val){
       LXParameter p = null;
       if(type==0) {
-        p = glucose.getPattern().getParameters().get(num);
+        p = getPattern().getParameters().get(num);
         if(p!=null) { p.setValue(val); }
       }
       if(type==1) {
-        p = glucose.getSelectedTransition().getParameters().get(num);
+        p = lx.engine.getDeck(RIGHT_DECK).getFaderTransition().getParameters().get(num);
         if(p!=null) { p.setValue(val); }
       }
       if(type==2) {
-        p = glucose.getSelectedEffect().getParameters().get(num);
+        p = getSelectedEffect().getParameters().get(num);
         if(p!=null) { p.setValue(val); }
       }
     }
@@ -146,7 +146,7 @@ import oscP5.*;
 
 
 abstract class OSCPattern extends SCPattern {
-  public OSCPattern(GLucose glucose){super(glucose);}
+  public OSCPattern(LX lx){super(lx);}
   public abstract void oscEvent(OscMessage msg);
 }
 
@@ -160,8 +160,8 @@ class Ball {
 
 class OSC_Balls extends OSCPattern {
   Ball[] balls;
-  public OSC_Balls(GLucose glucose){
-    super(glucose);
+  public OSC_Balls(LX lx){
+    super(lx);
     balls = new Ball[20];
     for(int i=0; i<balls.length; i++) { balls[i] = new Ball(); }    
   }
@@ -193,8 +193,8 @@ import processing.serial.*;
 /*class ScreenScrape extends SCPattern {
   PImage pret;
   ScreenShot ss;
-  public ScreenScrape(GLucose glucose) {
-    super(glucose);
+  public ScreenScrape(LX lx) {
+    super(lx);
     System.loadLibrary("ScreenShot");
     pret = new PImage(8, 128, ARGB);
     ss = new ScreenShot();