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

UpdateContainer: pass suffix instead of DecoderPlugin

Browse Source 
Instead of using the first DecoderPlugin that supports the suffix, use
the first one that actually implements the "container_scan" method.
This commit is contained in:
Max Kellermann 2013-12-29 16:46:02 +01:00
parent 9be82891b0
commit 5bb563e3bc
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/UpdateContainer.cxx
View File

@ -26,6 +26,7 @@
#include "Directory.hxx"
#include "Song.hxx"
#include "DecoderPlugin.hxx"
#include "DecoderList.hxx"
#include "Mapper.hxx"
#include "fs/AllocatedPath.hxx"
#include "tag/TagHandler.hxx"
@ -64,14 +65,25 @@ make_directory_if_modified(Directory &parent, const char *name,
return directory;
}
static bool
SupportsContainerSuffix(const DecoderPlugin &plugin, const char *suffix)
{
return plugin.container_scan != nullptr &&
plugin.SupportsSuffix(suffix);
}
bool
update_container_file(Directory &directory,
const char *name,
const struct stat *st,
const DecoderPlugin &plugin)
const char *suffix)
{
if (plugin.container_scan == nullptr)
const DecoderPlugin *_plugin = decoder_plugins_find([suffix](const DecoderPlugin &plugin){
return SupportsContainerSuffix(plugin, suffix);
});
if (_plugin == nullptr)
return false;
const DecoderPlugin &plugin = *_plugin;
db_lock();
Directory *contdir = make_directory_if_modified(directory, name, st);

2
src/UpdateContainer.hxx
View File

@ -31,6 +31,6 @@ bool
update_container_file(Directory &directory,
const char *name,
const struct stat *st,
const DecoderPlugin &plugin);
const char *suffix);
#endif

6
src/UpdateSong.cxx
View File

@ -35,7 +35,7 @@
static void
update_song_file2(Directory &directory,
const char *name, const struct stat *st,
const DecoderPlugin &plugin)
const char *suffix)
{
db_lock();
Song *song = directory.FindSong(name);
@ -56,7 +56,7 @@ update_song_file2(Directory &directory,
if (!(song != nullptr && st->st_mtime == song->mtime &&
!walk_discard) &&
update_container_file(directory, name, st, plugin)) {
update_container_file(directory, name, st, suffix)) {
if (song != nullptr) {
db_lock();
delete_song(directory, song);
@ -110,6 +110,6 @@ update_song_file(Directory &directory,
if (plugin == nullptr)
return false;
update_song_file2(directory, name, st, *plugin);
update_song_file2(directory, name, st, suffix);
return true;
}