Skip to content

Commit

Permalink
have phase parameters in degree units
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpcima
jpcima committed Sep 18, 2018
1 parent 287d63c commit 695f679
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 53 deletions.
22 changes: 11 additions & 11 deletions resources/lv2/EnsembleChorus.lv2/EnsembleChorus-noui.ttl
View file
Expand Up @@ -253,7 +253,7 @@
lv2:name "Phase 1" ;
lv2:default 0 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -299,9 +299,9 @@
lv2:index 29 ;
lv2:symbol "phase2" ;
lv2:name "Phase 2" ;
lv2:default 0.333333 ;
lv2:default 120 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -347,9 +347,9 @@
lv2:index 34 ;
lv2:symbol "phase3" ;
lv2:name "Phase 3" ;
lv2:default 0.666667 ;
lv2:default 240 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -395,9 +395,9 @@
lv2:index 39 ;
lv2:symbol "phase4" ;
lv2:name "Phase 4" ;
lv2:default 0.166667 ;
lv2:default 60 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -443,9 +443,9 @@
lv2:index 44 ;
lv2:symbol "phase5" ;
lv2:name "Phase 5" ;
lv2:default 0.5 ;
lv2:default 180 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -491,9 +491,9 @@
lv2:index 49 ;
lv2:symbol "phase6" ;
lv2:name "Phase 6" ;
lv2:default 0.833333 ;
lv2:default 300 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down
22 changes: 11 additions & 11 deletions resources/lv2/EnsembleChorus.lv2/EnsembleChorus.ttl
View file
Expand Up @@ -256,7 +256,7 @@
lv2:name "Phase 1" ;
lv2:default 0 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -302,9 +302,9 @@
lv2:index 29 ;
lv2:symbol "phase2" ;
lv2:name "Phase 2" ;
lv2:default 0.333333 ;
lv2:default 120 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -350,9 +350,9 @@
lv2:index 34 ;
lv2:symbol "phase3" ;
lv2:name "Phase 3" ;
lv2:default 0.666667 ;
lv2:default 240 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -398,9 +398,9 @@
lv2:index 39 ;
lv2:symbol "phase4" ;
lv2:name "Phase 4" ;
lv2:default 0.166667 ;
lv2:default 60 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -446,9 +446,9 @@
lv2:index 44 ;
lv2:symbol "phase5" ;
lv2:name "Phase 5" ;
lv2:default 0.5 ;
lv2:default 180 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down Expand Up @@ -494,9 +494,9 @@
lv2:index 49 ;
lv2:symbol "phase6" ;
lv2:name "Phase 6" ;
lv2:default 0.833333 ;
lv2:default 300 ;
lv2:minimum 0 ;
lv2:maximum 1 ;
lv2:maximum 360 ;
] ,
[
a lv2:InputPort, lv2:ControlPort ;
Expand Down
12 changes: 6 additions & 6 deletions resources/lv2/EnsembleChorus.lv2/presets.ttl
View file
Expand Up @@ -10,7 +10,7 @@
state:state [
<urn:juce:stateBinary> [
a atom:Chunk ;
rdf:value "PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxwcmVzZXQ+Cgk8cGFyYW1ldGVyIG5hbWU9IkJZUEFTUyI+MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJDSEFOTkVMX0xBWU9VVCI+MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJERUxBWSI+MC41PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9Ik5TVEFHRVMiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iQUFfQ1VUT0ZGIj4xNTAwMDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJNT0RfUkFOR0UiPjAuNTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJTTE9XX1JBVEUiPjAuNTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJTTE9XX1dBVkUiPjQ8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iU0xPV19SQU5EIj4wLjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iRkFTVF9SQVRFIj4wLjU8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iRkFTVF9XQVZFIj40PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkZBU1RfUkFORCI+MC4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkxQRl9DVVRPRkYiPjIyMDAwPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkxQRl9RIj4wLjcwNzEwNzwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJHQUlOX0lOIj4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkdBSU5fT1VUIj4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9Ik1JWF9EUlkiPjAuNzA3MTA3PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9Ik1JWF9XRVQiPjAuNzA3MTA3PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkVOQUJMRTEiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUEhBU0UxIj4wPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkRFUFRIMSI+MC41PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX0wxIj4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX1IxIj4wPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkVOQUJMRTIiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUEhBU0UyIj4wLjMzMzMzMzwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJERVBUSDIiPjAuNTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJST1VURV9MMiI+MTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJST1VURV9SMiI+MTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJFTkFCTEUzIj4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlBIQVNFMyI+MC42NjY2Njc8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iREVQVEgzIj4wLjU8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUk9VVEVfTDMiPjA8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUk9VVEVfUjMiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iRU5BQkxFNCI+MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJQSEFTRTQiPjAuMTY2NjY3PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkRFUFRINCI+MC41PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX0w0Ij4wPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX1I0Ij4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkVOQUJMRTUiPjA8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUEhBU0U1Ij4wLjU8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iREVQVEg1Ij4wLjU8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUk9VVEVfTDUiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUk9VVEVfUjUiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iRU5BQkxFNiI+MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJQSEFTRTYiPjAuODMzMzMzPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkRFUFRINiI+MC41PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX0w2Ij4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX1I2Ij4wPC9wYXJhbWV0ZXI+CjwvcHJlc2V0Pgo="^^xsd:base64Binary ;
rdf:value "PD94bWwgdmVyc2lvbj0iMS4wIj8+CjxwcmVzZXQ+Cgk8cGFyYW1ldGVyIG5hbWU9IkJZUEFTUyI+MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJDSEFOTkVMX0xBWU9VVCI+MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJERUxBWSI+MC41PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9Ik5TVEFHRVMiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iQUFfQ1VUT0ZGIj4xNTAwMDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJNT0RfUkFOR0UiPjAuNTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJTTE9XX1JBVEUiPjAuNTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJTTE9XX1dBVkUiPjQ8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iU0xPV19SQU5EIj4wLjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iRkFTVF9SQVRFIj4wLjU8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iRkFTVF9XQVZFIj40PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkZBU1RfUkFORCI+MC4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkxQRl9DVVRPRkYiPjIyMDAwPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkxQRl9RIj4wLjcwNzEwNzwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJHQUlOX0lOIj4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkdBSU5fT1VUIj4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9Ik1JWF9EUlkiPjAuNzA3MTA3PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9Ik1JWF9XRVQiPjAuNzA3MTA3PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkVOQUJMRTEiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUEhBU0UxIj4wPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkRFUFRIMSI+MC41PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX0wxIj4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX1IxIj4wPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkVOQUJMRTIiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUEhBU0UyIj4xMjA8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iREVQVEgyIj4wLjU8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUk9VVEVfTDIiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUk9VVEVfUjIiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iRU5BQkxFMyI+MTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJQSEFTRTMiPjI0MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJERVBUSDMiPjAuNTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJST1VURV9MMyI+MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJST1VURV9SMyI+MTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJFTkFCTEU0Ij4wPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlBIQVNFNCI+NjA8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iREVQVEg0Ij4wLjU8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUk9VVEVfTDQiPjA8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iUk9VVEVfUjQiPjE8L3BhcmFtZXRlcj4KCTxwYXJhbWV0ZXIgbmFtZT0iRU5BQkxFNSI+MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJQSEFTRTUiPjE4MDwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJERVBUSDUiPjAuNTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJST1VURV9MNSI+MTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJST1VURV9SNSI+MTwvcGFyYW1ldGVyPgoJPHBhcmFtZXRlciBuYW1lPSJFTkFCTEU2Ij4wPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlBIQVNFNiI+MzAwPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IkRFUFRINiI+MC41PC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX0w2Ij4xPC9wYXJhbWV0ZXI+Cgk8cGFyYW1ldGVyIG5hbWU9IlJPVVRFX1I2Ij4wPC9wYXJhbWV0ZXI+CjwvcHJlc2V0Pgo="^^xsd:base64Binary ;
] ;
] ;

Expand Down Expand Up @@ -112,7 +112,7 @@
] ,
[
lv2:symbol "phase2" ;
pset:value 0.333333 ;
pset:value 120 ;
] ,
[
lv2:symbol "depth2" ;
Expand All @@ -132,7 +132,7 @@
] ,
[
lv2:symbol "phase3" ;
pset:value 0.666667 ;
pset:value 240 ;
] ,
[
lv2:symbol "depth3" ;
Expand All @@ -152,7 +152,7 @@
] ,
[
lv2:symbol "phase4" ;
pset:value 0.166667 ;
pset:value 60 ;
] ,
[
lv2:symbol "depth4" ;
Expand All @@ -172,7 +172,7 @@
] ,
[
lv2:symbol "phase5" ;
pset:value 0.5 ;
pset:value 180 ;
] ,
[
lv2:symbol "depth5" ;
Expand All @@ -192,7 +192,7 @@
] ,
[
lv2:symbol "phase6" ;
pset:value 0.833333 ;
pset:value 300 ;
] ,
[
lv2:symbol "depth6" ;
Expand Down
5 changes: 3 additions & 2 deletions sources/core/core.cc
View file
Expand Up @@ -213,7 +213,7 @@ static void ensemble_chorus_set_parameter_ex(chorus_t *ec, ec_parameter_t p, flo
for (unsigned i = 0; i < 6; ++i) {
unsigned off = ECP_ENABLE2 - ECP_ENABLE1;
bool enable = parameter[ECP_ENABLE1 + i * off];
float phase = parameter[ECP_PHASE1 + i * off];
float phase = parameter[ECP_PHASE1 + i * off] * (1.0f / 360);
if (enable) {
phases[nphases] = phase;
nums[nphases] = i;
Expand Down Expand Up @@ -269,8 +269,9 @@ float ensemble_chorus_adjust_parameter(ec_parameter_t p, float value)
break;
case ECP_PHASE1: case ECP_PHASE2: case ECP_PHASE3:
case ECP_PHASE4: case ECP_PHASE5: case ECP_PHASE6:
value *= 1.0f / 360;
value = value - (int)value;
value = (value < 0) ? (value + 1) : value;
value = 360 * ((value < 0) ? (value + 1) : value);
break;
}

Expand Down
2 changes: 1 addition & 1 deletion sources/core/include/ensemble_chorus.h
View file
Expand Up @@ -78,7 +78,7 @@ typedef enum ec_parameter_flag {
#define EC_EACH_LINE_PARAMETER(P, I) \
/* Name, Min, Max, Def, Flags, Label */ \
P(ENABLE##I, false, true, (I <= 3), ECP_BOOLEAN, "Enable " #I) \
P(PHASE##I, 0, 1, ((I - 1) % 3) / 3. + ((I - 1) / 3) / 6., ECP_FLOAT, "Phase " #I) \
P(PHASE##I, 0, 360, (((I - 1) % 3) * 120 + ((I - 1) / 3) * 60), ECP_FLOAT, "Phase " #I) \
P(DEPTH##I, 0, 1, 0.5, ECP_FLOAT, "Depth " #I) \
P(ROUTE_L##I, false, true, (I != 3 && I != 4), ECP_BOOLEAN, "Left " #I) \
P(ROUTE_R##I, false, true, (I != 1 && I != 6), ECP_BOOLEAN, "Right " #I)
Expand Down
12 changes: 6 additions & 6 deletions sources/fl/main_view.cxx
View file
Expand Up @@ -41,7 +41,7 @@ void Main_View::cb_btn_enable1_(Fl_Toggle_Button* o, void* v) {
}

void Main_View::cb_sl_phase1__i(Fl_Valuator_Ex<Fl_Value_Slider>* o, void*) {
controller()->send_parameter(ECP_PHASE1, o->value() * (1.0 / 360));
controller()->send_parameter(ECP_PHASE1, o->value());
}
void Main_View::cb_sl_phase1_(Fl_Valuator_Ex<Fl_Value_Slider>* o, void* v) {
((Main_View*)(o->parent()))->cb_sl_phase1__i(o,v);
Expand All @@ -55,7 +55,7 @@ void Main_View::cb_btn_enable2_(Fl_Toggle_Button* o, void* v) {
}

void Main_View::cb_sl_phase2__i(Fl_Valuator_Ex<Fl_Value_Slider>* o, void*) {
controller()->send_parameter(ECP_PHASE2, o->value() * (1.0 / 360));
controller()->send_parameter(ECP_PHASE2, o->value());
}
void Main_View::cb_sl_phase2_(Fl_Valuator_Ex<Fl_Value_Slider>* o, void* v) {
((Main_View*)(o->parent()))->cb_sl_phase2__i(o,v);
Expand All @@ -69,7 +69,7 @@ void Main_View::cb_btn_enable3_(Fl_Toggle_Button* o, void* v) {
}

void Main_View::cb_sl_phase3__i(Fl_Valuator_Ex<Fl_Value_Slider>* o, void*) {
controller()->send_parameter(ECP_PHASE3, o->value() * (1.0 / 360));
controller()->send_parameter(ECP_PHASE3, o->value());
}
void Main_View::cb_sl_phase3_(Fl_Valuator_Ex<Fl_Value_Slider>* o, void* v) {
((Main_View*)(o->parent()))->cb_sl_phase3__i(o,v);
Expand All @@ -83,7 +83,7 @@ void Main_View::cb_btn_enable4_(Fl_Toggle_Button* o, void* v) {
}

void Main_View::cb_sl_phase4__i(Fl_Valuator_Ex<Fl_Value_Slider>* o, void*) {
controller()->send_parameter(ECP_PHASE4, o->value() * (1.0 / 360));
controller()->send_parameter(ECP_PHASE4, o->value());
}
void Main_View::cb_sl_phase4_(Fl_Valuator_Ex<Fl_Value_Slider>* o, void* v) {
((Main_View*)(o->parent()))->cb_sl_phase4__i(o,v);
Expand All @@ -97,7 +97,7 @@ void Main_View::cb_btn_enable5_(Fl_Toggle_Button* o, void* v) {
}

void Main_View::cb_sl_phase5__i(Fl_Valuator_Ex<Fl_Value_Slider>* o, void*) {
controller()->send_parameter(ECP_PHASE5, o->value() * (1.0 / 360));
controller()->send_parameter(ECP_PHASE5, o->value());
}
void Main_View::cb_sl_phase5_(Fl_Valuator_Ex<Fl_Value_Slider>* o, void* v) {
((Main_View*)(o->parent()))->cb_sl_phase5__i(o,v);
Expand All @@ -111,7 +111,7 @@ void Main_View::cb_btn_enable6_(Fl_Toggle_Button* o, void* v) {
}

void Main_View::cb_sl_phase6__i(Fl_Valuator_Ex<Fl_Value_Slider>* o, void*) {
controller()->send_parameter(ECP_PHASE6, o->value() * (1.0 / 360));
controller()->send_parameter(ECP_PHASE6, o->value());
}
void Main_View::cb_sl_phase6_(Fl_Valuator_Ex<Fl_Value_Slider>* o, void* v) {
((Main_View*)(o->parent()))->cb_sl_phase6__i(o,v);
Expand Down
16 changes: 8 additions & 8 deletions sources/fl/main_view.fl
View file
Expand Up @@ -54,7 +54,7 @@ decl {class Fl_Toggle_Button;} {public global
}

widget_class Main_View {open
xywh {5 711 625 280} type Double labelfont 13 visible
xywh {489 509 625 280} type Double labelfont 13 visible
} {
decl {static constexpr int W = 625;} {public local
}
Expand Down Expand Up @@ -114,7 +114,7 @@ x->set_modulation_callback(&modulation, this);} {}
class Fl_Toggle_Button
}
Fl_Value_Slider sl_phase1_ {
callback {controller()->send_parameter(ECP_PHASE1, o->value() * (1.0 / 360))}
callback {controller()->send_parameter(ECP_PHASE1, o->value())}
xywh {65 80 105 25} type Horizontal maximum 359 step 1
class {Fl_Valuator_Ex<Fl_Value_Slider>}
}
Expand All @@ -125,7 +125,7 @@ x->set_modulation_callback(&modulation, this);} {}
class Fl_Toggle_Button
}
Fl_Value_Slider sl_phase2_ {
callback {controller()->send_parameter(ECP_PHASE2, o->value() * (1.0 / 360))}
callback {controller()->send_parameter(ECP_PHASE2, o->value())}
xywh {65 105 105 25} type Horizontal maximum 359 step 1
class {Fl_Valuator_Ex<Fl_Value_Slider>}
}
Expand All @@ -136,7 +136,7 @@ x->set_modulation_callback(&modulation, this);} {}
class Fl_Toggle_Button
}
Fl_Value_Slider sl_phase3_ {
callback {controller()->send_parameter(ECP_PHASE3, o->value() * (1.0 / 360))}
callback {controller()->send_parameter(ECP_PHASE3, o->value())}
xywh {65 130 105 25} type Horizontal maximum 359 step 1
class {Fl_Valuator_Ex<Fl_Value_Slider>}
}
Expand All @@ -147,7 +147,7 @@ x->set_modulation_callback(&modulation, this);} {}
class Fl_Toggle_Button
}
Fl_Value_Slider sl_phase4_ {
callback {controller()->send_parameter(ECP_PHASE4, o->value() * (1.0 / 360))}
callback {controller()->send_parameter(ECP_PHASE4, o->value())}
xywh {65 155 105 25} type Horizontal maximum 359 step 1
class {Fl_Valuator_Ex<Fl_Value_Slider>}
}
Expand All @@ -158,7 +158,7 @@ x->set_modulation_callback(&modulation, this);} {}
class Fl_Toggle_Button
}
Fl_Value_Slider sl_phase5_ {
callback {controller()->send_parameter(ECP_PHASE5, o->value() * (1.0 / 360))}
callback {controller()->send_parameter(ECP_PHASE5, o->value())}
xywh {65 180 105 25} type Horizontal maximum 359 step 1
class {Fl_Valuator_Ex<Fl_Value_Slider>}
}
Expand All @@ -169,7 +169,7 @@ x->set_modulation_callback(&modulation, this);} {}
class Fl_Toggle_Button
}
Fl_Value_Slider sl_phase6_ {
callback {controller()->send_parameter(ECP_PHASE6, o->value() * (1.0 / 360))}
callback {controller()->send_parameter(ECP_PHASE6, o->value())} selected
xywh {65 205 105 25} type Horizontal maximum 359 step 1
class {Fl_Valuator_Ex<Fl_Value_Slider>}
}
Expand Down Expand Up @@ -374,7 +374,7 @@ x->set_modulation_callback(&modulation, this);} {}
callback {ec_parameter ecp = ECP_LPF_CUTOFF;
float min = ensemble_chorus_parameter_min(ecp);
float max = ensemble_chorus_parameter_max(ecp);
controller()->send_parameter(ecp, min + (max - min) * o->value())} selected
controller()->send_parameter(ecp, min + (max - min) * o->value())}
xywh {160 235 40 40} labeltype EMBOSSED_LABEL labelsize 12 align 14
class {Fl_Valuator_Ex<Fl_Knob>}
}
Expand Down
12 changes: 6 additions & 6 deletions sources/fl/main_view_impl.cc
View file
Expand Up @@ -73,37 +73,37 @@ void Main_View::parameter(unsigned id, float value, void *userdata)
case ECP_MIX_WET: self.sl_wet_->value(to_logarithmic(value)); break;

case ECP_ENABLE1: self.btn_enable1_->value(value); break;
case ECP_PHASE1: self.sl_phase1_->value(value * 360); break;
case ECP_PHASE1: self.sl_phase1_->value(value); break;
case ECP_DEPTH1: self.sl_depth1_->value(value); break;
case ECP_ROUTE_L1: self.btn_routeL1_->value(value); break;
case ECP_ROUTE_R1: self.btn_routeR1_->value(value); break;

case ECP_ENABLE2: self.btn_enable2_->value(value); break;
case ECP_PHASE2: self.sl_phase2_->value(value * 360); break;
case ECP_PHASE2: self.sl_phase2_->value(value); break;
case ECP_DEPTH2: self.sl_depth2_->value(value); break;
case ECP_ROUTE_L2: self.btn_routeL2_->value(value); break;
case ECP_ROUTE_R2: self.btn_routeR2_->value(value); break;

case ECP_ENABLE3: self.btn_enable3_->value(value); break;
case ECP_PHASE3: self.sl_phase3_->value(value * 360); break;
case ECP_PHASE3: self.sl_phase3_->value(value); break;
case ECP_DEPTH3: self.sl_depth3_->value(value); break;
case ECP_ROUTE_L3: self.btn_routeL3_->value(value); break;
case ECP_ROUTE_R3: self.btn_routeR3_->value(value); break;

case ECP_ENABLE4: self.btn_enable4_->value(value); break;
case ECP_PHASE4: self.sl_phase4_->value(value * 360); break;
case ECP_PHASE4: self.sl_phase4_->value(value); break;
case ECP_DEPTH4: self.sl_depth4_->value(value); break;
case ECP_ROUTE_L4: self.btn_routeL4_->value(value); break;
case ECP_ROUTE_R4: self.btn_routeR4_->value(value); break;

case ECP_ENABLE5: self.btn_enable5_->value(value); break;
case ECP_PHASE5: self.sl_phase5_->value(value * 360); break;
case ECP_PHASE5: self.sl_phase5_->value(value); break;
case ECP_DEPTH5: self.sl_depth5_->value(value); break;
case ECP_ROUTE_L5: self.btn_routeL5_->value(value); break;
case ECP_ROUTE_R5: self.btn_routeR5_->value(value); break;

case ECP_ENABLE6: self.btn_enable6_->value(value); break;
case ECP_PHASE6: self.sl_phase6_->value(value * 360); break;
case ECP_PHASE6: self.sl_phase6_->value(value); break;
case ECP_DEPTH6: self.sl_depth6_->value(value); break;
case ECP_ROUTE_L6: self.btn_routeL6_->value(value); break;
case ECP_ROUTE_R6: self.btn_routeR6_->value(value); break;
Expand Down

0 comments on commit 695f679

Please sign in to comment.