command 28: turn track lfo on/off

falkTX · Jul 21, 2011 · 21a1ed3 · 21a1ed3
1 parent 8ff7189
commit 21a1ed3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 5 deletions.
diff --git a/ProTrekkr.ncb b/ProTrekkr.ncb
diff --git a/ProTrekkr.opt b/ProTrekkr.opt
diff --git a/release/distrib/replay/lib/include/ptk_def_properties.h b/release/distrib/replay/lib/include/ptk_def_properties.h
@@ -80,6 +80,7 @@
 #define PTK_FX_SWITCHFLANGER
 #define PTK_FX_SETREVCUTO
 #define PTK_FX_SETREVRESO
+#define PTK_FX_TRACK_FILTER_LFO
 #define PTK_FX_TICK0
 #define PTK_INSTRUMENTS
 #define PTK_LOOP_FORWARD

diff --git a/release/distrib/replay/lib/replay.cpp b/release/distrib/replay/lib/replay.cpp
@@ -4866,6 +4866,13 @@ void Do_Effects_Ticks_X(void)
                         break;
 #endif
 
+#if defined(PTK_FX_TRACK_FILTER_LFO)
+                    // $28 Switch track filter on/off
+                    case 0x28:
+                        LFO_ON[trackef] = (int) pltr_dat_row[k] & 1;
+                        break;
+#endif
+
                 }
             }
 

diff --git a/src/editors/editor_track_fx.cpp b/src/editors/editor_track_fx.cpp
@@ -127,7 +127,7 @@ void Actualize_Track_Fx_Ed(char gode)
             outlong(458, (Cur_Height - 85), (int) (FLANGER_AMPL[Track_Under_Caret] * 10000.0f), 1);
         }
 
-        if(gode == 0 || gode == 2)
+        if(gode == 0 || gode == 2 || gode == 11)
         {
             if(LFO_RATE[Track_Under_Caret] < 0.0001f) LFO_RATE[Track_Under_Caret] = 0.0001f;
             if(LFO_RATE[Track_Under_Caret] > 0.0078125f) LFO_RATE[Track_Under_Caret] = 0.0078125f;
@@ -138,14 +138,14 @@ void Actualize_Track_Fx_Ed(char gode)
             outfloat(138, (Cur_Height - 74), tmprate, 3);
         }
 
-        if(gode == 0 || gode == 3)
+        if(gode == 0 || gode == 3 || gode == 11)
         {
             if(LFO_AMPL[Track_Under_Caret] < 0) LFO_AMPL[Track_Under_Caret] = 0;
             if(LFO_AMPL[Track_Under_Caret] > 128) LFO_AMPL[Track_Under_Caret] = 128;
             Realslider(74, (Cur_Height - 92), (int) (LFO_AMPL[Track_Under_Caret]), LFO_ON[Track_Under_Caret]);
         }
 
-        if(gode == 0 || gode == 9)
+        if(gode == 0 || gode == 9 || gode == 11)
         {
             if(LFO_ON[Track_Under_Caret] == 1)
             {

diff --git a/src/files/ptps.cpp b/src/files/ptps.cpp
@@ -245,6 +245,7 @@ int SavePtp(FILE *in, int Simulate, char *FileName)
     int Store_FX_FinePitchUp = FALSE;
     int Store_FX_FinePitchDown = FALSE;
     int Store_FX_SwitchFlanger = FALSE;
+    int Store_FX_SwitchTrackLFO = FALSE;
     int Store_FX_Shuffle = FALSE;
     int Store_FX_RevCuto = FALSE;
     int Store_FX_RevReso = FALSE;
@@ -906,6 +907,12 @@ int SavePtp(FILE *in, int Simulate, char *FileName)
                                     Store_FX_RevReso = TRUE;
                                     break;
 
+                                // $28 Switch tracker LFO
+                                case 0x28:
+                                    Store_FX_SwitchTrackLFO = TRUE;
+                                    break;
+
+
                                 // $31 First TB303 control
                                 case 0x31:
                                     Store_303_1 = TRUE;
@@ -1073,6 +1080,7 @@ int SavePtp(FILE *in, int Simulate, char *FileName)
     Save_Constant("PTK_FX_FINEPITCHUP", Store_FX_FinePitchUp);
     Save_Constant("PTK_FX_FINEPITCHDOWN", Store_FX_FinePitchDown);
     Save_Constant("PTK_FX_SWITCHFLANGER", Store_FX_SwitchFlanger);
+    Save_Constant("PTK_FX_TRACK_FILTER_LFO", Store_FX_SwitchTrackLFO);
 
     Save_Constant("PTK_FX_SETREVCUTO", Store_FX_RevCuto);
     Save_Constant("PTK_FX_SETREVRESO", Store_FX_RevReso);

diff --git a/src/ui/misc_draw.cpp b/src/ui/misc_draw.cpp
@@ -915,8 +915,8 @@ SDL_Color Default_Palette8[] =
     { 0x00, 0x30, 0x44, 0x00 },
     { 0x00, 0x00, 0x00, 0x00 },      // 13 (calculated)
 
-    { 0xb2, 0xf6, 0xae, 0x00 },
-    { 0xbe, 0xe0, 0xc8, 0x00 },
+    { 0xb2, 0xf6, 0xae, 0x00 },      // vu-meter
+    { 0x00, 0x00, 0x00, 0x00 },      // vu-meter peak/caret
     { 0xff, 0xe8, 0xa4, 0x00 },
 
     { 0xf2, 0xfe, 0xff, 0x00 },