smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

more fixes to SVAModifier constructor(s)

Browse source
This commit is contained in:
Paul Davis 2014-12-15 09:03:52 -05:00
parent 4908685d5e
commit aa57e9e032
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libs/canvas/colors.cc
View file

@ -548,12 +548,24 @@ SVAModifier::from_string (string const & str)
switch (op) {
case '*':
type = Multiply;
/* no-op values for multiply */
s = 1.0;
v = 1.0;
a = 1.0;
break;
case '+':
type = Add;
/* no-op values for add */
s = 0.0;
v = 0.0;
a = 1.0;
break;
case '=':
type = Assign;
/* this will avoid assignment in operator() (see below) */
s = -1.0;
v = -1.0;
a = -1.0;
break;
default:
throw failed_constructor ();
@ -564,11 +576,11 @@ SVAModifier::from_string (string const & str)
while (ss) {
ss >> mod;
if ((pos = mod.find ("alpha:")) != string::npos) {
a = PBD::atoi (mod.substr (pos+6));
a = PBD::atof (mod.substr (pos+6));
} else if ((pos = mod.find ("saturate:")) != string::npos) {
s = PBD::atoi (mod.substr (pos+9));
s = PBD::atof (mod.substr (pos+9));
} else if ((pos = mod.find ("darkness:")) != string::npos) {
v = PBD::atoi (mod.substr (pos+9));
v = PBD::atof (mod.substr (pos+9));
} else {
throw failed_constructor ();
}
@ -625,9 +637,15 @@ SVAModifier::operator () (HSV& hsv) const
r.a *= a;
break;
case Assign:
r.s = s;
r.v = v;
r.a = a;
if (s > -1.0) {
r.s = s;
}
if (v > -1.0) {
r.v = v;
}
if (a > -1.0) {
r.a = a;
}
break;
}