summaryrefslogtreecommitdiff
path: root/muse2/muse/midieditor.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-05-14 13:29:32 +0000
committerFlorian Jung <flo@windfisch.org>2011-05-14 13:29:32 +0000
commit0ec79fb4c59be4adb77d3dcbc068dee7107ed381 (patch)
treedfe2623fbec584095c1b7462952157b59b19a0bb /muse2/muse/midieditor.h
parent8aed0b79c9b28af69ef67e858992385ea074df63 (diff)
- removed unneccessary _to and _quant* - stuff from piano roll and drum edit
this also involved changing the Toolbar1 - removed unneccessary short cuts: SHRT_OVER_QUANTIZE etc. instead added SHRT_QUANTIZE - changed behaviour for scripts: the "quant"-parameter they get isn't the quant-combo's setting, but the snap-combo's now - changed behaviour for step-recording: the note-length is now the "raster"- value instead of the "quant"-value
Diffstat (limited to 'muse2/muse/midieditor.h')
-rw-r--r--muse2/muse/midieditor.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/muse2/muse/midieditor.h b/muse2/muse/midieditor.h
index 1f465c2d..00272529 100644
--- a/muse2/muse/midieditor.h
+++ b/muse2/muse/midieditor.h
@@ -44,7 +44,7 @@ class MidiEditor : public TopWin {
WaveView* wview;
std::list<CtrlEdit*> ctrlEditList;
- int _quant, _raster;
+ int _raster;
QGridLayout* mainGrid;
QWidget* mainw;
virtual void readStatus(Xml&);
@@ -61,11 +61,10 @@ class MidiEditor : public TopWin {
void curDrumInstrumentChanged(int);
public:
- MidiEditor(int, int, PartList*,
+ MidiEditor(int, PartList*,
QWidget* parent = 0, const char* name = 0);
~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); }
@@ -74,8 +73,6 @@ class MidiEditor : public TopWin {
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; }
void setRaster(int val) { _raster = val; }
PartList* parts() { return _pl; }