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

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

Browse Source 
This function was never used on remote songs.  Replace the runtime
check with an assertion.
This commit is contained in:
Max Kellermann 2008-10-08 11:05:38 +02:00
parent 5e7b18f874
commit 1f9b614850
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/song.c
View File

@ -100,29 +100,28 @@ 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];
utf8_to_fs_charset(abs_path, song_get_url(song, path_max_tmp)); assert(song_is_file(song));
rmp2amp_r(abs_path, abs_path);
if (song->tag) utf8_to_fs_charset(abs_path, song_get_url(song, path_max_tmp));
tag_free(song->tag); rmp2amp_r(abs_path, abs_path);
if (song->tag != NULL) {
tag_free(song->tag);
song->tag = NULL; song->tag = NULL;
while (!song->tag && (plugin = isMusic(abs_path,
&(song->mtime),
next++))) {
song->tag = plugin->tag_dup(abs_path);
}
if (!song->tag || song->tag->time < 0)
return -1;
} }
while (song->tag == NULL &&
(plugin = isMusic(abs_path, &(song->mtime), next++)))
song->tag = plugin->tag_dup(abs_path);
if (song->tag == NULL || song->tag->time < 0)
return -1;
return 0; return 0;
} }