From eb04b19e0eaa2554f573837f5597f73f01dba318 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 18 Sep 2008 23:35:12 +0200 Subject: [PATCH] screen_browser: removed redundant entity type checks The function browser_select_entry() returns early when the entity type is not "SONG". No need to double check that. --- src/screen_browser.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/screen_browser.c b/src/screen_browser.c index 8e899fc..b9ef7d4 100644 --- a/src/screen_browser.c +++ b/src/screen_browser.c @@ -364,27 +364,23 @@ browser_select_entry(mpdclient_t *c, filelist_entry_t *entry, entry->flags |= HIGHLIGHT; if (toggle || entry->flags & HIGHLIGHT) { - if (entry->entity->type == MPD_INFO_ENTITY_TYPE_SONG) { - mpd_Song *song = entry->entity->info.song; + mpd_Song *song = entry->entity->info.song; - if (mpdclient_cmd_add(c, song) == 0) { - char buf[BUFSIZE]; + if (mpdclient_cmd_add(c, song) == 0) { + char buf[BUFSIZE]; - strfsong(buf, BUFSIZE, LIST_FORMAT, song); - screen_status_printf(_("Adding \'%s\' to playlist\n"), buf); - } + strfsong(buf, BUFSIZE, LIST_FORMAT, song); + screen_status_printf(_("Adding \'%s\' to playlist\n"), buf); } } else { /* remove song from playlist */ - if (entry->entity->type == MPD_INFO_ENTITY_TYPE_SONG) { - mpd_Song *song = entry->entity->info.song; + mpd_Song *song = entry->entity->info.song; - if (song) { - int idx; + if (song) { + int idx; - while ((idx = playlist_get_index_from_file(c, song->file)) >=0) - mpdclient_cmd_delete(c, idx); - } + while ((idx = playlist_get_index_from_file(c, song->file)) >=0) + mpdclient_cmd_delete(c, idx); } } -- 2.30.2