diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-26 14:40:32 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-26 14:40:32 +0100 |
| commit | 412bedb697c66c809652510951e1ccdb5319d0bb (patch) | |
| tree | a9c94234d7078e7a1e694e65db70a65966ccb5ac /src/db/plugins/ProxyDatabasePlugin.cxx | |
| parent | d37811f177bb7e4c5dd6e3a18b3466ba831aa379 (diff) | |
| parent | 163597ef6939e4250afafe12f821aa732b1fc2b7 (diff) | |
| download | mpd-412bedb697c66c809652510951e1ccdb5319d0bb.tar.gz mpd-412bedb697c66c809652510951e1ccdb5319d0bb.tar.xz mpd-412bedb697c66c809652510951e1ccdb5319d0bb.zip | |
Merge branch 'v0.19.x'
Diffstat (limited to 'src/db/plugins/ProxyDatabasePlugin.cxx')
| -rw-r--r-- | src/db/plugins/ProxyDatabasePlugin.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/db/plugins/ProxyDatabasePlugin.cxx b/src/db/plugins/ProxyDatabasePlugin.cxx index fba72210d..5fd224bb5 100644 --- a/src/db/plugins/ProxyDatabasePlugin.cxx +++ b/src/db/plugins/ProxyDatabasePlugin.cxx @@ -103,7 +103,7 @@ public: virtual void Close() override; virtual const LightSong *GetSong(const char *uri_utf8, Error &error) const override; - virtual void ReturnSong(const LightSong *song) const; + void ReturnSong(const LightSong *song) const override; virtual bool Visit(const DatabaseSelection &selection, VisitDirectory visit_directory, @@ -731,7 +731,7 @@ ProxyDatabase::Visit(const DatabaseSelection &selection, { // TODO: eliminate the const_cast if (!const_cast<ProxyDatabase *>(this)->EnsureConnected(error)) - return nullptr; + return false; if (!visit_directory && !visit_playlist && selection.recursive && (ServerSupportsSearchBase(connection) @@ -757,7 +757,7 @@ ProxyDatabase::VisitUniqueTags(const DatabaseSelection &selection, { // TODO: eliminate the const_cast if (!const_cast<ProxyDatabase *>(this)->EnsureConnected(error)) - return nullptr; + return false; enum mpd_tag_type tag_type2 = Convert(tag_type); if (tag_type2 == MPD_TAG_COUNT) { @@ -810,7 +810,7 @@ ProxyDatabase::GetStats(const DatabaseSelection &selection, // TODO: eliminate the const_cast if (!const_cast<ProxyDatabase *>(this)->EnsureConnected(error)) - return nullptr; + return false; struct mpd_stats *stats2 = mpd_run_stats(connection); |