diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index cda976e0a05d058c55b16b0b0a3f5d9cf626a132..11786c1a9e778ee503983645e468a8b63760a4fd 100644 (file)
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (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
exists_lyr_file(const char *artist, const char *title)
{
char path[1024];
- struct stat result;
-
path_lyr_file(path, 1024, artist, title);
+ struct stat result;
return (stat(path, &result) == 0);
}
create_lyr_file(const char *artist, const char *title)
{
char path[1024];
-
snprintf(path, 1024, "%s/.lyrics",
getenv("HOME"));
mkdir(path, S_IRWXU);
static int
store_lyr_hd(void)
{
- FILE *lyr_file;
- unsigned i;
-
- lyr_file = create_lyr_file(current.artist, current.title);
+ FILE *lyr_file = create_lyr_file(current.artist, current.title);
if (lyr_file == NULL)
return -1;
- for (i = 0; i < text.lines->len; ++i)
+ for (unsigned i = 0; i < text.lines->len; ++i)
fprintf(lyr_file, "%s\n",
(const char*)g_ptr_array_index(text.lines, i));
static int
delete_lyr_hd(void)
{
- char path[1024];
-
if (!exists_lyr_file(current.artist, current.title))
return -1;
+ char path[1024];
path_lyr_file(path, 1024, current.artist, current.title);
if (unlink(path) != 0)
return -2;
static void
screen_lyrics_load(const struct mpd_song *song)
{
- const char *artist, *title;
-
assert(song != NULL);
screen_lyrics_abort();
screen_text_clear(&text);
- artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
- title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
+ const char *artist = mpd_song_get_tag(song, MPD_TAG_ARTIST, 0);
+ const char *title = mpd_song_get_tag(song, MPD_TAG_TITLE, 0);
current.song = mpd_song_dup(song);
current.artist = g_strdup(artist);
}
static void
-lyrics_screen_init(WINDOW *w, int cols, int rows)
+lyrics_screen_init(WINDOW *w, unsigned cols, unsigned rows)
{
screen_text_init(&text, w, cols, rows);
}
static void
-lyrics_resize(int cols, int rows)
+lyrics_resize(unsigned cols, unsigned rows)
{
screen_text_resize(&text, cols, rows);
}
lyrics_edit(void)
{
char *editor = options.text_editor;
- int status;
-
if (editor == NULL) {
screen_status_message(_("Editor not configured"));
return;
}
if (options.text_editor_ask) {
- char *buf = g_strdup_printf(
- _("Do you really want to start an editor and edit these lyrics [%s/%s]? "),
- YES, NO);
- bool really = screen_get_yesno(buf, false);
- g_free(buf);
+ const char *prompt =
+ _("Do you really want to start an editor and edit these lyrics?");
+ bool really = screen_get_yesno(prompt, false);
if (!really) {
screen_status_message(_("Aborted"));
return;
/* TODO: fork/exec/wait won't work on Windows, but building a command
string for system() is too tricky */
+ int status;
pid_t pid = fork();
if (pid == -1) {
screen_status_printf(("%s (%s)"), _("Can't start editor"), g_strerror(errno));
case CMD_LYRICS_UPDATE:
if (c->song != NULL) {
screen_lyrics_load(c->song);
- screen_text_repaint(&text);
+ screen_text_paint(&text);
}
return true;
case CMD_EDIT: