Skip to content

Commit 21a1ed3

Browse files
author
hhhikr
committed
command 28: turn track lfo on/off
1 parent 8ff7189 commit 21a1ed3

File tree

7 files changed

+21
-5
lines changed

7 files changed

+21
-5
lines changed

ProTrekkr.ncb

0 Bytes
Binary file not shown.

ProTrekkr.opt

2 KB
Binary file not shown.

release/distrib/replay/lib/include/ptk_def_properties.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
#define PTK_FX_SWITCHFLANGER
8181
#define PTK_FX_SETREVCUTO
8282
#define PTK_FX_SETREVRESO
83+
#define PTK_FX_TRACK_FILTER_LFO
8384
#define PTK_FX_TICK0
8485
#define PTK_INSTRUMENTS
8586
#define PTK_LOOP_FORWARD

release/distrib/replay/lib/replay.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4866,6 +4866,13 @@ void Do_Effects_Ticks_X(void)
48664866
break;
48674867
#endif
48684868

4869+
#if defined(PTK_FX_TRACK_FILTER_LFO)
4870+
// $28 Switch track filter on/off
4871+
case 0x28:
4872+
LFO_ON[trackef] = (int) pltr_dat_row[k] & 1;
4873+
break;
4874+
#endif
4875+
48694876
}
48704877
}
48714878

src/editors/editor_track_fx.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void Actualize_Track_Fx_Ed(char gode)
127127
outlong(458, (Cur_Height - 85), (int) (FLANGER_AMPL[Track_Under_Caret] * 10000.0f), 1);
128128
}
129129

130-
if(gode == 0 || gode == 2)
130+
if(gode == 0 || gode == 2 || gode == 11)
131131
{
132132
if(LFO_RATE[Track_Under_Caret] < 0.0001f) LFO_RATE[Track_Under_Caret] = 0.0001f;
133133
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)
138138
outfloat(138, (Cur_Height - 74), tmprate, 3);
139139
}
140140

141-
if(gode == 0 || gode == 3)
141+
if(gode == 0 || gode == 3 || gode == 11)
142142
{
143143
if(LFO_AMPL[Track_Under_Caret] < 0) LFO_AMPL[Track_Under_Caret] = 0;
144144
if(LFO_AMPL[Track_Under_Caret] > 128) LFO_AMPL[Track_Under_Caret] = 128;
145145
Realslider(74, (Cur_Height - 92), (int) (LFO_AMPL[Track_Under_Caret]), LFO_ON[Track_Under_Caret]);
146146
}
147147

148-
if(gode == 0 || gode == 9)
148+
if(gode == 0 || gode == 9 || gode == 11)
149149
{
150150
if(LFO_ON[Track_Under_Caret] == 1)
151151
{

src/files/ptps.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ int SavePtp(FILE *in, int Simulate, char *FileName)
245245
int Store_FX_FinePitchUp = FALSE;
246246
int Store_FX_FinePitchDown = FALSE;
247247
int Store_FX_SwitchFlanger = FALSE;
248+
int Store_FX_SwitchTrackLFO = FALSE;
248249
int Store_FX_Shuffle = FALSE;
249250
int Store_FX_RevCuto = FALSE;
250251
int Store_FX_RevReso = FALSE;
@@ -906,6 +907,12 @@ int SavePtp(FILE *in, int Simulate, char *FileName)
906907
Store_FX_RevReso = TRUE;
907908
break;
908909

910+
// $28 Switch tracker LFO
911+
case 0x28:
912+
Store_FX_SwitchTrackLFO = TRUE;
913+
break;
914+
915+
909916
// $31 First TB303 control
910917
case 0x31:
911918
Store_303_1 = TRUE;
@@ -1073,6 +1080,7 @@ int SavePtp(FILE *in, int Simulate, char *FileName)
10731080
Save_Constant("PTK_FX_FINEPITCHUP", Store_FX_FinePitchUp);
10741081
Save_Constant("PTK_FX_FINEPITCHDOWN", Store_FX_FinePitchDown);
10751082
Save_Constant("PTK_FX_SWITCHFLANGER", Store_FX_SwitchFlanger);
1083+
Save_Constant("PTK_FX_TRACK_FILTER_LFO", Store_FX_SwitchTrackLFO);
10761084

10771085
Save_Constant("PTK_FX_SETREVCUTO", Store_FX_RevCuto);
10781086
Save_Constant("PTK_FX_SETREVRESO", Store_FX_RevReso);

src/ui/misc_draw.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -915,8 +915,8 @@ SDL_Color Default_Palette8[] =
915915
{ 0x00, 0x30, 0x44, 0x00 },
916916
{ 0x00, 0x00, 0x00, 0x00 }, // 13 (calculated)
917917

918-
{ 0xb2, 0xf6, 0xae, 0x00 },
919-
{ 0xbe, 0xe0, 0xc8, 0x00 },
918+
{ 0xb2, 0xf6, 0xae, 0x00 }, // vu-meter
919+
{ 0x00, 0x00, 0x00, 0x00 }, // vu-meter peak/caret
920920
{ 0xff, 0xe8, 0xa4, 0x00 },
921921

922922
{ 0xf2, 0xfe, 0xff, 0x00 },

0 commit comments

Comments
 (0)