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/ui/screen_playing.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ui/screen_playing.cpp') diff --git a/src/ui/screen_playing.cpp b/src/ui/screen_playing.cpp index 7538d093..2eb4e09e 100644 --- a/src/ui/screen_playing.cpp +++ b/src/ui/screen_playing.cpp @@ -104,7 +104,7 @@ auto Playing::next_up_label(lv_obj_t* parent, const std::string& text) return button; } -Playing::Playing(std::weak_ptr db, audio::TrackQueue* queue) +Playing::Playing(std::weak_ptr db, audio::TrackQueue& queue) : db_(db), queue_(queue), track_(), @@ -204,7 +204,7 @@ Playing::Playing(std::weak_ptr db, audio::TrackQueue* queue) Playing::~Playing() {} auto Playing::OnTrackUpdate() -> void { - auto current = queue_->GetCurrent(); + auto current = queue_.GetCurrent(); if (!current) { return; } @@ -230,7 +230,7 @@ auto Playing::OnPlaybackUpdate(uint32_t pos_seconds, uint32_t new_duration) auto Playing::OnQueueUpdate() -> void { OnTrackUpdate(); - auto current = queue_->GetUpcoming(kMaxUpcoming); + auto current = queue_.GetUpcoming(kMaxUpcoming); auto db = db_.lock(); if (!db) { return; -- cgit v1.2.3