diff options
author | Florian Jung <flo@windfisch.org> | 2011-09-01 17:30:59 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-09-01 17:30:59 +0000 |
commit | 46369b4c33d841aa1ece363c3deb3775658165ad (patch) | |
tree | 73f923e0ee3d6d103957a507372ed3ad2666422d /muse2/muse/ctrl.h | |
parent | e64c6677de790368781f7d9f1ba1c98bcfc521d2 (diff) | |
parent | 1414d8185ca9bc0b078cff7512482f013e28bde3 (diff) |
merged with trunk
Diffstat (limited to 'muse2/muse/ctrl.h')
-rw-r--r-- | muse2/muse/ctrl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/muse2/muse/ctrl.h b/muse2/muse/ctrl.h index 34a31211..14f23643 100644 --- a/muse2/muse/ctrl.h +++ b/muse2/muse/ctrl.h @@ -6,6 +6,7 @@ // controller for mixer automation // // (C) Copyright 2003-2004 Werner Schweer (ws@seh.de) +// (C) Copyright 2011 Time E. Real (terminator356 on users dot sourceforge dot net) //========================================================= #ifndef __CTRL_H__ @@ -120,8 +121,8 @@ class CtrlList : public std::map<int, CtrlVal, std::less<int> > { void setValueType(CtrlValueType t) { _valueType = t; } double value(int frame); - void add(int tick, double value); - void del(int tick); + void add(int frame, double value); + void del(int frame); void read(Xml& xml); void setColor( QColor c ) { _displayColor = c;} |