po: added Brazilian Portuguese translation

[ncmpc.git] / src / screen_lyrics.c

diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index a1556aec582bbdf2cf2d2eb3ad9d013a41b3b812..ba197a04c22a54905f3eba51fd217662aa62c3e3 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  
  * This program is free software; you can redistribute it and/or modify
@@ -17,16 +17,20 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <sys/stat.h>
+#include "screen_lyrics.h"
+#include "screen_interface.h"
+#include "screen_message.h"
+#include "screen_file.h"
+#include "screen_song.h"
 #include "i18n.h"
 #include "options.h"
 #include "mpdclient.h"
-#include "command.h"
 #include "screen.h"
-#include "strfsong.h"
 #include "lyrics.h"
 #include "screen_text.h"
 
+#include <assert.h>
+#include <sys/stat.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
@@ -35,7 +39,7 @@
 
 static struct screen_text text;
 
-static const struct mpd_song *next_song;
+static struct mpd_song *next_song;
 static bool follow = false;
 
 static struct {
@@ -65,7 +69,7 @@ screen_lyrics_abort(void)
        }
 
        if (current.song != NULL) {
-               mpd_freeSong(current.song);
+               mpd_song_free(current.song);
                current.song = NULL;
        }
 }
@@ -136,22 +140,26 @@ screen_lyrics_set(const GString *str)
        /* paint new data */
 
        lyrics_repaint_if_active();
-
-       if (options.lyrics_autosave &&
-           !exists_lyr_file(current.artist, current.title))
-               store_lyr_hd();
 }
 
 static void
-screen_lyrics_callback(const GString *result, G_GNUC_UNUSED void *data)
+screen_lyrics_callback(const GString *result, const bool success,
+                      G_GNUC_UNUSED void *data)
 {
        assert(current.loader != NULL);
 
+       /* Display result, which may be lyrics or error messages */
        if (result != NULL)
                screen_lyrics_set(result);
-       else
+
+       if (success == true) {
+               if (options.lyrics_autosave &&
+                   !exists_lyr_file(current.artist, current.title))
+                       store_lyr_hd();
+       } else {
                /* translators: no lyrics were found for the song */
                screen_status_message (_("No lyrics"));
+       }
 
        plugin_stop(current.loader);
        current.loader = NULL;
@@ -160,20 +168,19 @@ screen_lyrics_callback(const GString *result, G_GNUC_UNUSED void *data)
 static void
 screen_lyrics_load(const struct mpd_song *song)
 {
-       char buffer[MAX_SONGNAME_LENGTH];
+       const char *artist, *title;
 
        assert(song != NULL);
 
        screen_lyrics_abort();
        screen_text_clear(&text);
 
-       current.song = mpd_songDup(song);
+       artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
+       title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
 
-       strfsong(buffer, sizeof(buffer), "%artist%", song);
-       current.artist = g_strdup(buffer);
-
-       strfsong(buffer, sizeof(buffer), "%title%", song);
-       current.title = g_strdup(buffer);
+       current.song = mpd_song_dup(song);
+       current.artist = g_strdup(artist);
+       current.title = g_strdup(title);
 
        current.loader = lyrics_load(current.artist, current.title,
                                     screen_lyrics_callback, NULL);
@@ -200,33 +207,33 @@ lyrics_exit(void)
 }
 
 static void
-lyrics_open(mpdclient_t *c)
+lyrics_open(struct mpdclient *c)
 {
-       if (next_song == NULL)
-               next_song = c->song;
+       const struct mpd_song *next_song_c =
+               next_song != NULL ? next_song : c->song;
 
-       if (next_song != NULL &&
+       if (next_song_c != NULL &&
            (current.song == NULL ||
-            strcmp(next_song->file, current.song->file) != 0))
-               screen_lyrics_load(next_song);
+            strcmp(mpd_song_get_uri(next_song_c),
+                   mpd_song_get_uri(current.song)) != 0))
+               screen_lyrics_load(next_song_c);
 
+       if (next_song != NULL)
+               mpd_song_free(next_song);
        next_song = NULL;
 }
 
 static void
-lyrics_update(mpdclient_t *c)
+lyrics_update(struct mpdclient *c)
 {
        if (!follow)
                return;
 
-       next_song = c->song;
-
-       if (next_song != NULL &&
+       if (c->song != NULL &&
            (current.song == NULL ||
-            strcmp(next_song->file, current.song->file) != 0))
-               screen_lyrics_load(next_song);
-
-       next_song = NULL;
+            strcmp(mpd_song_get_uri(c->song),
+                   mpd_song_get_uri(current.song)) != 0))
+               screen_lyrics_load(c->song);
 }
 
 static const char *
@@ -256,7 +263,7 @@ lyrics_paint(void)
 }
 
 static bool
-lyrics_cmd(mpdclient_t *c, command_t cmd)
+lyrics_cmd(struct mpdclient *c, command_t cmd)
 {
        if (screen_text_cmd(&text, c, cmd))
                return true;
@@ -327,6 +334,6 @@ screen_lyrics_switch(struct mpdclient *c, const struct mpd_song *song, bool f)
        assert(song != NULL);
 
        follow = f;
-       next_song = song;
+       next_song = mpd_song_dup(song);
        screen_switch(&screen_lyrics, c);
 }