summaryrefslogtreecommitdiff
path: root/muse2/muse/ctrl.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-09-01 17:30:59 +0000
committerFlorian Jung <flo@windfisch.org>2011-09-01 17:30:59 +0000
commit46369b4c33d841aa1ece363c3deb3775658165ad (patch)
tree73f923e0ee3d6d103957a507372ed3ad2666422d /muse2/muse/ctrl.h
parente64c6677de790368781f7d9f1ba1c98bcfc521d2 (diff)
parent1414d8185ca9bc0b078cff7512482f013e28bde3 (diff)
merged with trunk
Diffstat (limited to 'muse2/muse/ctrl.h')
-rw-r--r--muse2/muse/ctrl.h5
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;}