summaryrefslogtreecommitdiff
path: root/muse2/muse/midieditor.h
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2010-12-07 03:27:48 +0000
committerTim E. Real <termtech@rogers.com>2010-12-07 03:27:48 +0000
commit8e9886770af1022d88e6f92ff4fcceb3e50d0e55 (patch)
treefb42340c5d7a75278b7ed37478f066324fa59dde /muse2/muse/midieditor.h
parent45f13100f9b5d0fd5a9f4950e135c2ed6de0429c (diff)
Built Awl::posedit and Awl::sigedit, and replaced /widget versions and all usages.
Reverted class SpinBox to previous revision.
Diffstat (limited to 'muse2/muse/midieditor.h')
-rw-r--r--muse2/muse/midieditor.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/muse2/muse/midieditor.h b/muse2/muse/midieditor.h
index ee98239c..9a9ab437 100644
--- a/muse2/muse/midieditor.h
+++ b/muse2/muse/midieditor.h
@@ -8,7 +8,8 @@
#ifndef __MIDIEDITOR_H__
#define __MIDIEDITOR_H__
-#include "sig.h"
+///#include "sig.h"
+#include "al/sig.h"
#include "cobject.h"
//#include <QGridLayout>
@@ -66,10 +67,14 @@ class MidiEditor : public TopWin {
~MidiEditor();
int quantVal(int v) const;
- int rasterStep(unsigned tick) const { return sigmap.rasterStep(tick, _raster); }
- unsigned rasterVal(unsigned v) const { return sigmap.raster(v, _raster); }
- unsigned rasterVal1(unsigned v) const { return sigmap.raster1(v, _raster); }
- unsigned rasterVal2(unsigned v) const { return sigmap.raster2(v, _raster); }
+ ///int rasterStep(unsigned tick) const { return sigmap.rasterStep(tick, _raster); }
+ ///unsigned rasterVal(unsigned v) const { return sigmap.raster(v, _raster); }
+ ///unsigned rasterVal1(unsigned v) const { return sigmap.raster1(v, _raster); }
+ ///unsigned rasterVal2(unsigned v) const { return sigmap.raster2(v, _raster); }
+ int rasterStep(unsigned tick) const { return AL::sigmap.rasterStep(tick, _raster); }
+ unsigned rasterVal(unsigned v) const { return AL::sigmap.raster(v, _raster); }
+ unsigned rasterVal1(unsigned v) const { return AL::sigmap.raster1(v, _raster); }
+ unsigned rasterVal2(unsigned v) const { return AL::sigmap.raster2(v, _raster); }
int quant() const { return _quant; }
void setQuant(int val) { _quant = val; }
int raster() const { return _raster; }