screen: rename screen_refresh() to screen_paint()

[ncmpc.git] / src / lyrics.c

diff --git a/src/lyrics.c b/src/lyrics.c
index 1b33542d4a05942c93b67f8706610deb0b10fca7..a23aa37e189f6a0a1ba114a3406da8b9a44103de 100644 (file)
--- a/src/lyrics.c
+++ b/src/lyrics.c
@@ -1,6 +1,6 @@
-/* ncmpc
- * Copyright (C) 2008 Max Kellermann <max@duempel.org>
- * This project's homepage is: http://www.musicpd.org
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -11,26 +11,29 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "lyrics.h"
-#include "../config.h"
+#include "config.h"
 
 #include <assert.h>
 
-static struct plugin_list plugins;
+static struct plugin_list empty, plugins;
 
 void lyrics_init(void)
 {
+       plugin_list_init(&empty);
        plugin_list_init(&plugins);
        plugin_list_load_directory(&plugins, LYRICS_PLUGIN_DIR);
 }
 
 void lyrics_deinit(void)
 {
+       plugin_list_deinit(&empty);
        plugin_list_deinit(&plugins);
 }
 
@@ -40,8 +43,8 @@ lyrics_load(const char *artist, const char *title,
 {
        const char *args[3] = { artist, title, NULL };
 
-       assert(artist != NULL);
-       assert(title != NULL);
+       if (artist == NULL || title == NULL)
+               return plugin_run(&empty, args, callback, data);
 
        return plugin_run(&plugins, args, callback, data);
 }