Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Name the FX Automation Params better #1566

Merged
merged 1 commit into from
Feb 12, 2020
Merged

Name the FX Automation Params better #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion src/common/Parameter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,36 @@ void create_fullname(char* dn, char* fn, ControlGroup ctrlgroup, int ctrlgroup_e
}
break;
case cg_FX:
sprintf(prefix, "FX%i", ctrlgroup_entry + 1);
switch( ctrlgroup_entry )
{
case 0:
sprintf( prefix, "FX A1" );
break;
case 1:
sprintf( prefix, "FX A2" );
break;
case 2:
sprintf( prefix, "FX B1" );
break;
case 3:
sprintf( prefix, "FX B2" );
break;
case 4:
sprintf( prefix, "FX S1" );
break;
case 5:
sprintf( prefix, "FX S2" );
break;
case 6:
sprintf( prefix, "FX M1" );
break;
case 7:
sprintf( prefix, "FX M2" );
break;
default:
sprintf( prefix, "FXERR" );
break;
}
break;
default:
prefix[0] = '\0';
Expand Down
2 changes: 1 addition & 1 deletion src/common/SurgePatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ SurgePatch::SurgePatch(SurgeStorage* storage)
char label[16];
sprintf(label, "p%i", p);
char dawlabel[32];
sprintf(dawlabel, "param %i", p);
sprintf(dawlabel, "Param %i", p + 1);
param_ptr.push_back(
this->fx[fx].p[p].assign(p_id++, 0, label, dawlabel, ct_none, px, py, 0, cg_FX, fx,
true, Surge::ParamConfig::kHorizontal | kHide | ((fx == 0) ? kEasy : 0)));
Expand Down
4 changes: 2 additions & 2 deletions src/common/gui/CSnapshotMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,8 @@ j;

// CFxMenu

const char fxslot_names[8][NAMECHARS] = {"A Insert 1", "A Insert 2", "B Insert 1", "B Insert 2",
"Send FX 1", "Send FX 2", "Master 1", "Master 2"};
const char fxslot_names[8][NAMECHARS] = {"A Insert FX 1", "A Insert FX 2", "B Insert FX 1", "B Insert FX 2",
"Send FX 1", "Send FX 2", "Master FX 1", "Master FX 2"};

std::vector<float> CFxMenu::fxCopyPaste;

Expand Down