Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
command 28: turn track lfo on/off
  • Loading branch information
hhhikr committed Jul 21, 2011
1 parent 8ff7189 commit 21a1ed3
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 5 deletions.
Binary file modified ProTrekkr.ncb
Binary file not shown.
Binary file modified ProTrekkr.opt
Binary file not shown.
1 change: 1 addition & 0 deletions release/distrib/replay/lib/include/ptk_def_properties.h
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions release/distrib/replay/lib/replay.cpp
Expand Up @@ -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

}
}

Expand Down
6 changes: 3 additions & 3 deletions src/editors/editor_track_fx.cpp
Expand Up @@ -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;
Expand All @@ -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)
{
Expand Down
8 changes: 8 additions & 0 deletions src/files/ptps.cpp
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/ui/misc_draw.cpp
Expand Up @@ -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 },
Expand Down

0 comments on commit 21a1ed3

Please sign in to comment.