Browse Source

Update to Rack v2 API: Use ParamWidget::getParamQuantity() instead of ParamWidget::paramQuantity.

tags/v2.0.1
Andrew Belt 5 years ago
parent
commit
cf9458c3ea
2 changed files with 10 additions and 6 deletions
  1. +8
    -5
      src/Octave.cpp
  2. +2
    -1
      src/VCA.cpp

+ 8
- 5
src/Octave.cpp View File

@@ -56,9 +56,10 @@ struct OctaveButton : Widget {


int activeOctave = 0; int activeOctave = 0;
ParamWidget* paramWidget = getAncestorOfType<ParamWidget>(); ParamWidget* paramWidget = getAncestorOfType<ParamWidget>();
if (paramWidget && paramWidget->paramQuantity) {
activeOctave = std::round(paramWidget->paramQuantity->getValue());
}
assert(paramWidget);
engine::ParamQuantity* pq = paramWidget->getParamQuantity();
if (pq)
activeOctave = std::round(pq->getValue());


if (activeOctave == octave) { if (activeOctave == octave) {
// Enabled // Enabled
@@ -136,8 +137,10 @@ inline void OctaveButton::onDragEnter(const event::DragEnter& e) {
OctaveParam* origin = dynamic_cast<OctaveParam*>(e.origin); OctaveParam* origin = dynamic_cast<OctaveParam*>(e.origin);
if (origin) { if (origin) {
ParamWidget* paramWidget = getAncestorOfType<ParamWidget>(); ParamWidget* paramWidget = getAncestorOfType<ParamWidget>();
if (paramWidget && paramWidget->paramQuantity) {
paramWidget->paramQuantity->setValue(octave);
assert(paramWidget);
engine::ParamQuantity* pq = paramWidget->getParamQuantity();
if (pq) {
pq->setValue(octave);
} }
} }
} }


+ 2
- 1
src/VCA.cpp View File

@@ -201,7 +201,8 @@ struct VCA_1VUKnob : SliderKnob {
Rect r = box.zeroPos().grow(margin.neg()); Rect r = box.zeroPos().grow(margin.neg());


int channels = module ? module->lastChannels : 1; int channels = module ? module->lastChannels : 1;
float value = paramQuantity ? paramQuantity->getValue() : 1.f;
engine::ParamQuantity* pq = getParamQuantity();
float value = pq ? pq->getValue() : 1.f;


// Segment value // Segment value
nvgBeginPath(args.vg); nvgBeginPath(args.vg);


Loading…
Cancel
Save