commit a8e358b2771aa00b533f52e91f405dceabdcd804 parent a472eb64b86fa38764eacfb913c44a18038be465 Author: Matt Demanett <matt@demanett.net> Date: Sun, 26 Sep 2021 23:08:56 -0400 Rack2: rename toJson/fromJson; Rack defines these now. Diffstat:
99 files changed, 248 insertions(+), 248 deletions(-)
diff --git a/src/AD.cpp b/src/AD.cpp @@ -29,12 +29,12 @@ void AD::sampleRateChange() { } } -json_t* AD::toJson(json_t* root) { +json_t* AD::saveToJson(json_t* root) { json_object_set_new(root, INVERT, json_real(_invert)); return root; } -void AD::fromJson(json_t* root) { +void AD::loadFromJson(json_t* root) { json_t* i = json_object_get(root, INVERT); if (i) { _invert = json_real_value(i); diff --git a/src/AD.hpp b/src/AD.hpp @@ -76,8 +76,8 @@ struct AD : BGModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/ADSR.cpp b/src/ADSR.cpp @@ -24,12 +24,12 @@ void ADSR::sampleRateChange() { } } -json_t* ADSR::toJson(json_t* root) { +json_t* ADSR::saveToJson(json_t* root) { json_object_set_new(root, INVERT, json_real(_invert)); return root; } -void ADSR::fromJson(json_t* root) { +void ADSR::loadFromJson(json_t* root) { json_t* i = json_object_get(root, INVERT); if (i) { _invert = json_real_value(i); diff --git a/src/ADSR.hpp b/src/ADSR.hpp @@ -67,8 +67,8 @@ struct ADSR : BGModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/AMRM.cpp b/src/AMRM.cpp @@ -3,12 +3,12 @@ #define POLY_INPUT "poly_input" -json_t* AMRM::toJson(json_t* root) { +json_t* AMRM::saveToJson(json_t* root) { json_object_set_new(root, POLY_INPUT, json_integer(_polyInputID)); return root; } -void AMRM::fromJson(json_t* root) { +void AMRM::loadFromJson(json_t* root) { json_t* p = json_object_get(root, POLY_INPUT); if (p) { _polyInputID = json_integer_value(p); diff --git a/src/AMRM.hpp b/src/AMRM.hpp @@ -39,8 +39,8 @@ struct AMRM : BGModule { configParam(DRYWET_PARAM, 0.0f, 1.0f, 1.0f, "Wet mix", "%", 0.0f, 100.0f); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void processChannel(const ProcessArgs& args, int c) override; diff --git a/src/ASR.cpp b/src/ASR.cpp @@ -29,12 +29,12 @@ void ASR::sampleRateChange() { } } -json_t* ASR::toJson(json_t* root) { +json_t* ASR::saveToJson(json_t* root) { json_object_set_new(root, INVERT, json_real(_invert)); return root; } -void ASR::fromJson(json_t* root) { +void ASR::loadFromJson(json_t* root) { json_t* i = json_object_get(root, INVERT); if (i) { _invert = json_real_value(i); diff --git a/src/ASR.hpp b/src/ASR.hpp @@ -71,8 +71,8 @@ struct ASR : BGModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp @@ -9,13 +9,13 @@ void Analyzer::sampleRateChange() { _sampleRate = APP->engine->getSampleRate(); } -json_t* Analyzer::toJson(json_t* root) { +json_t* Analyzer::saveToJson(json_t* root) { frequencyPlotToJson(root); amplitudePlotToJson(root); return root; } -void Analyzer::fromJson(json_t* root) { +void Analyzer::loadFromJson(json_t* root) { frequencyPlotFromJson(root); amplitudePlotFromJson(root); } diff --git a/src/Analyzer.hpp b/src/Analyzer.hpp @@ -59,8 +59,8 @@ struct Analyzer : AnalyzerBase { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void modulate() override; void processAll(const ProcessArgs& args) override; }; diff --git a/src/AnalyzerXL.cpp b/src/AnalyzerXL.cpp @@ -22,7 +22,7 @@ void AnalyzerXL::sampleRateChange() { _sampleRate = APP->engine->getSampleRate(); } -json_t* AnalyzerXL::toJson(json_t* root) { +json_t* AnalyzerXL::saveToJson(json_t* root) { frequencyPlotToJson(root); frequencyRangeToJson(root); amplitudePlotToJson(root); @@ -66,7 +66,7 @@ json_t* AnalyzerXL::toJson(json_t* root) { return root; } -void AnalyzerXL::fromJson(json_t* root) { +void AnalyzerXL::loadFromJson(json_t* root) { frequencyPlotFromJson(root); frequencyRangeFromJson(root); amplitudePlotFromJson(root); diff --git a/src/AnalyzerXL.hpp b/src/AnalyzerXL.hpp @@ -39,8 +39,8 @@ struct AnalyzerXL : AnalyzerBase { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void modulate() override; void processAll(const ProcessArgs& args) override; }; diff --git a/src/Arp.cpp b/src/Arp.cpp @@ -229,13 +229,13 @@ void Arp::sampleRateChange() { _sampleTime = APP->engine->getSampleTime(); } -json_t* Arp::toJson(json_t* root) { +json_t* Arp::saveToJson(json_t* root) { json_object_set_new(root, NOTES_IMMEDIATE_MODE, json_boolean(_notesImmediate)); json_object_set_new(root, FIXED_GATE_MODE, json_boolean(_fixedGate)); return root; } -void Arp::fromJson(json_t* root) { +void Arp::loadFromJson(json_t* root) { json_t* ni = json_object_get(root, NOTES_IMMEDIATE_MODE); if (ni) { _notesImmediate = json_is_true(ni); diff --git a/src/Arp.hpp b/src/Arp.hpp @@ -148,8 +148,8 @@ struct Arp : BGModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; int channels() override; void addChannel(int c) override; void removeChannel(int c) override; diff --git a/src/Clpr.cpp b/src/Clpr.cpp @@ -27,12 +27,12 @@ void Clpr::ThresholdParamQuantity::setDisplayValue(float v) { setValue(v); } -json_t* Clpr::toJson(json_t* root) { +json_t* Clpr::saveToJson(json_t* root) { json_object_set_new(root, THRESHOLD_RANGE, json_real(_thresholdRange)); return root; } -void Clpr::fromJson(json_t* root) { +void Clpr::loadFromJson(json_t* root) { json_t* tr = json_object_get(root, THRESHOLD_RANGE); if (tr) { _thresholdRange = std::max(0.0f, (float)json_real_value(tr)); diff --git a/src/Clpr.hpp b/src/Clpr.hpp @@ -57,8 +57,8 @@ struct Clpr : BGModule { configParam(KNEE_PARAM, 0.0f, 1.0f, 0.0f, "Knee"); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/FMOp.cpp b/src/FMOp.cpp @@ -56,14 +56,14 @@ void FMOp::Engine::sampleRateChange() { sustainSL.setParams(sampleRate, 1.0f, 1.0f); } -json_t* FMOp::toJson(json_t* root) { +json_t* FMOp::saveToJson(json_t* root) { json_object_set_new(root, LINEAR_LEVEL, json_boolean(_linearLevel)); json_object_set_new(root, ANTIALIAS_FEEDBACK, json_boolean(_antiAliasFeedback)); json_object_set_new(root, ANTIALIAS_DEPTH, json_boolean(_antiAliasDepth)); return root; } -void FMOp::fromJson(json_t* root) { +void FMOp::loadFromJson(json_t* root) { json_t* ll = json_object_get(root, LINEAR_LEVEL); if (ll) { _linearLevel = json_is_true(ll); diff --git a/src/FMOp.hpp b/src/FMOp.hpp @@ -122,8 +122,8 @@ struct FMOp : BGModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/FourMan.cpp b/src/FourMan.cpp @@ -14,14 +14,14 @@ void FourMan::sampleRateChange() { _sampleTime = APP->engine->getSampleTime(); } -json_t* FourMan::toJson(json_t* root) { - root = TriggerOnLoadModule::toJson(root); +json_t* FourMan::saveToJson(json_t* root) { + root = TriggerOnLoadModule::saveToJson(root); json_object_set_new(root, OUTPUT_SCALE, json_real(_outputScale)); return root; } -void FourMan::fromJson(json_t* root) { - TriggerOnLoadModule::fromJson(root); +void FourMan::loadFromJson(json_t* root) { + TriggerOnLoadModule::loadFromJson(root); json_t* os = json_object_get(root, OUTPUT_SCALE); if (os) { _outputScale = json_real_value(os); diff --git a/src/FourMan.hpp b/src/FourMan.hpp @@ -52,8 +52,8 @@ struct FourMan : TriggerOnLoadModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void processAll(const ProcessArgs& args) override; bool shouldTriggerOnNextLoad() override { return true; diff --git a/src/Inv.cpp b/src/Inv.cpp @@ -12,7 +12,7 @@ void Inv::reset() { } } -json_t* Inv::toJson(json_t* root) { +json_t* Inv::saveToJson(json_t* root) { json_object_set_new(root, SAVE_LATCHED_TO_PATCH, json_boolean(_saveLatchedToPatch)); if (_saveLatchedToPatch) { if (_latch[0]) { @@ -34,7 +34,7 @@ json_t* Inv::toJson(json_t* root) { return root; } -void Inv::fromJson(json_t* root) { +void Inv::loadFromJson(json_t* root) { json_t* sl = json_object_get(root, SAVE_LATCHED_TO_PATCH); if (sl) { _saveLatchedToPatch = json_is_true(sl); diff --git a/src/Inv.hpp b/src/Inv.hpp @@ -51,8 +51,8 @@ struct Inv : BGModule { } void reset() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void modulate() override; void processAll(const ProcessArgs& args) override; void processDual(int i); diff --git a/src/LFO.cpp b/src/LFO.cpp @@ -25,12 +25,12 @@ void LFO::sampleRateChange() { } } -json_t* LFO::toJson(json_t* root) { +json_t* LFO::saveToJson(json_t* root) { json_object_set_new(root, OFFSET_CV_TO_SMOOTHING, json_boolean(_useOffsetCvForSmooth)); return root; } -void LFO::fromJson(json_t* root) { +void LFO::loadFromJson(json_t* root) { json_t* ocv = json_object_get(root, OFFSET_CV_TO_SMOOTHING); if (ocv) { _useOffsetCvForSmooth = json_boolean_value(ocv); diff --git a/src/LFO.hpp b/src/LFO.hpp @@ -96,8 +96,8 @@ struct LFO : LFOBase { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/LLFO.cpp b/src/LLFO.cpp @@ -18,7 +18,7 @@ void LLFO::sampleRateChange() { } } -json_t* LLFO::toJson(json_t* root) { +json_t* LLFO::saveToJson(json_t* root) { json_object_set_new(root, OUTPUT_SAMPLING, json_real(_sample)); json_object_set_new(root, PULSE_WIDTH, json_real(_pulseWidth)); json_object_set_new(root, SMOOTHING, json_real(_smooth)); @@ -26,7 +26,7 @@ json_t* LLFO::toJson(json_t* root) { return root; } -void LLFO::fromJson(json_t* root) { +void LLFO::loadFromJson(json_t* root) { json_t* os = json_object_get(root, OUTPUT_SAMPLING); if (os) { _sample = json_real_value(os); diff --git a/src/LLFO.hpp b/src/LLFO.hpp @@ -95,8 +95,8 @@ struct LLFO : LFOBase { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/LPG.cpp b/src/LPG.cpp @@ -26,12 +26,12 @@ void LPG::sampleRateChange() { } } -json_t* LPG::toJson(json_t* root) { +json_t* LPG::saveToJson(json_t* root) { json_object_set_new(root, LPF_POLES, json_integer(_lpfPoles)); return root; } -void LPG::fromJson(json_t* root) { +void LPG::loadFromJson(json_t* root) { json_t* p = json_object_get(root, LPF_POLES); if (p) { _lpfPoles = json_integer_value(p); diff --git a/src/LPG.hpp b/src/LPG.hpp @@ -73,8 +73,8 @@ struct LPG : LPGEnvBaseModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/LVCF.cpp b/src/LVCF.cpp @@ -42,7 +42,7 @@ float LVCF::Engine::next(float sample) { return _finalHP.next(_filter.next(sample)); } -json_t* LVCF::toJson(json_t* root) { +json_t* LVCF::saveToJson(json_t* root) { json_object_set_new(root, POLES_KEY, json_integer(_polesSetting)); switch (_bandwidthMode) { @@ -60,7 +60,7 @@ json_t* LVCF::toJson(json_t* root) { return root; } -void LVCF::fromJson(json_t* root) { +void LVCF::loadFromJson(json_t* root) { json_t* p = json_object_get(root, POLES_KEY); if (p) { _polesSetting = clamp(json_integer_value(p), 1, 12); diff --git a/src/LVCF.hpp b/src/LVCF.hpp @@ -76,8 +76,8 @@ struct LVCF : BGModule { configParam(MODE_PARAM, 0.0f, 3.0f, 0.0f, "Mode"); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void sampleRateChange() override; bool active() override; int channels() override; diff --git a/src/LVCO.cpp b/src/LVCO.cpp @@ -5,16 +5,16 @@ #define LINEAR_MODE "linear_mode" #define RESET_ON_WAVE_CHANGE "reset_on_wave_change" -json_t* LVCO::toJson(json_t* root) { - root = VCOBase::toJson(root); +json_t* LVCO::saveToJson(json_t* root) { + root = VCOBase::saveToJson(root); json_object_set_new(root, FM_MODE, json_boolean(_fmLinearMode)); json_object_set_new(root, LINEAR_MODE, json_boolean(_linearMode)); json_object_set_new(root, RESET_ON_WAVE_CHANGE, json_boolean(_resetOnWaveChange)); return root; } -void LVCO::fromJson(json_t* root) { - VCOBase::fromJson(root); +void LVCO::loadFromJson(json_t* root) { + VCOBase::loadFromJson(root); json_t* fm = json_object_get(root, FM_MODE); if (fm) { diff --git a/src/LVCO.hpp b/src/LVCO.hpp @@ -67,8 +67,8 @@ struct LVCO : VCOBase { configParam(FM_DEPTH_PARAM, 0.0f, 1.0f, 0.0f, "FM depth", "%", 0.0f, 100.0f); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; void modulate() override; void modulateChannel(int c) override; diff --git a/src/Lmtr.cpp b/src/Lmtr.cpp @@ -39,14 +39,14 @@ void Lmtr::sampleRateChange() { } } -json_t* Lmtr::toJson(json_t* root) { +json_t* Lmtr::saveToJson(json_t* root) { json_object_set_new(root, ATTACK_MS, json_real(_attackMs)); json_object_set_new(root, RELEASE_MS, json_real(_releaseMs)); json_object_set_new(root, THRESHOLD_RANGE, json_real(_thresholdRange)); return root; } -void Lmtr::fromJson(json_t* root) { +void Lmtr::loadFromJson(json_t* root) { json_t* a = json_object_get(root, ATTACK_MS); if (a) { _attackMs = std::max(0.0f, (float)json_real_value(a)); diff --git a/src/Lmtr.hpp b/src/Lmtr.hpp @@ -72,8 +72,8 @@ struct Lmtr : BGModule { } void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/Manual.cpp b/src/Manual.cpp @@ -12,14 +12,14 @@ void Manual::sampleRateChange() { _sampleTime = APP->engine->getSampleTime(); } -json_t* Manual::toJson(json_t* root) { - root = TriggerOnLoadModule::toJson(root); +json_t* Manual::saveToJson(json_t* root) { + root = TriggerOnLoadModule::saveToJson(root); json_object_set_new(root, OUTPUT_SCALE, json_real(_outputScale)); return root; } -void Manual::fromJson(json_t* root) { - TriggerOnLoadModule::fromJson(root); +void Manual::loadFromJson(json_t* root) { + TriggerOnLoadModule::loadFromJson(root); json_t* os = json_object_get(root, OUTPUT_SCALE); if (os) { _outputScale = json_real_value(os); diff --git a/src/Manual.hpp b/src/Manual.hpp @@ -50,8 +50,8 @@ struct Manual : TriggerOnLoadModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void processAll(const ProcessArgs& args) override; bool shouldTriggerOnNextLoad() override { return true; diff --git a/src/MegaGate.cpp b/src/MegaGate.cpp @@ -32,14 +32,14 @@ void MegaGate::sampleRateChange() { } } -json_t* MegaGate::toJson(json_t* root) { - root = LPGEnvBaseModule::toJson(root); +json_t* MegaGate::saveToJson(json_t* root) { + root = LPGEnvBaseModule::saveToJson(root); json_object_set_new(root, VELOCITY_MINIMUM_DECIBELS, json_real(_minVelocityDb)); return root; } -void MegaGate::fromJson(json_t* root) { - LPGEnvBaseModule::fromJson(root); +void MegaGate::loadFromJson(json_t* root) { + LPGEnvBaseModule::loadFromJson(root); json_t* mdb = json_object_get(root, VELOCITY_MINIMUM_DECIBELS); if (mdb) { _minVelocityDb = json_real_value(mdb); diff --git a/src/MegaGate.hpp b/src/MegaGate.hpp @@ -133,8 +133,8 @@ struct MegaGate : LPGEnvBaseModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/Mix4.cpp b/src/Mix4.cpp @@ -3,14 +3,14 @@ #define POLY_OFFSET "poly_channel_offset" -json_t* Mix4::toJson(json_t* root) { - root = DimmableMixerModule::toJson(root); +json_t* Mix4::saveToJson(json_t* root) { + root = DimmableMixerModule::saveToJson(root); json_object_set_new(root, POLY_OFFSET, json_integer(_polyChannelOffset)); return root; } -void Mix4::fromJson(json_t* root) { - DimmableMixerModule::fromJson(root); +void Mix4::loadFromJson(json_t* root) { + DimmableMixerModule::loadFromJson(root); json_t* o = json_object_get(root, POLY_OFFSET); if (o) { _polyChannelOffset = json_integer_value(o); diff --git a/src/Mix4.hpp b/src/Mix4.hpp @@ -97,8 +97,8 @@ struct Mix4 : ExpandableModule<Mix4ExpanderMessage, DimmableMixerModule> { } } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void sampleRateChange() override; void processAll(const ProcessArgs& args) override; }; diff --git a/src/Mix8.cpp b/src/Mix8.cpp @@ -3,14 +3,14 @@ #define POLY_OFFSET "poly_channel_offset" -json_t* Mix8::toJson(json_t* root) { - root = DimmableMixerModule::toJson(root); +json_t* Mix8::saveToJson(json_t* root) { + root = DimmableMixerModule::saveToJson(root); json_object_set_new(root, POLY_OFFSET, json_integer(_polyChannelOffset)); return root; } -void Mix8::fromJson(json_t* root) { - DimmableMixerModule::fromJson(root); +void Mix8::loadFromJson(json_t* root) { + DimmableMixerModule::loadFromJson(root); json_t* o = json_object_get(root, POLY_OFFSET); if (o) { _polyChannelOffset = json_integer_value(o); diff --git a/src/Mix8.hpp b/src/Mix8.hpp @@ -137,8 +137,8 @@ struct Mix8 : ExpandableModule<Mix8ExpanderMessage, DimmableMixerModule> { } } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void sampleRateChange() override; void processAll(const ProcessArgs& args) override; }; diff --git a/src/Mute8.cpp b/src/Mute8.cpp @@ -8,12 +8,12 @@ const float Mute8::maxDecibels = 0.0f; const float Mute8::minDecibels = Amplifier::minDecibels; const float Mute8::slewTimeMS = 5.0f; -json_t* Mute8::toJson(json_t* root) { +json_t* Mute8::saveToJson(json_t* root) { json_object_set_new(root, LATCHING_CVS, json_boolean(_latchingCVs)); return root; } -void Mute8::fromJson(json_t* root) { +void Mute8::loadFromJson(json_t* root) { json_t* l = json_object_get(root, LATCHING_CVS); if (l) { _latchingCVs = json_is_true(l); diff --git a/src/Mute8.hpp b/src/Mute8.hpp @@ -88,8 +88,8 @@ struct Mute8 : BGModule { configParam(MUTE8_PARAM, 0.0f, 3.0f, 0.0f, "Mute 8"); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void reset() override; void sampleRateChange() override; void processAll(const ProcessArgs& args) override; diff --git a/src/Nsgt.cpp b/src/Nsgt.cpp @@ -39,14 +39,14 @@ void Nsgt::sampleRateChange() { } } -json_t* Nsgt::toJson(json_t* root) { +json_t* Nsgt::saveToJson(json_t* root) { json_object_set_new(root, ATTACK_MS, json_real(_attackMs)); json_object_set_new(root, RELEASE_MS, json_real(_releaseMs)); json_object_set_new(root, THRESHOLD_RANGE, json_real(_thresholdRange)); return root; } -void Nsgt::fromJson(json_t* root) { +void Nsgt::loadFromJson(json_t* root) { json_t* a = json_object_get(root, ATTACK_MS); if (a) { _attackMs = std::max(0.0f, (float)json_real_value(a)); diff --git a/src/Nsgt.hpp b/src/Nsgt.hpp @@ -72,8 +72,8 @@ struct Nsgt : BGModule { } void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/Offset.cpp b/src/Offset.cpp @@ -3,14 +3,14 @@ #define OFFSET_FIRST "offset_first" -json_t* Offset::toJson(json_t* root) { - root = DisableOutputLimitModule::toJson(root); +json_t* Offset::saveToJson(json_t* root) { + root = DisableOutputLimitModule::saveToJson(root); json_object_set_new(root, OFFSET_FIRST, json_boolean(_offsetFirst)); return root; } -void Offset::fromJson(json_t* root) { - DisableOutputLimitModule::fromJson(root); +void Offset::loadFromJson(json_t* root) { + DisableOutputLimitModule::loadFromJson(root); json_t* of = json_object_get(root, OFFSET_FIRST); if (of) { _offsetFirst = json_boolean_value(of); diff --git a/src/Offset.hpp b/src/Offset.hpp @@ -34,8 +34,8 @@ struct Offset : DisableOutputLimitModule { configParam<TenXSquaringParamQuantity>(SCALE_PARAM, -1.0f, 1.0f, 0.31623f, "Scale", "x"); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; int channels() override; void processChannel(const ProcessArgs& args, int c) override; float knobValue(Param& knob, Input& cv, int c) const; diff --git a/src/Pgmr.cpp b/src/Pgmr.cpp @@ -19,14 +19,14 @@ void Pgmr::sampleRateChange() { _sampleTime = APP->engine->getSampleTime(); } -json_t* Pgmr::toJson(json_t* root) { - root = OutputRangeAddressableSequenceModule::toJson(root); +json_t* Pgmr::saveToJson(json_t* root) { + root = OutputRangeAddressableSequenceModule::saveToJson(root); json_object_set_new(root, SELECT_TRIGGERS, json_boolean(_selectTriggers)); return root; } -void Pgmr::fromJson(json_t* root) { - OutputRangeAddressableSequenceModule::fromJson(root); +void Pgmr::loadFromJson(json_t* root) { + OutputRangeAddressableSequenceModule::loadFromJson(root); json_t* st = json_object_get(root, SELECT_TRIGGERS); if (st) { _selectTriggers = json_is_true(st); diff --git a/src/Pgmr.hpp b/src/Pgmr.hpp @@ -107,8 +107,8 @@ struct Pgmr : PgmrBase { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void modulate() override; void processAlways(const ProcessArgs& args) override; void processChannel(const ProcessArgs& args, int c) override; diff --git a/src/PolyOff16.cpp b/src/PolyOff16.cpp @@ -3,14 +3,14 @@ #define OFFSET_FIRST "offset_first" -json_t* PolyOff16::toJson(json_t* root) { - root = OutputRangeModule<BGModule>::toJson(root); +json_t* PolyOff16::saveToJson(json_t* root) { + root = OutputRangeModule<BGModule>::saveToJson(root); json_object_set_new(root, OFFSET_FIRST, json_boolean(_offsetFirst)); return root; } -void PolyOff16::fromJson(json_t* root) { - OutputRangeModule<BGModule>::fromJson(root); +void PolyOff16::loadFromJson(json_t* root) { + OutputRangeModule<BGModule>::loadFromJson(root); json_t* of = json_object_get(root, OFFSET_FIRST); if (of) { _offsetFirst = json_boolean_value(of); diff --git a/src/PolyOff16.hpp b/src/PolyOff16.hpp @@ -130,8 +130,8 @@ struct PolyOff16 : OutputRangeModule<BGModule> { configParam(CHANNELS_PARAM, 1.0f, 16.0f, 1.0f, "Polyphony channels"); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void processAll(const ProcessArgs& args) override; }; diff --git a/src/PolyOff8.cpp b/src/PolyOff8.cpp @@ -3,14 +3,14 @@ #define OFFSET_FIRST "offset_first" -json_t* PolyOff8::toJson(json_t* root) { - root = OutputRangeModule<BGModule>::toJson(root); +json_t* PolyOff8::saveToJson(json_t* root) { + root = OutputRangeModule<BGModule>::saveToJson(root); json_object_set_new(root, OFFSET_FIRST, json_boolean(_offsetFirst)); return root; } -void PolyOff8::fromJson(json_t* root) { - OutputRangeModule<BGModule>::fromJson(root); +void PolyOff8::loadFromJson(json_t* root) { + OutputRangeModule<BGModule>::loadFromJson(root); json_t* of = json_object_get(root, OFFSET_FIRST); if (of) { _offsetFirst = json_boolean_value(of); diff --git a/src/PolyOff8.hpp b/src/PolyOff8.hpp @@ -82,8 +82,8 @@ struct PolyOff8 : OutputRangeModule<BGModule> { configParam(CHANNELS_PARAM, 1.0f, 8.0f, 1.0f, "Polyphony channels"); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void processAll(const ProcessArgs& args) override; }; diff --git a/src/Pressor.cpp b/src/Pressor.cpp @@ -37,12 +37,12 @@ void Pressor::sampleRateChange() { } } -json_t* Pressor::toJson(json_t* root) { +json_t* Pressor::saveToJson(json_t* root) { json_object_set_new(root, THRESHOLD_RANGE, json_real(_thresholdRange)); return root; } -void Pressor::fromJson(json_t* root) { +void Pressor::loadFromJson(json_t* root) { json_t* tr = json_object_get(root, THRESHOLD_RANGE); if (tr) { _thresholdRange = std::max(0.0f, (float)json_real_value(tr)); diff --git a/src/Pressor.hpp b/src/Pressor.hpp @@ -96,8 +96,8 @@ struct Pressor : BGModule { } void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/Pulse.cpp b/src/Pulse.cpp @@ -3,14 +3,14 @@ #define LINEAR_MODE "linear_mode" -json_t* Pulse::toJson(json_t* root) { - root = VCOBase::toJson(root); +json_t* Pulse::saveToJson(json_t* root) { + root = VCOBase::saveToJson(root); json_object_set_new(root, LINEAR_MODE, json_boolean(_linearMode)); return root; } -void Pulse::fromJson(json_t* root) { - VCOBase::fromJson(root); +void Pulse::loadFromJson(json_t* root) { + VCOBase::loadFromJson(root); json_t* l = json_object_get(root, LINEAR_MODE); if (l) { _linearMode = json_is_true(l); diff --git a/src/Pulse.hpp b/src/Pulse.hpp @@ -44,8 +44,8 @@ struct Pulse : VCOBase { configParam(PWM_PARAM, -1.0f, 1.0f, 0.0f, "Pulse width CV amount"); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; void addChannel(int c) override; void modulate() override; diff --git a/src/RGate.cpp b/src/RGate.cpp @@ -32,16 +32,16 @@ void RGate::sampleRateChange() { _sampleTime = APP->engine->getSampleTime(); } -json_t* RGate::toJson(json_t* root) { - root = OutputRangeModule<BGModule>::toJson(root); +json_t* RGate::saveToJson(json_t* root) { + root = OutputRangeModule<BGModule>::saveToJson(root); json_object_set_new(root, RESET_MODE, json_integer(_resetMode)); json_object_set_new(root, INITIAL_CLOCK_SECONDS, json_real(_initialClockPeriod)); json_object_set_new(root, POLY_INPUT, json_integer(_polyInputID)); return root; } -void RGate::fromJson(json_t* root) { - OutputRangeModule<BGModule>::fromJson(root); +void RGate::loadFromJson(json_t* root) { + OutputRangeModule<BGModule>::loadFromJson(root); json_t* rm = json_object_get(root, RESET_MODE); if (rm) { diff --git a/src/RGate.hpp b/src/RGate.hpp @@ -73,8 +73,8 @@ struct RGate : OutputRangeModule<BGModule> { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/Ranalyzer.cpp b/src/Ranalyzer.cpp @@ -43,7 +43,7 @@ void Ranalyzer::sampleRateChange() { } } -json_t* Ranalyzer::toJson(json_t* root) { +json_t* Ranalyzer::saveToJson(json_t* root) { frequencyPlotToJson(root); frequencyRangeToJson(root); amplitudePlotToJson(root); @@ -86,7 +86,7 @@ json_t* Ranalyzer::toJson(json_t* root) { return root; } -void Ranalyzer::fromJson(json_t* root) { +void Ranalyzer::loadFromJson(json_t* root) { frequencyPlotFromJson(root); frequencyRangeFromJson(root); amplitudePlotFromJson(root); diff --git a/src/Ranalyzer.hpp b/src/Ranalyzer.hpp @@ -135,8 +135,8 @@ struct Ranalyzer : AnalyzerBase { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void modulate() override; void processAll(const ProcessArgs& args) override; void setDisplayTraces(Traces traces); diff --git a/src/SampleHold.cpp b/src/SampleHold.cpp @@ -16,7 +16,7 @@ void SampleHold::reset() { } } -json_t* SampleHold::toJson(json_t* root) { +json_t* SampleHold::saveToJson(json_t* root) { json_object_set_new(root, POLY_INPUT, json_integer(_polyInputID)); json_object_set_new(root, NOISE_TYPE, json_integer((int)_noiseType)); json_object_set_new(root, RANGE_OFFSET, json_real(_rangeOffset)); @@ -25,7 +25,7 @@ json_t* SampleHold::toJson(json_t* root) { return root; } -void SampleHold::fromJson(json_t* root) { +void SampleHold::loadFromJson(json_t* root) { json_t* p = json_object_get(root, POLY_INPUT); if (p) { _polyInputID = json_integer_value(p); diff --git a/src/SampleHold.hpp b/src/SampleHold.hpp @@ -70,8 +70,8 @@ struct SampleHold : BGModule { } void reset() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void modulateChannel(int c) override; void processAll(const ProcessArgs& args) override; void handleChannel( diff --git a/src/Sine.cpp b/src/Sine.cpp @@ -5,16 +5,16 @@ #define FM_MODE "fm_mode" #define LINEAR_MODE "linear_mode" -json_t* Sine::toJson(json_t* root) { - root = VCOBase::toJson(root); +json_t* Sine::saveToJson(json_t* root) { + root = VCOBase::saveToJson(root); json_object_set_new(root, WAVE, json_integer((int)_wave)); json_object_set_new(root, FM_MODE, json_boolean(_fmLinearMode)); json_object_set_new(root, LINEAR_MODE, json_boolean(_linearMode)); return root; } -void Sine::fromJson(json_t* root) { - VCOBase::fromJson(root); +void Sine::loadFromJson(json_t* root) { + VCOBase::loadFromJson(root); json_t* w = json_object_get(root, WAVE); if (w) { diff --git a/src/Sine.hpp b/src/Sine.hpp @@ -58,8 +58,8 @@ struct Sine : VCOBase { configParam(PHASE_PARAM, -1.0f, 1.0f, 0.0f, "Phase offset", "ยบ", 0.0f, 180.0f); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; void modulate() override; void modulateChannel(int c) override; diff --git a/src/VCF.cpp b/src/VCF.cpp @@ -75,7 +75,7 @@ float VCF::Engine::next(float sample) { return _finalHP.next(out); } -json_t* VCF::toJson(json_t* root) { +json_t* VCF::saveToJson(json_t* root) { switch (_bandwidthMode) { case MultimodeFilter::LINEAR_BANDWIDTH_MODE: { json_object_set_new(root, BANDWIDTH_MODE_KEY, json_string(LINEAR_BANDWIDTH_MODE_KEY)); @@ -90,7 +90,7 @@ json_t* VCF::toJson(json_t* root) { return root; } -void VCF::fromJson(json_t* root) { +void VCF::loadFromJson(json_t* root) { json_t* bwm = json_object_get(root, BANDWIDTH_MODE_KEY); if (bwm) { if (strcmp(json_string_value(bwm), LINEAR_BANDWIDTH_MODE_KEY) == 0) { diff --git a/src/VCF.hpp b/src/VCF.hpp @@ -79,8 +79,8 @@ struct VCF : BGModule { configParam<ScaledSquaringParamQuantity<Engine::maxPoles - Engine::minPoles>>(SLOPE_PARAM, 0.0f, 1.0f, 0.522233f, "Slope", " poles", 0.0f, 1.0f, Engine::minPoles); } - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void sampleRateChange() override; bool active() override; int channels() override; diff --git a/src/Velo.cpp b/src/Velo.cpp @@ -15,12 +15,12 @@ void Velo::sampleRateChange() { } } -json_t* Velo::toJson(json_t* root) { +json_t* Velo::saveToJson(json_t* root) { json_object_set_new(root, LEVEL_SCALES_CV, json_boolean(_levelScalesCV)); return root; } -void Velo::fromJson(json_t* root) { +void Velo::loadFromJson(json_t* root) { json_t* s = json_object_get(root, LEVEL_SCALES_CV); if (s) { _levelScalesCV = json_boolean_value(s); diff --git a/src/Velo.hpp b/src/Velo.hpp @@ -53,8 +53,8 @@ struct Velo : BGModule { inline bool isLinear() { return params[LINEAR_PARAM].getValue() > 0.5f; } void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; void modulate() override; void processAll(const ProcessArgs& args) override; diff --git a/src/Walk.cpp b/src/Walk.cpp @@ -19,7 +19,7 @@ void Walk::sampleRateChange() { } } -json_t* Walk::toJson(json_t* root) { +json_t* Walk::saveToJson(json_t* root) { json_object_set_new(root, POLY_INPUT, json_integer(_polyInputID)); switch (_jumpMode) { case JUMP_JUMPMODE: { @@ -38,7 +38,7 @@ json_t* Walk::toJson(json_t* root) { return root; } -void Walk::fromJson(json_t* root) { +void Walk::loadFromJson(json_t* root) { json_t* p = json_object_get(root, POLY_INPUT); if (p) { _polyInputID = json_integer_value(p); diff --git a/src/Walk.hpp b/src/Walk.hpp @@ -55,8 +55,8 @@ struct Walk : BGModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; int channels() override; void modulateChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; diff --git a/src/Walk2.cpp b/src/Walk2.cpp @@ -15,14 +15,14 @@ void Walk2::sampleRateChange() { _historySteps = (historySeconds * APP->engine->getSampleRate()) / historyPoints; } -json_t* Walk2::toJson(json_t* root) { +json_t* Walk2::saveToJson(json_t* root) { json_object_set_new(root, ZOOM_OUT_KEY, json_boolean(_zoomOut)); json_object_set_new(root, GRID_KEY, json_boolean(_drawGrid)); json_object_set_new(root, COLOR_KEY, json_integer(_traceColor)); return root; } -void Walk2::fromJson(json_t* root) { +void Walk2::loadFromJson(json_t* root) { json_t* zo = json_object_get(root, ZOOM_OUT_KEY); if (zo) { _zoomOut = json_is_true(zo); diff --git a/src/Walk2.hpp b/src/Walk2.hpp @@ -93,8 +93,8 @@ struct Walk2 : BGModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void modulate() override; void processAlways(const ProcessArgs& args) override; void processAll(const ProcessArgs& args) override; diff --git a/src/XCO.cpp b/src/XCO.cpp @@ -58,12 +58,12 @@ void XCO::sampleRateChange() { } } -json_t* XCO::toJson(json_t* root) { +json_t* XCO::saveToJson(json_t* root) { json_object_set_new(root, DC_CORRECTION, json_boolean(_dcCorrection)); return root; } -void XCO::fromJson(json_t* root) { +void XCO::loadFromJson(json_t* root) { json_t* dc = json_object_get(root, DC_CORRECTION); if (dc) { _dcCorrection = json_boolean_value(dc); diff --git a/src/XCO.hpp b/src/XCO.hpp @@ -153,8 +153,8 @@ struct XCO : BGModule { void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; bool active() override; int channels() override; void addChannel(int c) override; diff --git a/src/addressable_sequence.cpp b/src/addressable_sequence.cpp @@ -31,7 +31,7 @@ void AddressableSequenceModule::sampleRateChange() { } } -json_t* AddressableSequenceModule::toJson(json_t* root) { +json_t* AddressableSequenceModule::saveToJson(json_t* root) { json_object_set_new(root, POLY_INPUT, json_integer(_polyInputID)); json_object_set_new(root, SELECT_ON_CLOCK, json_boolean(_selectOnClock)); json_object_set_new(root, TRIGGERED_SELECT, json_boolean(_triggeredSelect)); @@ -40,7 +40,7 @@ json_t* AddressableSequenceModule::toJson(json_t* root) { return root; } -void AddressableSequenceModule::fromJson(json_t* root) { +void AddressableSequenceModule::loadFromJson(json_t* root) { json_t* p = json_object_get(root, POLY_INPUT); if (p) { _polyInputID = json_integer_value(p); diff --git a/src/addressable_sequence.hpp b/src/addressable_sequence.hpp @@ -27,8 +27,8 @@ struct AddressableSequenceModule : BGModule { void setInputIDs(int clockInputID, int selectInputID); void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; int channels() override; int nextStep( int c, diff --git a/src/disable_output_limit.cpp b/src/disable_output_limit.cpp @@ -3,12 +3,12 @@ #define DISABLE_OUTPUT_LIMIT "disableOutputLimit" -json_t* DisableOutputLimitModule::toJson(json_t* root) { +json_t* DisableOutputLimitModule::saveToJson(json_t* root) { json_object_set_new(root, DISABLE_OUTPUT_LIMIT, json_boolean(_disableOutputLimit)); return root; } -void DisableOutputLimitModule::fromJson(json_t* root) { +void DisableOutputLimitModule::loadFromJson(json_t* root) { json_t* dol = json_object_get(root, DISABLE_OUTPUT_LIMIT); if (dol) { _disableOutputLimit = json_is_true(dol); diff --git a/src/disable_output_limit.hpp b/src/disable_output_limit.hpp @@ -7,8 +7,8 @@ namespace bogaudio { struct DisableOutputLimitModule : BGModule { bool _disableOutputLimit = false; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; }; struct DisableOutputLimitModuleWidget : BGModuleWidget { diff --git a/src/lpg_common.cpp b/src/lpg_common.cpp @@ -7,7 +7,7 @@ #define SHAPE_MODE_ON "on" #define SHAPE_MODE_INVERTED "inverted" -json_t* LPGEnvBaseModule::toJson(json_t* root) { +json_t* LPGEnvBaseModule::saveToJson(json_t* root) { switch (_riseShapeMode) { case RiseFallShapedSlewLimiter::OFF_SCVM: { json_object_set_new(root, RISE_SHAPE_MODE, json_string(SHAPE_MODE_OFF)); @@ -41,7 +41,7 @@ json_t* LPGEnvBaseModule::toJson(json_t* root) { return root; } -void LPGEnvBaseModule::fromJson(json_t* root) { +void LPGEnvBaseModule::loadFromJson(json_t* root) { json_t* rsm = json_object_get(root, RISE_SHAPE_MODE); if (rsm) { std::string s = json_string_value(rsm); diff --git a/src/lpg_common.hpp b/src/lpg_common.hpp @@ -17,8 +17,8 @@ struct LPGEnvBaseModule : BGModule { , _longTimeScale(longTimeScale) {} - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void modulate() override; }; diff --git a/src/matrix_base.cpp b/src/matrix_base.cpp @@ -9,14 +9,14 @@ using namespace bogaudio::dsp; #define INPUT_GAIN_DB "input_gain_db" #define SUM "sum" -json_t* MatrixBaseModule::toJson(json_t* root) { +json_t* MatrixBaseModule::saveToJson(json_t* root) { json_object_set_new(root, CLIPPING_MODE, json_integer(_clippingMode)); json_object_set_new(root, INPUT_GAIN_DB, json_real(_inputGainDb)); json_object_set_new(root, SUM, json_boolean(_sum)); return root; } -void MatrixBaseModule::fromJson(json_t* root) { +void MatrixBaseModule::loadFromJson(json_t* root) { json_t* c = json_object_get(root, CLIPPING_MODE); if (c) { _clippingMode = (Clipping)json_integer_value(c); @@ -179,15 +179,15 @@ void MatrixModuleWidget::contextMenu(Menu* menu) { #define INDICATOR_KNOBS "indicator_knobs" #define UNIPOLAR "unipolar" -json_t* KnobMatrixModule::toJson(json_t* root) { - root = MatrixBaseModule::toJson(root); +json_t* KnobMatrixModule::saveToJson(json_t* root) { + root = MatrixBaseModule::saveToJson(root); json_object_set_new(root, INDICATOR_KNOBS, json_boolean(_indicatorKnobs)); json_object_set_new(root, UNIPOLAR, json_boolean(_unipolar)); return root; } -void KnobMatrixModule::fromJson(json_t* root) { - MatrixBaseModule::fromJson(root); +void KnobMatrixModule::loadFromJson(json_t* root) { + MatrixBaseModule::loadFromJson(root); json_t* k = json_object_get(root, INDICATOR_KNOBS); if (k) { @@ -256,8 +256,8 @@ void KnobMatrixModuleWidget::contextMenu(Menu* menu) { #define ROW_EXCLUSIVE "row_exclusive" #define COLUMN_EXCLUSIVE "column_exclusive" -json_t* SwitchMatrixModule::toJson(json_t* root) { - root = MatrixBaseModule::toJson(root); +json_t* SwitchMatrixModule::saveToJson(json_t* root) { + root = MatrixBaseModule::saveToJson(root); switch (_inverting) { case CLICK_INVERTING: { @@ -280,8 +280,8 @@ json_t* SwitchMatrixModule::toJson(json_t* root) { return root; } -void SwitchMatrixModule::fromJson(json_t* root) { - MatrixBaseModule::fromJson(root); +void SwitchMatrixModule::loadFromJson(json_t* root) { + MatrixBaseModule::loadFromJson(root); json_t* i = json_object_get(root, INVERTING); if (i) { @@ -428,12 +428,12 @@ void SwitchMatrixModuleWidget::contextMenu(Menu* menu) { #define SOLO_BY_COLUMNS "solo_by_columns" -json_t* MutesMatrixExpanderModule::toJson(json_t* root) { +json_t* MutesMatrixExpanderModule::saveToJson(json_t* root) { json_object_set_new(root, SOLO_BY_COLUMNS, json_boolean(_soloByColumns)); return root; } -void MutesMatrixExpanderModule::fromJson(json_t* root) { +void MutesMatrixExpanderModule::loadFromJson(json_t* root) { json_t* sbc = json_object_get(root, SOLO_BY_COLUMNS); if (sbc) { _soloByColumns = json_is_true(sbc); diff --git a/src/matrix_base.hpp b/src/matrix_base.hpp @@ -20,8 +20,8 @@ struct MatrixBaseModule : BGModule { float _inputGainLevel = 1.0f; bool _sum = true; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void modulate() override; }; @@ -80,8 +80,8 @@ struct KnobMatrixModule : MatrixModule { : MatrixModule(ins, outs, firstParamID, firstInputID, firstOutputID) {} - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void updateParamMinimumValues(); }; @@ -109,8 +109,8 @@ struct SwitchMatrixModule : MatrixModule { : MatrixModule(ins, outs, firstParamID, firstInputID, firstOutputID) {} - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; void setInverting(Inverting inverting); void configSwitchParam(int id, const char* label); void switchChanged(int id, float value); @@ -134,8 +134,8 @@ struct SwitchMatrixModuleWidget : MatrixModuleWidget { struct MutesMatrixExpanderModule : BGModule { bool _soloByColumns = false; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; }; struct MutesMatrixExpanderModuleWidget : BGModuleWidget { diff --git a/src/mixer.cpp b/src/mixer.cpp @@ -49,12 +49,12 @@ void MixerChannel::next(float sample, bool solo, int c, bool linearCV) { #define LINEAR_CV "linear_cv" -json_t* LinearCVMixerModule::toJson(json_t* root) { +json_t* LinearCVMixerModule::saveToJson(json_t* root) { json_object_set_new(root, LINEAR_CV, json_boolean(_linearCV)); return root; } -void LinearCVMixerModule::fromJson(json_t* root) { +void LinearCVMixerModule::loadFromJson(json_t* root) { json_t* l = json_object_get(root, LINEAR_CV); if (l) { _linearCV = json_boolean_value(l); @@ -71,14 +71,14 @@ void LinearCVMixerWidget::contextMenu(Menu* menu) { #define DIM_DB "dim_decibels" -json_t* DimmableMixerModule::toJson(json_t* root) { - root = LinearCVMixerModule::toJson(root); +json_t* DimmableMixerModule::saveToJson(json_t* root) { + root = LinearCVMixerModule::saveToJson(root); json_object_set_new(root, DIM_DB, json_real(_dimDb)); return root; } -void DimmableMixerModule::fromJson(json_t* root) { - LinearCVMixerModule::fromJson(root); +void DimmableMixerModule::loadFromJson(json_t* root) { + LinearCVMixerModule::loadFromJson(root); json_t* o = json_object_get(root, DIM_DB); if (o) { _dimDb = json_real_value(o); diff --git a/src/mixer.hpp b/src/mixer.hpp @@ -52,8 +52,8 @@ struct MixerChannel { struct LinearCVMixerModule : BGModule { bool _linearCV = false; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; }; struct LinearCVMixerWidget : BGModuleWidget { @@ -63,8 +63,8 @@ struct LinearCVMixerWidget : BGModuleWidget { struct DimmableMixerModule : LinearCVMixerModule { float _dimDb = 12.0f; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; }; struct DimmableMixerWidget : LinearCVMixerWidget { diff --git a/src/module.cpp b/src/module.cpp @@ -22,7 +22,7 @@ json_t* BGModule::dataToJson() { if (_skinnable && _skin != "default") { json_object_set_new(root, SKIN, json_string(_skin.c_str())); } - return toJson(root); + return saveToJson(root); } void BGModule::dataFromJson(json_t* root) { @@ -36,7 +36,7 @@ void BGModule::dataFromJson(json_t* root) { } } - fromJson(root); + loadFromJson(root); } void BGModule::process(const ProcessArgs& args) { diff --git a/src/module.hpp b/src/module.hpp @@ -43,8 +43,8 @@ struct BGModule : Module { virtual void reset() {} virtual void sampleRateChange() {} - virtual json_t* toJson(json_t* root) { return root; } - virtual void fromJson(json_t* root) {} + virtual json_t* saveToJson(json_t* root) { return root; } + virtual void loadFromJson(json_t* root) {} virtual bool active() { return true; } virtual int channels() { return 1; } virtual void channelsChanged(int before, int after) {} diff --git a/src/output_range.hpp b/src/output_range.hpp @@ -18,15 +18,15 @@ struct OutputRange { template<class BASE> struct OutputRangeModule : BASE, OutputRange { - json_t* toJson(json_t* root) override { - root = BASE::toJson(root); + json_t* saveToJson(json_t* root) override { + root = BASE::saveToJson(root); json_object_set_new(root, "range_offset", json_real(_rangeOffset)); json_object_set_new(root, "range_scale", json_real(_rangeScale)); return root; } - void fromJson(json_t* root) override { - BASE::fromJson(root); + void loadFromJson(json_t* root) override { + BASE::loadFromJson(root); json_t* ro = json_object_get(root, "range_offset"); if (ro) { diff --git a/src/parametric_eq.cpp b/src/parametric_eq.cpp @@ -130,12 +130,12 @@ float PEQXFBase::scaleEF(float ef, float frequency, float bandwidth) { #define BAND_EXCLUDE "band_exclude" -json_t* BandExcludeModule::toJson(json_t* root) { +json_t* BandExcludeModule::saveToJson(json_t* root) { json_object_set_new(root, BAND_EXCLUDE, json_boolean(_bandExclude)); return root; } -void BandExcludeModule::fromJson(json_t* root) { +void BandExcludeModule::loadFromJson(json_t* root) { json_t* be = json_object_get(root, BAND_EXCLUDE); if (be) { _bandExclude = json_is_true(be); diff --git a/src/parametric_eq.hpp b/src/parametric_eq.hpp @@ -152,8 +152,8 @@ struct PEQXFBase : FollowerBase { struct BandExcludeModule : BGModule { bool _bandExclude = false; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; }; struct BandExcludeModuleWidget : BGModuleWidget { diff --git a/src/poly_channels.cpp b/src/poly_channels.cpp @@ -5,12 +5,12 @@ using namespace bogaudio; #define POLY_CHANNELS "poly_channels" -json_t* PolyChannelsModule::toJson(json_t* root) { +json_t* PolyChannelsModule::saveToJson(json_t* root) { json_object_set_new(root, POLY_CHANNELS, json_integer(_polyChannels)); return root; } -void PolyChannelsModule::fromJson(json_t* root) { +void PolyChannelsModule::loadFromJson(json_t* root) { json_t* pc = json_object_get(root, POLY_CHANNELS); if (!pc) { pc = json_object_get(root, "noise_channels"); // backward compatibility hack. diff --git a/src/poly_channels.hpp b/src/poly_channels.hpp @@ -9,8 +9,8 @@ namespace bogaudio { struct PolyChannelsModule : BGModule { int _polyChannels = 1; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; }; struct PolyChannelsMenuItem : MenuItem { diff --git a/src/save_latch_to_patch.cpp b/src/save_latch_to_patch.cpp @@ -3,7 +3,7 @@ #define SAVE_LATCHED_TO_PATCH "save_latched_to_patch" #define LATCHED_STATE "latched_state" -json_t* SaveLatchToPatchModule::toJson(json_t* root) { +json_t* SaveLatchToPatchModule::saveToJson(json_t* root) { json_object_set_new(root, SAVE_LATCHED_TO_PATCH, json_boolean(_saveLatchedToPatch)); if (_saveLatchedToPatch && _latch) { json_t* a = json_array(); @@ -15,7 +15,7 @@ json_t* SaveLatchToPatchModule::toJson(json_t* root) { return root; } -void SaveLatchToPatchModule::fromJson(json_t* root) { +void SaveLatchToPatchModule::loadFromJson(json_t* root) { json_t* sl = json_object_get(root, SAVE_LATCHED_TO_PATCH); if (sl) { _saveLatchedToPatch = json_is_true(sl); diff --git a/src/save_latch_to_patch.hpp b/src/save_latch_to_patch.hpp @@ -11,8 +11,8 @@ struct SaveLatchToPatchModule : BGModule { bool _latchedHigh[maxChannels] {}; bool _latch = false; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; }; struct SaveLatchToPatchModuleWidget : BGModuleWidget { diff --git a/src/trigger_on_load.cpp b/src/trigger_on_load.cpp @@ -6,13 +6,13 @@ using namespace bogaudio; #define TRIGGER_ON_LOAD "triggerOnLoad" #define SHOULD_TRIGGER_ON_LOAD "shouldTriggerOnLoad" -json_t* TriggerOnLoadModule::toJson(json_t* root) { +json_t* TriggerOnLoadModule::saveToJson(json_t* root) { json_object_set_new(root, TRIGGER_ON_LOAD, json_boolean(_triggerOnLoad)); json_object_set_new(root, SHOULD_TRIGGER_ON_LOAD, json_boolean(shouldTriggerOnNextLoad())); return root; } -void TriggerOnLoadModule::fromJson(json_t* root) { +void TriggerOnLoadModule::loadFromJson(json_t* root) { json_t* tol = json_object_get(root, TRIGGER_ON_LOAD); if (tol) { _triggerOnLoad = json_is_true(tol); diff --git a/src/trigger_on_load.hpp b/src/trigger_on_load.hpp @@ -10,8 +10,8 @@ struct TriggerOnLoadModule : BGModule { bool _triggerOnLoad = true; bool _shouldTriggerOnLoad = true; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; virtual bool shouldTriggerOnNextLoad() = 0; }; diff --git a/src/vco_base.cpp b/src/vco_base.cpp @@ -76,13 +76,13 @@ void VCOBase::sampleRateChange() { } } -json_t* VCOBase::toJson(json_t* root) { +json_t* VCOBase::saveToJson(json_t* root) { json_object_set_new(root, POLY_INPUT, json_integer(_polyInputID)); json_object_set_new(root, DC_CORRECTION, json_boolean(_dcCorrection)); return root; } -void VCOBase::fromJson(json_t* root) { +void VCOBase::loadFromJson(json_t* root) { json_t* p = json_object_get(root, POLY_INPUT); if (p) { _polyInputID = json_integer_value(p); diff --git a/src/vco_base.hpp b/src/vco_base.hpp @@ -84,8 +84,8 @@ struct VCOBase : BGModule { inline float linearModeVoltsToHertz(float v) { return _slowMode ? v : 1000.0f * v; } void reset() override; void sampleRateChange() override; - json_t* toJson(json_t* root) override; - void fromJson(json_t* root) override; + json_t* saveToJson(json_t* root) override; + void loadFromJson(json_t* root) override; int channels() override; void addChannel(int c) override; void removeChannel(int c) override;