diff options
Diffstat (limited to 'src/SongLoader.hxx')
| -rw-r--r-- | src/SongLoader.hxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/SongLoader.hxx b/src/SongLoader.hxx index 229703972..1c1300f11 100644 --- a/src/SongLoader.hxx +++ b/src/SongLoader.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2014 The Music Player Daemon Project + * Copyright (C) 2003-2015 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -29,7 +29,9 @@ class Client; class Database; class Storage; class DetachedSong; +class Path; class Error; +struct LocatedUri; /** * A utility class that loads a #DetachedSong object by its URI. If @@ -66,12 +68,18 @@ public: } #endif + DetachedSong *LoadSong(const LocatedUri &uri, Error &error) const; + gcc_nonnull_all DetachedSong *LoadSong(const char *uri_utf8, Error &error) const; private: gcc_nonnull_all - DetachedSong *LoadFile(const char *path_utf8, Error &error) const; + DetachedSong *LoadFromDatabase(const char *uri, Error &error) const; + + gcc_nonnull_all + DetachedSong *LoadFile(const char *path_utf8, Path path_fs, + Error &error) const; }; #endif |