diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-09-26 21:07:44 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-09-26 21:07:44 +1000 |
| commit | 252f685ef1502016ed00be4eeaa4a217386fbce0 (patch) | |
| tree | 9b797795913c61c6b6c9f77e79e4a62419883f7b /src/audio/audio_fsm.cpp | |
| parent | 96252973d9b142632b7c54f825ce1de2127754bd (diff) | |
| download | tangara-fw-252f685ef1502016ed00be4eeaa4a217386fbce0.tar.gz | |
Make NVS access synchronous again
Everything relevant is back in internal ram, and likely to stay there.
Diffstat (limited to 'src/audio/audio_fsm.cpp')
| -rw-r--r-- | src/audio/audio_fsm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio/audio_fsm.cpp b/src/audio/audio_fsm.cpp index 1b6b6cc8..6ea4f60d 100644 --- a/src/audio/audio_fsm.cpp +++ b/src/audio/audio_fsm.cpp @@ -83,7 +83,7 @@ void AudioState::react(const OutputModeChanged& ev) { // TODO: handle SetInUse ESP_LOGI(kTag, "output mode changed"); auto new_mode = sServices->nvs().OutputMode(); - switch (new_mode.get()) { + switch (new_mode) { case drivers::NvsStorage::Output::kBluetooth: sOutput = sBtOutput; break; @@ -118,10 +118,10 @@ void Uninitialised::react(const system_fsm::BootComplete& ev) { sBtOutput.reset(new BluetoothAudioOutput(stream, sServices->bluetooth())); auto& nvs = sServices->nvs(); - sI2SOutput->SetMaxVolume(nvs.AmpMaxVolume().get()); - sI2SOutput->SetVolumeDb(nvs.AmpCurrentVolume().get()); + sI2SOutput->SetMaxVolume(nvs.AmpMaxVolume()); + sI2SOutput->SetVolumeDb(nvs.AmpCurrentVolume()); - if (sServices->nvs().OutputMode().get() == + if (sServices->nvs().OutputMode() == drivers::NvsStorage::Output::kHeadphones) { sOutput = sI2SOutput; } else { |