Cache pending nvs writes in memory

Includes refactoring nvs settings to be a bit less duplicated

1 files changed, 2 insertions, 5 deletions

diff --git a/src/audio/audio_fsm.cpp b/src/audio/audio_fsm.cpp
index 95abfa2a..ba6e5ffe 100644
--- a/src/audio/audio_fsm.cpp
+++ b/src/audio/audio_fsm.cpp
@@ -60,8 +60,7 @@ void AudioState::react(const system_fsm::BluetoothEvent& ev) {
   if (!dev) {
     return;
   }
-  auto vols = sServices->nvs().BluetoothVolumes();
-  sBtOutput->SetVolume(vols.Get(dev->mac).value_or(10));
+  sBtOutput->SetVolume(sServices->nvs().BluetoothVolume(dev->mac));
   events::Ui().Dispatch(VolumeChanged{
       .percent = sOutput->GetVolumePct(),
       .db = sOutput->GetVolumeDb(),
@@ -170,9 +169,7 @@ auto AudioState::commitVolume() -> void {
     if (!dev) {
       return;
     }
-    auto vols = sServices->nvs().BluetoothVolumes();
-    vols.Put(dev->mac, vol);
-    sServices->nvs().BluetoothVolumes(vols);
+    sServices->nvs().BluetoothVolume(dev->mac, vol);
   }
 }