summaryrefslogtreecommitdiff
path: root/muse2/muse/ctrl/ctrlcanvas.h
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/ctrl/ctrlcanvas.h')
-rw-r--r--muse2/muse/ctrl/ctrlcanvas.h20
1 files changed, 4 insertions, 16 deletions
diff --git a/muse2/muse/ctrl/ctrlcanvas.h b/muse2/muse/ctrl/ctrlcanvas.h
index 50b71bbe..8e107789 100644
--- a/muse2/muse/ctrl/ctrlcanvas.h
+++ b/muse2/muse/ctrl/ctrlcanvas.h
@@ -53,12 +53,8 @@ class MidiEditor;
//---------------------------------------------------------
class CEvent {
- public:
- //enum State { Normal, Selected };
-
private:
MusECore::Event _event;
- //State _state;
int _val;
MusECore::MidiPart* _part;
int ex;
@@ -67,17 +63,14 @@ class CEvent {
CEvent(MusECore::Event e, MusECore::MidiPart* part, int v);
MusECore::Event event() const { return _event; }
void setEvent(MusECore::Event& ev) { _event = ev; }
- //State state() { return _state; }
- //void setState(State s) { _state = s; }
- //bool isSelected() { return _state == Selected; }
bool selected() const { return !_event.empty() && _event.selected(); }
void setSelected(bool v) { if(!_event.empty()) _event.setSelected(v); }
int val() const { return _val; }
void setVal(int v) { _val = v; }
void setEX(int v) { ex = v; }
MusECore::MidiPart* part() const { return _part; }
- bool contains(int /*x1*/, int /*x2*/) const;
- bool intersects(const MusECore::MidiController*, const QRect&, const int /*tickstep*/, const int /*windowHeight*/) const;
+ bool contains(int x1, int x2) const;
+ bool intersects(const MusECore::MidiController*, const QRect&, const int tickstep, const int windowHeight) const;
int x() { return ex; }
};
@@ -111,10 +104,8 @@ class CtrlCanvas : public MusEGui::View {
MusECore::MidiController* _controller;
CtrlPanel* _panel;
int _cnum;
- // Current real drum controller number (anote).
- int _dnum;
- // Current real drum controller index.
- int _didx;
+ int _dnum; // Current real drum controller number (anote).
+ int _didx; // Current real drum controller index.
int line1x;
int line1y;
int line2x;
@@ -135,7 +126,6 @@ class CtrlCanvas : public MusEGui::View {
void changeValRamp(int x1, int x2, int y1, int y2);
void newValRamp(int x1, int y1, int x2, int y2);
void changeVal(int x1, int x2, int y);
- //void newVal(int x1, int x2, int y);
void newVal(int x1, int y);
void newVal(int x1, int y1, int x2, int y2);
void deleteVal(int x1, int x2, int y);
@@ -176,8 +166,6 @@ class CtrlCanvas : public MusEGui::View {
void setMidiController(int);
void updateItems();
void updateSelections();
-
- //virtual void closeEvent(QCloseEvent*);
private slots:
void songChanged(int type);