Mercurial > hg > screen-ui
comparison src/Voice.cpp @ 31:417deb31dd4e
Added a switch to control snap-to-true-position behaviour of tokens;
reduced default amplitude of voices.
| author | samer |
|---|---|
| date | Tue, 07 Feb 2012 14:23:32 +0000 |
| parents | f4ebb87adec1 |
| children | 06a2fdb333ca |
comparison
equal
deleted
inserted
replaced
| 30:9e8c19c90986 | 31:417deb31dd4e |
|---|---|
| 10 #include "Voice.h" | 10 #include "Voice.h" |
| 11 | 11 |
| 12 inline static double min(double x,double y) { return (x<y) ? x : y; } | 12 inline static double min(double x,double y) { return (x<y) ? x : y; } |
| 13 | 13 |
| 14 Voice::Voice(int id): | 14 Voice::Voice(int id): |
| 15 isActive(true), inTriangle(false), octave(0), amplitude(0.6), | 15 isActive(true), inTriangle(false), octave(0), amplitude(0.5), |
| 16 status(pending), id(id), posx(0), posy(0), truex(-1), truey(-1) {} | 16 status(pending), id(id), posx(0), posy(0), truex(-1), truey(-1) {} |
| 17 | 17 |
| 18 void Voice::draw(bool highlight){ | 18 void Voice::draw(bool highlight){ |
| 19 int r,g,b; | 19 int r,g,b; |
| 20 switch (status) { | 20 switch (status) { |