From 2d0bc2a3f794ec9d974396e1b06a4b47849b551c Mon Sep 17 00:00:00 2001 From: Andreas Obergrusberger Date: Sat, 5 Aug 2006 16:00:29 +0000 Subject: [PATCH] translation updates, template and german. another little build fix git-svn-id: https://svn.musicpd.org/ncmpc/branches/tradiaz@4562 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- ChangeLog | 3 ++- src/easy_download.c | 2 +- src/mpdclient.c | 4 +++- src/screen.h | 1 + src/screen_file.c | 2 +- src/screen_lyrics.c | 3 ++- src/screen_search.c | 2 ++ src/wreadln.c | 1 + 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 218c216..c574c7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,8 @@ of libmpdclient. enabled by default. * building with lyrics screen on gentoo now works... thanks avuton :) * updated translation template - * german and lyrics- and search-screen translation added + * german lyrics- and search-screen translation added + * avuton has fixed a lot of warnings 2006-09-4 Anderas Obergrusberger * tradiaz is temporary maintainer of a special branch of ncmpc now diff --git a/src/easy_download.c b/src/easy_download.c index 3404e9c..83616cf 100644 --- a/src/easy_download.c +++ b/src/easy_download.c @@ -86,4 +86,4 @@ void easy_download_clean(easy_download_struct *dld) dld->max_size = -1; } -#endif \ No newline at end of file +#endif diff --git a/src/mpdclient.c b/src/mpdclient.c index d950e25..5697bd8 100644 --- a/src/mpdclient.c +++ b/src/mpdclient.c @@ -63,6 +63,8 @@ error_cb(mpdclient_t *c, gint error, gchar *msg) } #ifdef DEBUG +// Unused ath the moment +/* #include "strfsong.h" static gchar * @@ -73,7 +75,7 @@ get_song_name(mpd_Song *song) strfsong(name, 256, "[%artist% - ]%title%|%file%", song); return name; } - +*/ #endif /****************************************************************************/ diff --git a/src/screen.h b/src/screen.h index 71489f2..d15be3b 100644 --- a/src/screen.h +++ b/src/screen.h @@ -82,6 +82,7 @@ void screen_paint(mpdclient_t *c); void screen_update(mpdclient_t *c); void screen_idle(mpdclient_t *c); void screen_cmd(mpdclient_t *c, command_t cmd); +gint screen_get_id(char *name); gint get_cur_mode_id(); diff --git a/src/screen_file.c b/src/screen_file.c index f868e21..0019c94 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -34,7 +34,7 @@ #include "screen.h" #include "screen_utils.h" #include "screen_browse.h" - +#include "screen_play.h" #define USE_OLD_LAYOUT #undef USE_OLD_ADD diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c index 6df0e5d..15f5721 100644 --- a/src/screen_lyrics.c +++ b/src/screen_lyrics.c @@ -37,6 +37,7 @@ #include "screen.h" #include "screen_utils.h" #include "easy_download.h" +#include "strfsong.h" #define LEOSLYRICS_SEARCH_URL "http://api.leoslyrics.com/api_search.php?auth=QuodLibet&artist=%s&songtitle=%s" @@ -335,7 +336,7 @@ gpointer get_lyr(void *c) parser = XML_ParserCreate(NULL); XML_SetUserData(parser, NULL); - int state; + int state = 0; XML_SetElementHandler(parser, check_search_response, end_tag); XML_SetCharacterDataHandler(parser, check_search_success); diff --git a/src/screen_search.c b/src/screen_search.c index 7ff3f44..585eb6f 100644 --- a/src/screen_search.c +++ b/src/screen_search.c @@ -43,6 +43,8 @@ #ifdef FUTURE +extern gint mpdclient_finish_command(mpdclient_t *c); + typedef struct { int id; diff --git a/src/wreadln.c b/src/wreadln.c index fac2080..c3c5bfd 100644 --- a/src/wreadln.c +++ b/src/wreadln.c @@ -51,6 +51,7 @@ wrln_wgetch_fn_t wrln_wgetch = NULL; wrln_gcmp_pre_cb_t wrln_pre_completion_callback = NULL; wrln_gcmp_post_cb_t wrln_post_completion_callback = NULL; +extern void sigstop(void); extern void screen_bell(void); extern size_t my_strlen(char *str); -- 2.30.2