From 7772a225b8428521534b012000725d65ce910796 Mon Sep 17 00:00:00 2001 From: Robin Davies Date: Tue, 8 Oct 2024 05:05:24 -0400 Subject: [PATCH] Write some config files in human-readable form. --- PiPedalCommon/src/WifiConfigSettings.cpp | 2 +- react/CMakeLists.txt | 11 +++++++++-- react/tmp.txt | 9 ++++++++- src/Storage.cpp | 6 +++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/PiPedalCommon/src/WifiConfigSettings.cpp b/PiPedalCommon/src/WifiConfigSettings.cpp index 9cce565..ddeb005 100644 --- a/PiPedalCommon/src/WifiConfigSettings.cpp +++ b/PiPedalCommon/src/WifiConfigSettings.cpp @@ -168,7 +168,7 @@ void WifiConfigSettings::Save() { ofstream_synced f; openWithPerms(f,CONFIG_PATH); - json_writer writer(f); + json_writer writer(f,false); writer.write(&newSettings); } catch (const std::exception &e) diff --git a/react/CMakeLists.txt b/react/CMakeLists.txt index d69c08b..2c84502 100644 --- a/react/CMakeLists.txt +++ b/react/CMakeLists.txt @@ -33,6 +33,8 @@ add_custom_command( src/AlsaMidiDeviceInfo.tsx src/WifiDirectConfigSettings.tsx src/WifiConfigSettings.tsx + src/SnapshotButton.tsx + src/WindowScale.tsx src/JsonAtom.tsx src/PiPedalSocket.tsx src/TemporaryDrawer.tsx @@ -43,6 +45,7 @@ add_custom_command( src/SettingsDialog.tsx src/PedalboardView.tsx src/reportWebVitals.ts + src/OptionsDialog.tsx src/SelectChannelsDialog.tsx src/PluginPresetSelector.tsx src/VuMeter.tsx @@ -122,6 +125,7 @@ add_custom_command( src/svg/fx_utility.svg src/Updater.tsx src/UploadPresetDialog.tsx + src/RadioSelectDialog.tsx src/setupTests.ts src/ToobCabSimView.tsx src/RenameDialog.tsx @@ -140,6 +144,7 @@ add_custom_command( src/Draggable.tsx src/PluginIcon.tsx src/react-app-env.d.ts + src/TextFieldEx.tsx src/FilePropertyDialog.tsx src/FilePropertyDirectoryTree.tsx src/StringBuilder.tsx @@ -150,7 +155,6 @@ add_custom_command( src/ToobSpectrumResponseView.tsx src/PerformanceView.tsx src/JackServerSettingsDialog.tsx - src/ListSelectDialog.tsx src/Utility.tsx src/JackStatusView.tsx src/ToobSpectrumAnalyzerView.tsx @@ -160,6 +164,7 @@ add_custom_command( src/WifiChannel.tsx src/AboutDialog.tsx src/GxTunerControl.tsx + src/VirtualKeyboardHandler.tsx src/PluginControl.tsx src/LoadPluginDialog.tsx src/ZoomedUiControl.tsx @@ -175,8 +180,10 @@ add_custom_command( src/SnapshotPanel.tsx src/ToobMLView.tsx src/WifiConfigDialog.tsx + src/Rectangle.tsx src/SnapshotColors.tsx src/PiPedalModel.tsx + src/ObservableEvent.tsx src/JackHostStatus.tsx src/index.tsx src/FilePropertyControl.tsx @@ -192,7 +199,7 @@ add_custom_command( src/SnapshotPropertiesDialog.tsx src/SearchControl.tsx src/Units.tsx - + ) add_custom_target ( diff --git a/react/tmp.txt b/react/tmp.txt index c984400..3a7e78a 100644 --- a/react/tmp.txt +++ b/react/tmp.txt @@ -10,6 +10,8 @@ src/SelectMidiChannelsDialog.tsx src/AlsaMidiDeviceInfo.tsx src/WifiDirectConfigSettings.tsx src/WifiConfigSettings.tsx +src/SnapshotButton.tsx +src/WindowScale.tsx src/JsonAtom.tsx src/PiPedalSocket.tsx src/TemporaryDrawer.tsx @@ -20,6 +22,7 @@ src/SnapshotDialog.tsx src/SettingsDialog.tsx src/PedalboardView.tsx src/reportWebVitals.ts +src/OptionsDialog.tsx src/SelectChannelsDialog.tsx src/PluginPresetSelector.tsx src/VuMeter.tsx @@ -99,6 +102,7 @@ src/svg/fx_mixer.svg src/svg/fx_utility.svg src/Updater.tsx src/UploadPresetDialog.tsx +src/RadioSelectDialog.tsx src/setupTests.ts src/ToobCabSimView.tsx src/RenameDialog.tsx @@ -117,6 +121,7 @@ src/Pedal.tsx src/Draggable.tsx src/PluginIcon.tsx src/react-app-env.d.ts +src/TextFieldEx.tsx src/FilePropertyDialog.tsx src/FilePropertyDirectoryTree.tsx src/StringBuilder.tsx @@ -127,7 +132,6 @@ src/Lv2Plugin.tsx src/ToobSpectrumResponseView.tsx src/PerformanceView.tsx src/JackServerSettingsDialog.tsx -src/ListSelectDialog.tsx src/Utility.tsx src/JackStatusView.tsx src/ToobSpectrumAnalyzerView.tsx @@ -137,6 +141,7 @@ src/PresetDialog.tsx src/WifiChannel.tsx src/AboutDialog.tsx src/GxTunerControl.tsx +src/VirtualKeyboardHandler.tsx src/PluginControl.tsx src/LoadPluginDialog.tsx src/ZoomedUiControl.tsx @@ -152,8 +157,10 @@ src/AndroidHost.tsx src/SnapshotPanel.tsx src/ToobMLView.tsx src/WifiConfigDialog.tsx +src/Rectangle.tsx src/SnapshotColors.tsx src/PiPedalModel.tsx +src/ObservableEvent.tsx src/JackHostStatus.tsx src/index.tsx src/FilePropertyControl.tsx diff --git a/src/Storage.cpp b/src/Storage.cpp index c0539fb..da9ff06 100644 --- a/src/Storage.cpp +++ b/src/Storage.cpp @@ -722,7 +722,7 @@ void Storage::SaveChannelSelection() try { pipedal::ofstream_synced s(fileName); - json_writer writer(s, true); + json_writer writer(s, false); writer.write(this->jackChannelSelection); } catch (const std::exception &e) @@ -933,7 +933,7 @@ void Storage::SaveUserSettings() { throw PiPedalException("Unable to write to " + ((std::string)path)); } - json_writer writer(f, true); + json_writer writer(f, false); writer.write(userSettings); } } @@ -1399,7 +1399,7 @@ void Storage::SetJackServerSettings(const pipedal::JackServerSettings &jackConfi f.open(fileName); if (f.is_open()) { - json_writer writer(f, true); + json_writer writer(f, false); writer.write(jackConfiguration); } #if JACK_HOST