diff options
| author | Florian Jung <flo@windfisch.org> | 2011-06-03 14:24:08 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-06-03 14:24:08 +0000 |
| commit | db164b62e3892bd17d1a2eabca76bde3b67072df (patch) | |
| tree | ab71ac4b4f05ab94c008d75ef7052bef5af6cc74 /muse2/muse/midiedit/dcanvas.h | |
| parent | def4fdb391f5207ebbe61881416f39f3d896cc5d (diff) | |
| parent | 9187899632c14d64b3fae6477b7f941240f912a6 (diff) | |
merged with trunk and adapted new functions
Diffstat (limited to 'muse2/muse/midiedit/dcanvas.h')
| -rw-r--r-- | muse2/muse/midiedit/dcanvas.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/muse2/muse/midiedit/dcanvas.h b/muse2/muse/midiedit/dcanvas.h index cc3b8fff..868113a6 100644 --- a/muse2/muse/midiedit/dcanvas.h +++ b/muse2/muse/midiedit/dcanvas.h @@ -10,6 +10,7 @@ #include "ecanvas.h" #include "song.h" +#include "steprec.h" #define TH 18 @@ -40,12 +41,15 @@ class PianoRoll; //--------------------------------------------------------- class DrumCanvas : public EventCanvas { - + Q_OBJECT + + StepRec* steprec; + // Cursor tool position QPoint cursorPos; int _stepSize; - Q_OBJECT + virtual void drawCanvas(QPainter&, const QRect&); virtual void drawItem(QPainter&, const CItem*, const QRect&); void drawTopItem(QPainter& p, const QRect& rect); @@ -61,8 +65,6 @@ class DrumCanvas : public EventCanvas { int y2pitch(int y) const; int pitch2y(int pitch) const; - void copy(); - void paste(); void startDrag(CItem*, bool copymode); void dragEnterEvent(QDragEnterEvent* event); void dragMoveEvent(QDragMoveEvent*); @@ -75,6 +77,9 @@ class DrumCanvas : public EventCanvas { signals: void newWidth(int); + private slots: + void midiNote(int pitch, int velo); + public slots: void mapChanged(int, int); void keyPressed(int, int); |