diff options
| author | Max Kellermann <max@musicpd.org> | 2019-05-08 18:39:00 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2019-05-31 17:49:52 +0200 |
| commit | 5d74b5cee1c11e7035ba99fa23d724175203319c (patch) | |
| tree | ed1fa91f3807bca59b2064ea288ba436d1791cfd /src/Partition.cxx | |
| parent | e8a0ce643a5e00e768f31387000cdddb2a93cb44 (diff) | |
input/cache: first draft of the file cache
Diffstat (limited to 'src/Partition.cxx')
| -rw-r--r-- | src/Partition.cxx | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/src/Partition.cxx b/src/Partition.cxx index b2dd6bd0b..87a7f92d4 100644 --- a/src/Partition.cxx +++ b/src/Partition.cxx @@ -20,10 +20,15 @@ #include "config.h" #include "Partition.hxx" #include "Instance.hxx" +#include "Log.hxx" #include "song/DetachedSong.hxx" #include "mixer/Volume.hxx" #include "IdleFlags.hxx" #include "client/Listener.hxx" +#include "input/cache/Manager.hxx" +#include "util/Domain.hxx" + +static constexpr Domain cache_domain("cache"); Partition::Partition(Instance &_instance, const char *_name, @@ -37,7 +42,9 @@ Partition::Partition(Instance &_instance, global_events(instance.event_loop, BIND_THIS_METHOD(OnGlobalEvent)), playlist(max_length, *this), outputs(*this), - pc(*this, outputs, buffer_chunks, + pc(*this, outputs, + instance.input_cache.get(), + buffer_chunks, configured_audio_format, replay_gain_config) { UpdateEffectiveReplayGainMode(); @@ -51,6 +58,43 @@ Partition::EmitIdle(unsigned mask) noexcept instance.EmitIdle(mask); } +static void +PrefetchSong(InputCacheManager &cache, const char *uri) noexcept +{ + if (cache.Contains(uri)) + return; + + FormatDebug(cache_domain, "Prefetch '%s'", uri); + + try { + cache.Prefetch(uri); + } catch (...) { + FormatError(std::current_exception(), + "Prefetch '%s' failed", uri); + } +} + +static void +PrefetchSong(InputCacheManager &cache, const DetachedSong &song) noexcept +{ + PrefetchSong(cache, song.GetURI()); +} + +inline void +Partition::PrefetchQueue() noexcept +{ + if (!instance.input_cache) + return; + + auto &cache = *instance.input_cache; + + int next = playlist.GetNextPosition(); + if (next >= 0) + PrefetchSong(cache, playlist.queue.Get(next)); + + // TODO: prefetch more songs +} + void Partition::UpdateEffectiveReplayGainMode() noexcept { @@ -106,6 +150,10 @@ void Partition::SyncWithPlayer() noexcept { playlist.SyncWithPlayer(pc); + + /* TODO: invoke this function in batches, to let the hard disk + spin down in between */ + PrefetchQueue(); } void |