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

diff --git a/ChangeLog b/ChangeLog
index 218c216f8f9a7fbdecc621a1d87cca3e54ea4614..c574c7e9b0091ab7ae6cf8fcb1a0b23a6f56e5c8 100644 (file)
--- 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@yahoo.de>
         * tradiaz is temporary maintainer of a special branch of ncmpc now

diff --git a/src/easy_download.c b/src/easy_download.c
index 3404e9c5ca0aa6621ee85c72d7516bd40fecede7..83616cf8741fa519f27cc1ab1a647ce5e424d99f 100644 (file)
--- 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 d950e254df999501dd4e679e52d0fd425963f326..5697bd85d594134e7e8d2aa51df2d1d145f86827 100644 (file)
--- 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 71489f211e8b584be8da11b80e97b381e7a92fd1..d15be3bb9876d76da3678d19c092ebc5d57be64f 100644 (file)
--- 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 f868e2167b36ec74b4cf471406a11f20d7944b1d..0019c94ffa23017aab8c6cb3f5a18ee567d3742e 100644 (file)
--- 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 6df0e5d9a8ebf3bb51bbcbd9a653d453d013935a..15f5721ec1bfcbf293a13df3ff0ed285dae953c6 100644 (file)
--- 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 7ff3f44602693e7ce87cbf1f3e2ae4148065093c..585eb6f02c01837cb438252718fd2022c6695d98 100644 (file)
--- 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 fac2080c2ae2c935cca54538b1e25eaad920a846..c3c5bfd06a71fe758f7360b293ac5e1e6f1f4337 100644 (file)
--- 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);