summaryrefslogtreecommitdiff
path: root/muse2/awl
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/awl')
-rw-r--r--muse2/awl/midimeter.h3
-rw-r--r--muse2/awl/midimslider.h3
-rw-r--r--muse2/awl/mslider.h3
-rw-r--r--muse2/awl/pitchlabel.h4
-rw-r--r--muse2/awl/tempolabel.h3
5 files changed, 11 insertions, 5 deletions
diff --git a/muse2/awl/midimeter.h b/muse2/awl/midimeter.h
index 2b0d3518..929e648c 100644
--- a/muse2/awl/midimeter.h
+++ b/muse2/awl/midimeter.h
@@ -31,8 +31,9 @@ namespace Awl {
class MidiMeter : public Slider
{
- Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
Q_OBJECT
+ Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
+
double meterval;
int _meterWidth;
diff --git a/muse2/awl/midimslider.h b/muse2/awl/midimslider.h
index a2a2bdaf..a363348a 100644
--- a/muse2/awl/midimslider.h
+++ b/muse2/awl/midimslider.h
@@ -31,8 +31,9 @@ namespace Awl {
class MidiMeterSlider : public Slider
{
- Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
Q_OBJECT
+ Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
+
double meterval;
int _meterWidth;
diff --git a/muse2/awl/mslider.h b/muse2/awl/mslider.h
index 4ae888b1..15dd8a7e 100644
--- a/muse2/awl/mslider.h
+++ b/muse2/awl/mslider.h
@@ -32,9 +32,10 @@ namespace Awl {
class MeterSlider : public VolSlider
{
+ Q_OBJECT
Q_PROPERTY(int meterWidth READ meterWidth WRITE setMeterWidth)
Q_PROPERTY(int channel READ channel WRITE setChannel)
- Q_OBJECT
+
int _channel;
std::vector<double> meterval;
diff --git a/muse2/awl/pitchlabel.h b/muse2/awl/pitchlabel.h
index e5c34dba..a09d1ced 100644
--- a/muse2/awl/pitchlabel.h
+++ b/muse2/awl/pitchlabel.h
@@ -30,9 +30,11 @@ namespace Awl {
//---------------------------------------------------------
class PitchLabel : public QLabel {
+ Q_OBJECT
+
bool _pitchMode;
int _value;
- Q_OBJECT
+
protected:
QSize sizeHint() const;
diff --git a/muse2/awl/tempolabel.h b/muse2/awl/tempolabel.h
index df9abfcd..b7df6b56 100644
--- a/muse2/awl/tempolabel.h
+++ b/muse2/awl/tempolabel.h
@@ -30,9 +30,10 @@ namespace Awl {
//---------------------------------------------------------
class TempoLabel : public QLabel {
+ Q_OBJECT
double _value;
- Q_OBJECT
+
protected:
QSize sizeHint() const;