From 320fdeb9d8355d3c361d5c6d60de8afc64501af9 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 30 Aug 2023 16:48:10 +1000 Subject: Use a service locator instead of passing around subsets of drivers between FSMs --- src/audio/i2s_audio_output.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/audio/i2s_audio_output.cpp') diff --git a/src/audio/i2s_audio_output.cpp b/src/audio/i2s_audio_output.cpp index 359cd4c6..927f6541 100644 --- a/src/audio/i2s_audio_output.cpp +++ b/src/audio/i2s_audio_output.cpp @@ -41,11 +41,11 @@ static constexpr uint16_t kDefaultVolume = 0x100; static constexpr size_t kDrainBufferSize = 8 * 1024; -I2SAudioOutput::I2SAudioOutput(drivers::IGpios* expander, - std::weak_ptr dac) +I2SAudioOutput::I2SAudioOutput(drivers::IGpios& expander, + std::unique_ptr dac) : IAudioOutput(kDrainBufferSize, MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT), expander_(expander), - dac_(dac.lock()), + dac_(std::move(dac)), current_config_(), left_difference_(0), current_volume_(kDefaultVolume), -- cgit v1.2.3