commit 7ac700c43078e79e18ab5f31671228c8ae84cc7d
parent ef58c42734591cb0928689515236fb8eff7ce135
Author: Matt Demanett <matt@demanett.net>
Date: Fri, 17 May 2019 22:26:27 -0400
v1: to/from json.
Diffstat:
22 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/AddrSeq.cpp b/src/AddrSeq.cpp
@@ -13,13 +13,13 @@ void AddrSeq::onSampleRateChange() {
_timer.setParams(engineGetSampleRate(), 0.001f);
}
-json_t* AddrSeq::toJson() {
+json_t* AddrSeq::dataToJson() {
json_t* root = json_object();
json_object_set_new(root, SELECT_ON_CLOCK, json_boolean(_selectOnClock));
return root;
}
-void AddrSeq::fromJson(json_t* root) {
+void AddrSeq::dataFromJson(json_t* root) {
json_t* s = json_object_get(root, SELECT_ON_CLOCK);
if (s) {
_selectOnClock = json_is_true(s);
diff --git a/src/AddrSeq.hpp b/src/AddrSeq.hpp
@@ -63,8 +63,8 @@ struct AddrSeq : Module {
void onReset() override;
void onSampleRateChange() override;
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
void step() override;
};
diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp
@@ -13,13 +13,13 @@ void Analyzer::onSampleRateChange() {
_core.resetChannels();
}
-json_t* Analyzer::toJson() {
+json_t* Analyzer::dataToJson() {
json_t* root = json_object();
json_object_set_new(root, RANGE_DB_KEY, json_real(_rangeDb));
return root;
}
-void Analyzer::fromJson(json_t* root) {
+void Analyzer::dataFromJson(json_t* root) {
json_t* jrd = json_object_get(root, RANGE_DB_KEY);
if (jrd) {
_rangeDb = clamp(json_real_value(jrd), 80.0f, 140.0f);
diff --git a/src/Analyzer.hpp b/src/Analyzer.hpp
@@ -57,8 +57,8 @@ struct Analyzer : AnalyzerBase {
void onReset() override;
void onSampleRateChange() override;
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
void step() override;
};
diff --git a/src/AnalyzerXL.cpp b/src/AnalyzerXL.cpp
@@ -46,7 +46,7 @@ void AnalyzerXL::setCoreParams() {
_core.setParams(averageN, _quality, _window);
}
-json_t* AnalyzerXL::toJson() {
+json_t* AnalyzerXL::dataToJson() {
json_t* root = json_object();
json_object_set_new(root, RANGE_KEY, json_real(_range));
json_object_set_new(root, RANGE_DB_KEY, json_real(_rangeDb));
@@ -82,7 +82,7 @@ json_t* AnalyzerXL::toJson() {
return root;
}
-void AnalyzerXL::fromJson(json_t* root) {
+void AnalyzerXL::dataFromJson(json_t* root) {
json_t* jr = json_object_get(root, RANGE_KEY);
if (jr) {
_range = clamp(json_real_value(jr), -0.9f, 0.8f);
diff --git a/src/AnalyzerXL.hpp b/src/AnalyzerXL.hpp
@@ -46,8 +46,8 @@ struct AnalyzerXL : AnalyzerBase {
void onReset() override;
void onSampleRateChange() override;
void setCoreParams();
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
void step() override;
};
diff --git a/src/EightOne.cpp b/src/EightOne.cpp
@@ -13,13 +13,13 @@ void EightOne::onSampleRateChange() {
_timer.setParams(engineGetSampleRate(), 0.001f);
}
-json_t* EightOne::toJson() {
+json_t* EightOne::dataToJson() {
json_t* root = json_object();
json_object_set_new(root, SELECT_ON_CLOCK, json_boolean(_selectOnClock));
return root;
}
-void EightOne::fromJson(json_t* root) {
+void EightOne::dataFromJson(json_t* root) {
json_t* s = json_object_get(root, SELECT_ON_CLOCK);
if (s) {
_selectOnClock = json_is_true(s);
diff --git a/src/EightOne.hpp b/src/EightOne.hpp
@@ -63,8 +63,8 @@ struct EightOne : Module {
void onReset() override;
void onSampleRateChange() override;
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
void step() override;
};
diff --git a/src/FMOp.cpp b/src/FMOp.cpp
@@ -23,13 +23,13 @@ void FMOp::onSampleRateChange() {
_sustainSL.setParams(sampleRate, 1.0f, 1.0f);
}
-json_t* FMOp::toJson() {
+json_t* FMOp::dataToJson() {
json_t* root = json_object();
json_object_set_new(root, LINEAR_LEVEL, json_boolean(_linearLevel));
return root;
}
-void FMOp::fromJson(json_t* root) {
+void FMOp::dataFromJson(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
@@ -90,8 +90,8 @@ struct FMOp : Module {
void onReset() override;
void onSampleRateChange() override;
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
void step() override;
};
diff --git a/src/OneEight.cpp b/src/OneEight.cpp
@@ -13,13 +13,13 @@ void OneEight::onSampleRateChange() {
_timer.setParams(engineGetSampleRate(), 0.001f);
}
-json_t* OneEight::toJson() {
+json_t* OneEight::dataToJson() {
json_t* root = json_object();
json_object_set_new(root, SELECT_ON_CLOCK, json_boolean(_selectOnClock));
return root;
}
-void OneEight::fromJson(json_t* root) {
+void OneEight::dataFromJson(json_t* root) {
json_t* s = json_object_get(root, SELECT_ON_CLOCK);
if (s) {
_selectOnClock = json_is_true(s);
diff --git a/src/OneEight.hpp b/src/OneEight.hpp
@@ -63,8 +63,8 @@ struct OneEight : Module {
void onReset() override;
void onSampleRateChange() override;
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
void step() override;
};
diff --git a/src/UMix.cpp b/src/UMix.cpp
@@ -4,14 +4,14 @@
#define SUM "sum"
#define CVMODE "cv_mode"
-json_t* UMix::toJson() {
+json_t* UMix::dataToJson() {
json_t* root = json_object();
json_object_set_new(root, SUM, json_boolean(_sum));
json_object_set_new(root, CVMODE, json_boolean(_cvMode));
return root;
}
-void UMix::fromJson(json_t* root) {
+void UMix::dataFromJson(json_t* root) {
json_t* s = json_object_get(root, SUM);
if (s) {
_sum = json_is_true(s);
diff --git a/src/UMix.hpp b/src/UMix.hpp
@@ -43,8 +43,8 @@ struct UMix : Module {
UMix() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {
}
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
void step() override;
};
diff --git a/src/Walk2.cpp b/src/Walk2.cpp
@@ -15,7 +15,7 @@ void Walk2::onSampleRateChange() {
_historySteps = (historySeconds * engineGetSampleRate()) / historyPoints;
}
-json_t* Walk2::toJson() {
+json_t* Walk2::dataToJson() {
json_t* root = json_object();
json_object_set_new(root, ZOOM_OUT_KEY, json_boolean(_zoomOut));
json_object_set_new(root, GRID_KEY, json_boolean(_drawGrid));
@@ -23,7 +23,7 @@ json_t* Walk2::toJson() {
return root;
}
-void Walk2::fromJson(json_t* root) {
+void Walk2::dataFromJson(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
@@ -84,8 +84,8 @@ struct Walk2 : Module {
void onReset() override;
void onSampleRateChange() override;
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
void step() override;
};
diff --git a/src/disable_output_limit.cpp b/src/disable_output_limit.cpp
@@ -3,13 +3,13 @@
#define DISABLE_OUTPUT_LIMIT "disableOutputLimit"
-json_t* DisableOutputLimitModule::toJson() {
+json_t* DisableOutputLimitModule::dataToJson() {
json_t* root = json_object();
json_object_set_new(root, DISABLE_OUTPUT_LIMIT, json_boolean(_disableOutputLimit));
return root;
}
-void DisableOutputLimitModule::fromJson(json_t* root) {
+void DisableOutputLimitModule::dataFromJson(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
@@ -12,8 +12,8 @@ struct DisableOutputLimitModule : Module {
{
}
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
};
struct DisableOutputLimitMenuItem : MenuItem {
diff --git a/src/lfo_base.cpp b/src/lfo_base.cpp
@@ -8,7 +8,7 @@
#define PITCH_MODE_VALUE_CLASSIC "classic"
#define PITCH_MODE_VALUE_COMPLIANT "compliant"
-json_t* LFOBase::toJson() {
+json_t* LFOBase::dataToJson() {
json_t* root = json_object();
switch (_pitchMode) {
case UNKNOWN_PITCH_MODE: {
@@ -26,7 +26,7 @@ json_t* LFOBase::toJson() {
return root;
}
-void LFOBase::fromJson(json_t* root) {
+void LFOBase::dataFromJson(json_t* root) {
json_t* pm = json_object_get(root, PITCH_MODE_KEY);
if (pm) {
if (0 == strncmp(json_string_value(pm), PITCH_MODE_VALUE_CLASSIC, strlen(PITCH_MODE_VALUE_CLASSIC))) {
diff --git a/src/lfo_base.hpp b/src/lfo_base.hpp
@@ -25,8 +25,8 @@ struct LFOBase : Module {
LFOBase(int np, int ni, int no, int nl) : Module(np, ni, no, nl) {}
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
bool isCompliantPitchMode() { return _pitchMode == COMPLIANT_PITCH_MODE; }
void setPitchMode(PitchMode mode);
void setPitchModeListener(PitchModeListener* listener) { _pitchModeListener = listener; }
diff --git a/src/trigger_on_load.cpp b/src/trigger_on_load.cpp
@@ -6,14 +6,14 @@ using namespace bogaudio;
#define TRIGGER_ON_LOAD "triggerOnLoad"
#define SHOULD_TRIGGER_ON_LOAD "shouldTriggerOnLoad"
-json_t* TriggerOnLoadModule::toJson() {
+json_t* TriggerOnLoadModule::dataToJson() {
json_t* root = json_object();
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::dataFromJson(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
@@ -16,8 +16,8 @@ struct TriggerOnLoadModule : Module {
{
}
- json_t* toJson() override;
- void fromJson(json_t* root) override;
+ json_t* dataToJson() override;
+ void dataFromJson(json_t* root) override;
virtual bool shouldTriggerOnNextLoad() = 0;
};
