From 320fdeb9d8355d3c361d5c6d60de8afc64501af9 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Wed, 30 Aug 2023 16:48:10 +1000
Subject: Use a service locator instead of passing around subsets of drivers
 between FSMs

---
 src/database/include/database.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/database/include/database.hpp')

diff --git a/src/database/include/database.hpp b/src/database/include/database.hpp
index dd6bd7cc..559405cb 100644
--- a/src/database/include/database.hpp
+++ b/src/database/include/database.hpp
@@ -91,7 +91,7 @@ class Database {
     ALREADY_OPEN,
     FAILED_TO_OPEN,
   };
-  static auto Open(IFileGatherer* file_gatherer, ITagParser* tag_parser)
+  static auto Open(IFileGatherer& file_gatherer, ITagParser& tag_parser)
       -> cpp::result<Database*, DatabaseError>;
   static auto Open() -> cpp::result<Database*, DatabaseError>;
 
@@ -133,13 +133,13 @@ class Database {
   std::shared_ptr<tasks::Worker> worker_task_;
 
   // Not owned.
-  IFileGatherer* file_gatherer_;
-  ITagParser* tag_parser_;
+  IFileGatherer& file_gatherer_;
+  ITagParser& tag_parser_;
 
   Database(leveldb::DB* db,
            leveldb::Cache* cache,
-           IFileGatherer* file_gatherer,
-           ITagParser* tag_parser,
+           IFileGatherer& file_gatherer,
+           ITagParser& tag_parser,
            std::shared_ptr<tasks::Worker> worker);
 
   auto dbMintNewTrackId() -> TrackId;
-- 
cgit v1.2.3