summaryrefslogtreecommitdiff
path: root/muse2/muse/midiedit/prcanvas.h
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/midiedit/prcanvas.h')
-rw-r--r--muse2/muse/midiedit/prcanvas.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/muse2/muse/midiedit/prcanvas.h b/muse2/muse/midiedit/prcanvas.h
index bda22fc3..3ca9ab52 100644
--- a/muse2/muse/midiedit/prcanvas.h
+++ b/muse2/muse/midiedit/prcanvas.h
@@ -15,6 +15,7 @@
#include <QMouseEvent>
#include <QDragMoveEvent>
#include <QDragLeaveEvent>
+#include <QTimer>
#define KH 13
@@ -37,9 +38,11 @@ class QRect;
//---------------------------------------------------------
class PianoCanvas : public EventCanvas {
- int cmdRange;
int colorMode;
int playedPitch;
+
+ QTimer* chordTimer;
+ unsigned chordTimer_setToTick;
Q_OBJECT
virtual void viewMouseDoubleClickEvent(QMouseEvent*);
@@ -63,7 +66,6 @@ class PianoCanvas : public EventCanvas {
int y2pitch(int) const;
int pitch2y(int) const;
virtual void drawCanvas(QPainter&, const QRect&);
- void quantize(int, int, bool);
void copy();
void paste();
virtual void itemPressed(const CItem*);
@@ -74,6 +76,7 @@ class PianoCanvas : public EventCanvas {
private slots:
void midiNote(int pitch, int velo);
+ void chordTimerTimedOut();
signals:
void quantChanged(int);
@@ -88,19 +91,18 @@ class PianoCanvas : public EventCanvas {
public:
enum {
CMD_CUT, CMD_COPY, CMD_PASTE, CMD_DEL,
- CMD_OVER_QUANTIZE, CMD_ON_QUANTIZE, CMD_ONOFF_QUANTIZE,
- CMD_ITERATIVE_QUANTIZE,
+ CMD_QUANTIZE,
CMD_SELECT_ALL, CMD_SELECT_NONE, CMD_SELECT_INVERT,
CMD_SELECT_ILOOP, CMD_SELECT_OLOOP, CMD_SELECT_PREV_PART, CMD_SELECT_NEXT_PART,
- CMD_MODIFY_GATE_TIME, CMD_MODIFY_VELOCITY,
- CMD_CRESCENDO, CMD_TRANSPOSE, CMD_THIN_OUT, CMD_ERASE_EVENT,
+ CMD_MODIFY_GATE_TIME, CMD_MODIFY_VELOCITY, CMD_CRESCENDO,
+ CMD_TRANSPOSE, CMD_THIN_OUT, CMD_ERASE_EVENT,
CMD_NOTE_SHIFT, CMD_MOVE_CLOCK, CMD_COPY_MEASURE,
CMD_ERASE_MEASURE, CMD_DELETE_MEASURE, CMD_CREATE_MEASURE,
- CMD_FIXED_LEN, CMD_DELETE_OVERLAPS
+ CMD_FIXED_LEN, CMD_DELETE_OVERLAPS, CMD_LEGATO
};
PianoCanvas(MidiEditor*, QWidget*, int, int);
- void cmd(int, int, int, bool, int);
+ void cmd(int cmd);
void setColorMode(int mode) {
colorMode = mode;
redraw();