oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/DatabasePlaylist: pass Database reference around

Browse Source 
Reduce global variable usage, move to frontend code.
This commit is contained in:
Max Kellermann
2014-02-01 01:11:50 +01:00
parent db69ceade6
commit 29072797ca
9 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/db/DatabaseSong.cxx
View File

@@ -19,23 +19,18 @@
#include "config.h"
#include "DatabaseSong.hxx"
#include "DatabaseGlue.hxx"
#include "DatabasePlugin.hxx"
#include "DetachedSong.hxx"
#include "Mapper.hxx"
DetachedSong *
DatabaseDetachSong(const char *uri, Error &error)
DatabaseDetachSong(const Database &db, const char *uri, Error &error)
{
const Database *db = GetDatabase(error);
if (db == nullptr)
return nullptr;
const LightSong *tmp = db->GetSong(uri, error);
const LightSong *tmp = db.GetSong(uri, error);
if (tmp == nullptr)
return nullptr;
DetachedSong *song = new DetachedSong(map_song_detach(*tmp));
db->ReturnSong(tmp);
db.ReturnSong(tmp);
return song;
}