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

storage/Plugin: return std::unique_ptr<Storage>

Browse Source
This commit is contained in:
Max Kellermann
2018-01-02 16:11:17 +01:00
parent 3f4f7b0a53
commit 3c5e4e2788
15 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/storage/Configured.cxx
View File

@@ -20,6 +20,7 @@
#include "config.h"
#include "Configured.hxx"
#include "Registry.hxx"
#include "StorageInterface.hxx"
#include "plugins/LocalStorage.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigError.hxx"
@@ -30,10 +31,10 @@
#include <assert.h>
static Storage *
static std::unique_ptr<Storage>
CreateConfiguredStorageUri(EventLoop &event_loop, const char *uri)
{
Storage *storage = CreateStorageURI(event_loop, uri);
auto storage = CreateStorageURI(event_loop, uri);
if (storage == nullptr)
throw FormatRuntimeError("Unrecognized storage URI: %s", uri);
@@ -50,7 +51,7 @@ GetConfiguredMusicDirectory()
return path;
}
static Storage *
static std::unique_ptr<Storage>
CreateConfiguredStorageLocal()
{
AllocatedPath path = GetConfiguredMusicDirectory();
@@ -62,7 +63,7 @@ CreateConfiguredStorageLocal()
return CreateLocalStorage(path);
}
Storage *
std::unique_ptr<Storage>
CreateConfiguredStorage(EventLoop &event_loop)
{
auto uri = config_get_string(ConfigOption::MUSIC_DIR);