diff options
| -rw-r--r-- | drumgizmo/drumgizmoc.cc | 36 | ||||
| -rw-r--r-- | man/drumgizmo.1 | 12 | 
2 files changed, 23 insertions, 25 deletions
| diff --git a/drumgizmo/drumgizmoc.cc b/drumgizmo/drumgizmoc.cc index 07407bd..e881a43 100644 --- a/drumgizmo/drumgizmoc.cc +++ b/drumgizmo/drumgizmoc.cc @@ -149,18 +149,18 @@ static std::string usage(const std::string& name)  		"\n"  		"Timing humanizer parameters:\n"  		"  laidback:      Move notes ahead or behind in time in ms [+/-100].\n" -		"  tightness:     Control the tightness of the drummer. [0; 1].\n" -		"  regain:        Control how fast the drummer catches up the timing. [0; 1]\n" +		"  tightness:     Control the tightness of the drummer. [0,1].\n" +		"  regain:        Control how fast the drummer catches up the timing. [0,1]\n"  		"\n"  		"Sample selection parameters:\n"  		"  close:         The importance given to choosing a sample close to\n" -		"                 the actual velocity value (after humanization) [0; 16].\n" +		"                 the actual velocity value (after humanization) [0,1].\n"  		"  diverse:       The importance given to choosing samples\n" -		"                 which haven't been played recently [0; 0.5].\n" -		"  random:        The amount of randomness added [0; 0.5].\n" +		"                 which haven't been played recently [0,1].\n" +		"  random:        The amount of randomness added [0,1].\n"  		"  stddev:        The standard-deviation for the sample selection.\n"  		"                 Higher value makes it more likely that a sample further\n" -		"                 away from the input velocity will be played [0; 4.5].\n" +		"                 away from the input velocity will be played [0, 4.5].\n"  		"\n";  	return output.str();  } @@ -408,11 +408,11 @@ int main(int argc, char* argv[])  			}  			else if(token.key == "tightness")  			{ -				// Input range [0; 1] +				// Input range [0, 1]  				auto val = atof_nol(token.value.data());  				if(val < 0.0 || val > 1.0)  				{ -					std::cerr << "tightness range is [0; 1].\n"; +					std::cerr << "tightness range is [0, 1].\n";  					exit(1);  				}  				settings.latency_stddev.store((-1.0 * val + 1.0) * 20.0); @@ -422,7 +422,7 @@ int main(int argc, char* argv[])  				auto val = atof_nol(token.value.data());  				if(val < 0.0 || val > 1.0)  				{ -					std::cerr << "regain range is [0; 1].\n"; +					std::cerr << "regain range is [0, 1].\n";  					exit(1);  				}  				settings.latency_regain.store(val); @@ -443,22 +443,20 @@ int main(int argc, char* argv[])  		{  			if(token.key == "close")  			{ -				// Input range [0; 16]  				auto val = atof_nol(token.value.data()); -				if(val < 0 || val > 16) +				if(val < 0 || val > 1)  				{ -					std::cerr << "close range is [0; 16].\n"; +					std::cerr << "close range is [0, 1].\n";  					exit(1);  				}  				settings.sample_selection_f_close.store(val);  			}  			else if(token.key == "diverse")  			{ -				// Input range [0; 0.5]  				auto val = atof_nol(token.value.data()); -				if(val < 0.0 || val > 0.5) +				if(val < 0 || val > 1)  				{ -					std::cerr << "diverse range is [0; 0.5].\n"; +					std::cerr << "diverse range is [0, 1].\n";  					exit(1);  				}  				settings.sample_selection_f_diverse.store(val); @@ -466,9 +464,9 @@ int main(int argc, char* argv[])  			else if(token.key == "random")  			{  				auto val = atof_nol(token.value.data()); -				if(val < 0.0 || val > 0.5) +				if(val < 0 || val > 1)  				{ -					std::cerr << "random range is [0; 0.5].\n"; +					std::cerr << "random range is [0, 1].\n";  					exit(1);  				}  				settings.sample_selection_f_random.store(val); @@ -476,9 +474,9 @@ int main(int argc, char* argv[])  			else if(token.key == "stddev")  			{  				auto val = atof_nol(token.value.data()); -				if(val < 0.0 || val > 4.5) +				if(val < 0 || val > 4.5)  				{ -					std::cerr << "stddev range is [0; 4.5].\n"; +					std::cerr << "stddev range is [0, 4.5].\n";  					exit(1);  				}  				settings.velocity_stddev.store(val); diff --git a/man/drumgizmo.1 b/man/drumgizmo.1 index 01b5934..e4c4a1f 100644 --- a/man/drumgizmo.1 +++ b/man/drumgizmo.1 @@ -150,9 +150,9 @@ Timing humanizer options.  \fBlaidback\fR=<val> (Move notes ahead or behind in time in ms  [+/-100].)  .P -\fBtightness\fR=<val> (Control the tightness of the drummer. [0; 1].) +\fBtightness\fR=<val> (Control the tightness of the drummer. [0,1].)  .P -\fBregain\fR=<val> (Control how fast the drummer catches up the timing. [0; 1]) +\fBregain\fR=<val> (Control how fast the drummer catches up the timing. [0,1])  .RE  \fB-p, --parameters parmlist\fR @@ -160,16 +160,16 @@ Timing humanizer options.  Parameters for the sample selection algorithm.  .P  \fBclose\fR=<val> (The importance given to choosing a sample close to -the actual velocity value (after humanization) [0; 16]) +the actual velocity value (after humanization) [0,1])  .P  \fBdiverse\fR=<val> (The importance given to choosing samples which -haven't been played recently [0; 0.5]) +haven't been played recently [0,1])  .P -\fBrandom\fR=<val> (The amount of randomness added [0; 0.5]) +\fBrandom\fR=<val> (The amount of randomness added [0,1])  .P  \fBstddev\fR=<val> (The standard-deviation for the sample  selection. Higher value makes it more likely that a sample further -away from the input velocity will be played [0; 4.5]) +away from the input velocity will be played [0, 4.5])  .RE  \fB-v, --version\fR | 
