diff --git a/src/app/ModuleWidget.cpp b/src/app/ModuleWidget.cpp index a076d5f2..91c4b0fe 100644 --- a/src/app/ModuleWidget.cpp +++ b/src/app/ModuleWidget.cpp @@ -13,6 +13,15 @@ #endif // USE_VST2 +#ifdef USE_LOG_PRINTF +extern void log_printf(const char *logData, ...); +#undef Dprintf +#define Dprintf log_printf +#else +#define Dprintf printf +#endif // USE_LOG_PRINTF + + namespace rack { @@ -185,6 +194,7 @@ void ModuleWidget::fromJson(json_t *rootJ) { if (!paramIdJ) continue; int paramId = json_integer_value(paramIdJ); + // Dprintf("fromJson: paramId=%d\n", paramId); // Find ParamWidget(s) with paramId for (ParamWidget *paramWidget : params) { if (paramWidget->paramId == paramId) diff --git a/src/app/ParamWidget.cpp b/src/app/ParamWidget.cpp index 9fc9b366..600045d6 100644 --- a/src/app/ParamWidget.cpp +++ b/src/app/ParamWidget.cpp @@ -4,6 +4,14 @@ #include "global.hpp" #include "global_ui.hpp" +#ifdef USE_LOG_PRINTF +extern void log_printf(const char *logData, ...); +#undef Dprintf +#define Dprintf log_printf +#else +#define Dprintf printf +#endif // USE_LOG_PRINTF + namespace rack { @@ -21,7 +29,11 @@ json_t *ParamWidget::toJson() { void ParamWidget::fromJson(json_t *rootJ) { json_t *valueJ = json_object_get(rootJ, "value"); if (valueJ) - setValue(json_number_value(valueJ)); + { + float numberVal = json_number_value(valueJ); + // Dprintf("ParamWidget::fromJson: numberVal=%f\n", numberVal); + setValue(numberVal); + } } void ParamWidget::reset() { diff --git a/src/widgets/QuantityWidget.cpp b/src/widgets/QuantityWidget.cpp index 02e5e551..ae32a011 100644 --- a/src/widgets/QuantityWidget.cpp +++ b/src/widgets/QuantityWidget.cpp @@ -1,5 +1,13 @@ #include "widgets.hpp" +#ifdef USE_LOG_PRINTF +extern void log_printf(const char *logData, ...); +#undef Dprintf +#define Dprintf log_printf +#else +#define Dprintf printf +#endif // USE_LOG_PRINTF + namespace rack { @@ -9,21 +17,23 @@ QuantityWidget::QuantityWidget() { } void QuantityWidget::setValue(float value) { - // printf("xxx QuantityWidget::setValue: value=%f\n", value); + // Dprintf("xxx QuantityWidget::setValue: value=%f\n", value); if(isfinite(minValue) && isfinite(maxValue)) { + // Dprintf("xxx QuantityWidget::setValue: isfinite value=%f\n", value); this->value = clamp(value, fminf(minValue, maxValue), fmaxf(minValue, maxValue)); EventChange e; onChange(e); } else { + // Dprintf("xxx QuantityWidget::setValue: !isfinite value=%f\n", value); // Rotary knob this->value = value; EventChange e; onChange(e); } - // printf("xxx QuantityWidget::setValue: LEAVE value=%f\n", value); + // Dprintf("xxx QuantityWidget::setValue: LEAVE value=%f\n", value); } void QuantityWidget::setLimits(float minValue, float maxValue) {