From 29072797ca5a397b2878e458db22cb5dcc7dfe4d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 1 Feb 2014 01:11:50 +0100
Subject: db/DatabasePlaylist: pass Database reference around

Reduce global variable usage, move to frontend code.
---
 src/SongLoader.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/SongLoader.cxx')

diff --git a/src/SongLoader.cxx b/src/SongLoader.cxx
index 2ed34671c..90df42824 100644
--- a/src/SongLoader.cxx
+++ b/src/SongLoader.cxx
@@ -92,11 +92,12 @@ SongLoader::LoadSong(const char *uri_utf8, Error &error) const
 		/* URI relative to the music directory */
 
 #ifdef ENABLE_DATABASE
-		return DatabaseDetachSong(uri_utf8, error);
-#else
+		if (db != nullptr)
+			return DatabaseDetachSong(*db, uri_utf8, error);
+#endif
+
 		error.Set(playlist_domain, int(PlaylistResult::NO_SUCH_SONG),
 			  "No database");
 		return nullptr;
-#endif
 	}
 }
-- 
cgit v1.2.3