From 0bb12912bc185d78114ccebb5d6e7aae67cb1728 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Tue, 6 Feb 2024 13:36:37 +1100 Subject: Implement basic volume control for bt outputs --- src/audio/bt_audio_output.cpp | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'src/audio/bt_audio_output.cpp') diff --git a/src/audio/bt_audio_output.cpp b/src/audio/bt_audio_output.cpp index 0c11481b..41c89069 100644 --- a/src/audio/bt_audio_output.cpp +++ b/src/audio/bt_audio_output.cpp @@ -21,6 +21,7 @@ #include "i2c.hpp" #include "i2s_dac.hpp" #include "result.hpp" +#include "tasks.hpp" #include "wm8523.hpp" [[maybe_unused]] static const char* kTag = "BTOUT"; @@ -28,8 +29,9 @@ namespace audio { BluetoothAudioOutput::BluetoothAudioOutput(StreamBufferHandle_t s, - drivers::Bluetooth& bt) - : IAudioOutput(s), bluetooth_(bt) {} + drivers::Bluetooth& bt, + tasks::WorkerPool& p) + : IAudioOutput(s), bluetooth_(bt), bg_worker_(p), volume_(10) {} BluetoothAudioOutput::~BluetoothAudioOutput() {} @@ -43,14 +45,16 @@ auto BluetoothAudioOutput::SetMode(Modes mode) -> void { auto BluetoothAudioOutput::SetVolumeImbalance(int_fast8_t balance) -> void {} -auto BluetoothAudioOutput::SetVolume(uint16_t) -> void {} +auto BluetoothAudioOutput::SetVolume(uint16_t v) -> void { + volume_ = std::clamp(v, 0, 0x7f); +} auto BluetoothAudioOutput::GetVolume() -> uint16_t { - return 0; + return volume_; } auto BluetoothAudioOutput::GetVolumePct() -> uint_fast8_t { - return 0; + return static_cast(static_cast(volume_) * 100 / 0x7f); } auto BluetoothAudioOutput::GetVolumeDb() -> int_fast16_t { @@ -58,11 +62,21 @@ auto BluetoothAudioOutput::GetVolumeDb() -> int_fast16_t { } auto BluetoothAudioOutput::AdjustVolumeUp() -> bool { - return false; + if (volume_ == 0x7f) { + return false; + } + volume_++; + bg_worker_.Dispatch([&]() { bluetooth_.SetVolume(volume_); }); + return true; } auto BluetoothAudioOutput::AdjustVolumeDown() -> bool { - return false; + if (volume_ == 0) { + return false; + } + volume_--; + bg_worker_.Dispatch([&]() { bluetooth_.SetVolume(volume_); }); + return true; } auto BluetoothAudioOutput::PrepareFormat(const Format& orig) -> Format { -- cgit v1.2.3