Commit 1f9b6148 authored by Max Kellermann's avatar Max Kellermann

song: don't check song_is_file() in song_file_update()

This function was never used on remote songs. Replace the runtime check with an assertion.
parent 5e7b18f8
...@@ -100,28 +100,27 @@ song_free(struct song *song) ...@@ -100,28 +100,27 @@ song_free(struct song *song)
int int
song_file_update(struct song *song) song_file_update(struct song *song)
{ {
if (song_is_file(song)) {
struct decoder_plugin *plugin; struct decoder_plugin *plugin;
unsigned int next = 0; unsigned int next = 0;
char path_max_tmp[MPD_PATH_MAX]; char path_max_tmp[MPD_PATH_MAX];
char abs_path[MPD_PATH_MAX]; char abs_path[MPD_PATH_MAX];
assert(song_is_file(song));
utf8_to_fs_charset(abs_path, song_get_url(song, path_max_tmp)); utf8_to_fs_charset(abs_path, song_get_url(song, path_max_tmp));
rmp2amp_r(abs_path, abs_path); rmp2amp_r(abs_path, abs_path);
if (song->tag) if (song->tag != NULL) {
tag_free(song->tag); tag_free(song->tag);
song->tag = NULL; song->tag = NULL;
}
while (!song->tag && (plugin = isMusic(abs_path, while (song->tag == NULL &&
&(song->mtime), (plugin = isMusic(abs_path, &(song->mtime), next++)))
next++))) {
song->tag = plugin->tag_dup(abs_path); song->tag = plugin->tag_dup(abs_path);
}
if (!song->tag || song->tag->time < 0) if (song->tag == NULL || song->tag->time < 0)
return -1; return -1;
}
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment