diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-07-28 15:25:44 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-07-28 15:25:44 +1000 |
| commit | 97bd3be892ce549dac8e0b9930607a282701653e (patch) | |
| tree | 3333f4db866753999298c9560e80f83b8337b519 /src/audio | |
| parent | 9d33c33c8d669b787acd74bd5b9c7ff4c09338db (diff) | |
| download | tangara-fw-97bd3be892ce549dac8e0b9930607a282701653e.tar.gz | |
clang-format
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/audio_task.cpp | 6 | ||||
| -rw-r--r-- | src/audio/i2s_audio_output.cpp | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/audio/audio_task.cpp b/src/audio/audio_task.cpp index 751366c1..ca6a3824 100644 --- a/src/audio/audio_task.cpp +++ b/src/audio/audio_task.cpp @@ -81,10 +81,8 @@ auto Timer::AddBytes(std::size_t bytes) -> void { total_duration_seconds_ = current_seconds_; } - PlaybackUpdate ev{ - .seconds_elapsed = current_seconds_, - .seconds_total = total_duration_seconds_ - }; + PlaybackUpdate ev{.seconds_elapsed = current_seconds_, + .seconds_total = total_duration_seconds_}; events::Audio().Dispatch(ev); events::Ui().Dispatch(ev); } diff --git a/src/audio/i2s_audio_output.cpp b/src/audio/i2s_audio_output.cpp index 5873d80f..bb413b38 100644 --- a/src/audio/i2s_audio_output.cpp +++ b/src/audio/i2s_audio_output.cpp @@ -48,7 +48,7 @@ I2SAudioOutput::I2SAudioOutput(drivers::IGpios* expander, current_config_(), left_difference_(0), current_volume_(kDefaultVolume), - max_volume_(kLineLevelVolume){ + max_volume_(kLineLevelVolume) { SetVolume(GetVolume()); dac_->SetSource(stream()); } @@ -82,13 +82,13 @@ auto I2SAudioOutput::SetVolume(uint_fast8_t percent) -> void { using drivers::wm8523::Register; drivers::wm8523::WriteRegister(Register::kDacGainLeft, left); - drivers::wm8523::WriteRegister(Register::kDacGainRight, current_volume_ | 0x200); + drivers::wm8523::WriteRegister(Register::kDacGainRight, + current_volume_ | 0x200); } auto I2SAudioOutput::GetVolume() -> uint_fast8_t { - return - static_cast<uint_fast8_t>( - static_cast<float>(current_volume_) / max_volume_ * 100.0f); + return static_cast<uint_fast8_t>(static_cast<float>(current_volume_) / + max_volume_ * 100.0f); } auto I2SAudioOutput::AdjustVolumeUp() -> bool { |