Packman Build Service PMBS

ncmpc.changes Changed

ncmpc.spec Changed

ncmpc-0.24.tar.xz/INSTALL -> ncmpc-0.27.tar.xz/INSTALL Changed

ncmpc-0.24.tar.xz/Makefile.am -> ncmpc-0.27.tar.xz/Makefile.am Changed

@@ -5,103 +5,75 @@
 AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects
 
 AM_CPPFLAGS = \
+	$(CURSES_CFLAGS) \
 	$(LIBMPDCLIENT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBLIRCCLIENT_CFLAGS) \
 	-DLOCALE_DIR=\""$(datadir)/locale"\"\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
-ncmpc_headers = \
-	src/gidle.h \
-	src/mpdclient.h \
-	src/playlist.h \
-	src/filelist.h \
-	src/options.h \
-	src/conf.h \
-	src/command.h \
-	src/ncu.h \
-	src/ncfix.h \
-	src/player_command.h \
-	src/window.h \
-	src/title_bar.h \
-	src/progress_bar.h \
-	src/status_bar.h \
-	src/screen.h \
-	src/screen_status.h \
-	src/screen_interface.h \
-	src/screen_list.h \
-	src/screen_find.h \
-	src/screen_utils.h \
-	src/screen_client.h \
-	src/list_window.h \
-	src/song_paint.h \
-	src/colors.h \
-	src/paint.h \
-	src/hscroll.h \
-	src/charset.h \
-	src/match.h \
-	src/wreadln.h \
-	src/strfsong.h \
-	src/utils.h \
-	src/ncmpc.h \
-	src/defaults.h \
-	src/i18n.h \
-	src/screen_help.h \
-	src/screen_queue.h \
-	src/screen_file.h \
-	src/screen_artist.h \
-	src/screen_browser.h \
-	src/screen_search.h \
-	src/screen_song.h \
-	src/screen_keydef.h \
-	src/screen_lyrics.h \
-	src/screen_outputs.h \
-	src/screen_chat.h \
-	src/screen_text.h \
-	src/plugin.h \
-	src/lyrics.h \
-	src/lirc.h \
-	src/ncmpc_curses.h
-
 bin_PROGRAMS = src/ncmpc
 
 src_ncmpc_LDADD = \
-	$(CURSES_LIB) \
+	$(CURSES_LIBS) \
 	$(LIBMPDCLIENT_LIBS) \
 	$(GLIB_LIBS) \
 	$(LIBLIRCCLIENT_LIBS)
 
 src_ncmpc_SOURCES = \
 	src/Compiler.h \
-	$(ncmpc_headers) \
+	src/ncmpc.h \
+	src/defaults.h \
+	src/ncmpc_curses.h \
+	src/i18n.h \
 	src/main.c \
-	src/gidle.c \
-	src/mpdclient.c \
-	src/playlist.c \
-	src/filelist.c \
-	src/options.c \
-	src/command.c \
-	src/ncu.c \
-	src/player_command.c \
-	src/title_bar.c \
-	src/progress_bar.c \
-	src/status_bar.c \
-	src/screen.c \
-	src/screen_status.c \
-	src/screen_list.c \
-	src/screen_find.c \
-	src/screen_utils.c \
-	src/screen_client.c \
-	src/screen_queue.c \
-	src/screen_browser.c \
-	src/screen_file.c \
-	src/list_window.c \
-	src/song_paint.c \
-	src/colors.c \
-	src/charset.c \
-	src/wreadln.c \
-	src/strfsong.c \
-	src/utils.c
+	src/gidle.c src/gidle.h \
+	src/mpdclient.c src/mpdclient.h \
+	src/callbacks.c src/callbacks.h \
+	src/playlist.c src/playlist.h \
+	src/filelist.c src/filelist.h \
+	src/options.c src/options.h \
+	src/command.c src/command.h \
+	src/keyboard.c src/keyboard.h \
+	src/ncfix.h \
+	src/ncu.c src/ncu.h \
+	src/player_command.c src/player_command.h \
+	src/title_bar.c src/title_bar.h \
+	src/progress_bar.c src/progress_bar.h \
+	src/status_bar.c src/status_bar.h \
+	src/screen.c src/screen.h \
+	src/screen_interface.h \
+	src/screen_init.c \
+	src/screen_paint.c \
+	src/screen_utils.c src/screen_utils.h \
+	src/screen_status.c src/screen_status.h \
+	src/screen_list.c src/screen_list.h \
+	src/screen_find.c src/screen_find.h \
+	src/screen_client.c src/screen_client.h \
+	src/screen_queue.c src/screen_queue.h \
+	src/screen_browser.c src/screen_browser.h \
+	src/screen_file.c src/screen_file.h \
+	src/list_window.c src/list_window.h \
+	src/save_playlist.c src/save_playlist.h \
+	src/paint.h \
+	src/song_paint.c src/song_paint.h \
+	src/colors.c src/colors.h \
+	src/charset.c src/charset.h \
+	src/window.h \
+	src/wreadln.c src/wreadln.h \
+	src/strfsong.c src/strfsong.h \
+	src/time_format.c src/time_format.h \
+	src/utils.c src/utils.h
+
+if ENABLE_ASYNC_CONNECT
+src_ncmpc_SOURCES += \
+	src/net/types.h \
+	src/net/socket.c src/net/socket.h \
+	src/net/resolver.c src/net/resolver.h \
+	src/net/async_connect.c src/net/async_connect.h \
+	src/net/async_rconnect.c src/net/async_rconnect.h \
+	src/aconnect.c src/aconnect.h
+endif
 
 #
 # Windows resource file
@@ -115,58 +87,64 @@
 
 src_ncmpc_DEPENDENCIES = src/win/ncmpc_win32_rc.$(OBJEXT)
 src_ncmpc_LDFLAGS = -Wl,src/win/ncmpc_win32_rc.$(OBJEXT)
+else
+src_ncmpc_SOURCES += src/signals.c src/signals.h
 endif
 
 if NCMPC_MINI
 else
 src_ncmpc_SOURCES += \
-	src/hscroll.c \
-	src/match.c \
-	src/conf.c
+	src/db_completion.c src/db_completion.h \
+	src/xterm_title.c src/xterm_title.h \
+	src/hscroll.c src/hscroll.h \
+	src/match.c src/match.h \
+	src/conf.c src/conf.h
 endif
 
 if ENABLE_HELP_SCREEN
-src_ncmpc_SOURCES += src/screen_help.c
+src_ncmpc_SOURCES += src/screen_help.c src/screen_help.h
 endif
 
 if ENABLE_ARTIST_SCREEN
-src_ncmpc_SOURCES += src/screen_artist.c
+src_ncmpc_SOURCES += src/screen_artist.c src/screen_artist.h
 endif
 
 if ENABLE_SEARCH_SCREEN
-src_ncmpc_SOURCES += src/screen_search.c
+src_ncmpc_SOURCES += src/screen_search.c src/screen_search.h
 endif
 
 if ENABLE_SONG_SCREEN
-src_ncmpc_SOURCES += src/screen_song.c
+src_ncmpc_SOURCES += src/screen_song.c src/screen_song.h
 endif
 
 if ENABLE_KEYDEF_SCREEN
-src_ncmpc_SOURCES += src/screen_keydef.c

ncmpc-0.24.tar.xz/Makefile.in -> ncmpc-0.27.tar.xz/Makefile.in Changed

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -81,51 +91,58 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = src/ncmpc$(EXEEXT)
+@ENABLE_ASYNC_CONNECT_TRUE@am__append_1 = \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/types.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/socket.c src/net/socket.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/resolver.c src/net/resolver.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/async_connect.c src/net/async_connect.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/async_rconnect.c src/net/async_rconnect.h \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/aconnect.c src/aconnect.h
+
 @HAVE_WINDOWS_FALSE@src_ncmpc_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 @HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1) \
 @HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1) \
 @HAVE_WINDOWS_FALSE@	$(am__DEPENDENCIES_1)
-@NCMPC_MINI_FALSE@am__append_1 = \
-@NCMPC_MINI_FALSE@	src/hscroll.c \
-@NCMPC_MINI_FALSE@	src/match.c \
-@NCMPC_MINI_FALSE@	src/conf.c
-
-@ENABLE_HELP_SCREEN_TRUE@am__append_2 = src/screen_help.c
-@ENABLE_ARTIST_SCREEN_TRUE@am__append_3 = src/screen_artist.c
-@ENABLE_SEARCH_SCREEN_TRUE@am__append_4 = src/screen_search.c
-@ENABLE_SONG_SCREEN_TRUE@am__append_5 = src/screen_song.c
-@ENABLE_KEYDEF_SCREEN_TRUE@am__append_6 = src/screen_keydef.c
-@ENABLE_PLUGIN_LIBRARY_TRUE@am__append_7 = src/plugin.c
-@ENABLE_SCREEN_TEXT_TRUE@am__append_8 = src/screen_text.c
-@ENABLE_LYRICS_SCREEN_TRUE@am__append_9 = src/screen_lyrics.c src/lyrics.c
-@ENABLE_OUTPUTS_SCREEN_TRUE@am__append_10 = src/screen_outputs.c
-@ENABLE_CHAT_SCREEN_TRUE@am__append_11 = src/screen_chat.c
-@ENABLE_LIRC_TRUE@am__append_12 = src/lirc.c
+@HAVE_WINDOWS_FALSE@am__append_2 = src/signals.c src/signals.h
+@NCMPC_MINI_FALSE@am__append_3 = \
+@NCMPC_MINI_FALSE@	src/db_completion.c src/db_completion.h \
+@NCMPC_MINI_FALSE@	src/xterm_title.c src/xterm_title.h \
+@NCMPC_MINI_FALSE@	src/hscroll.c src/hscroll.h \
+@NCMPC_MINI_FALSE@	src/match.c src/match.h \
+@NCMPC_MINI_FALSE@	src/conf.c src/conf.h
+
+@ENABLE_HELP_SCREEN_TRUE@am__append_4 = src/screen_help.c src/screen_help.h
+@ENABLE_ARTIST_SCREEN_TRUE@am__append_5 = src/screen_artist.c src/screen_artist.h
+@ENABLE_SEARCH_SCREEN_TRUE@am__append_6 = src/screen_search.c src/screen_search.h
+@ENABLE_SONG_SCREEN_TRUE@am__append_7 = src/screen_song.c src/screen_song.h
+@ENABLE_KEYDEF_SCREEN_TRUE@am__append_8 = src/screen_keydef.c src/screen_keydef.h
+@ENABLE_PLUGIN_LIBRARY_TRUE@am__append_9 = src/plugin.c src/plugin.h
+@ENABLE_SCREEN_TEXT_TRUE@am__append_10 = src/screen_text.c src/screen_text.h
+@ENABLE_LYRICS_SCREEN_TRUE@am__append_11 = \
+@ENABLE_LYRICS_SCREEN_TRUE@	src/screen_lyrics.c src/screen_lyrics.h \
+@ENABLE_LYRICS_SCREEN_TRUE@	src/lyrics.c src/lyrics.h
+
+@ENABLE_OUTPUTS_SCREEN_TRUE@am__append_12 = src/screen_outputs.c src/screen_outputs.h
+@ENABLE_CHAT_SCREEN_TRUE@am__append_13 = src/screen_chat.c src/screen_chat.h
+@ENABLE_LIRC_TRUE@am__append_14 = src/lirc.c src/lirc.h
 check_PROGRAMS = test/run_hscroll$(EXEEXT)
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in \
-	$(top_srcdir)/src/win/ncmpc_win32_rc.rc.in \
-	$(top_srcdir)/doc/doxygen.conf.in $(top_srcdir)/build/depcomp \
-	AUTHORS COPYING INSTALL NEWS README build/compile \
-	build/config.guess build/config.sub build/depcomp \
-	build/install-sh build/missing $(top_srcdir)/build/compile \
-	$(top_srcdir)/build/config.guess \
-	$(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \
-	$(top_srcdir)/build/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
 	$(top_srcdir)/m4/ax_append_flag.m4 \
 	$(top_srcdir)/m4/ax_append_link_flags.m4 \
 	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
+	$(top_srcdir)/m4/ax_require_defined.m4 \
 	$(top_srcdir)/m4/ax_with_curses.m4 \
-	$(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/glib-gettext.m4 \
+	$(top_srcdir)/m4/mpd_with_flags.m4 $(top_srcdir)/m4/nls.m4 \
 	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \
 	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -135,73 +152,93 @@
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(lyricsdir)" \
 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"
 PROGRAMS = $(bin_PROGRAMS)
-am__src_ncmpc_SOURCES_DIST = src/Compiler.h src/gidle.h \
-	src/mpdclient.h src/playlist.h src/filelist.h src/options.h \
-	src/conf.h src/command.h src/ncu.h src/ncfix.h \
-	src/player_command.h src/window.h src/title_bar.h \
-	src/progress_bar.h src/status_bar.h src/screen.h \
-	src/screen_status.h src/screen_interface.h src/screen_list.h \
-	src/screen_find.h src/screen_utils.h src/screen_client.h \
-	src/list_window.h src/song_paint.h src/colors.h src/paint.h \
-	src/hscroll.h src/charset.h src/match.h src/wreadln.h \
-	src/strfsong.h src/utils.h src/ncmpc.h src/defaults.h \
-	src/i18n.h src/screen_help.h src/screen_queue.h \
-	src/screen_file.h src/screen_artist.h src/screen_browser.h \
-	src/screen_search.h src/screen_song.h src/screen_keydef.h \
-	src/screen_lyrics.h src/screen_outputs.h src/screen_chat.h \
-	src/screen_text.h src/plugin.h src/lyrics.h src/lirc.h \
-	src/ncmpc_curses.h src/main.c src/gidle.c src/mpdclient.c \
-	src/playlist.c src/filelist.c src/options.c src/command.c \
-	src/ncu.c src/player_command.c src/title_bar.c \
-	src/progress_bar.c src/status_bar.c src/screen.c \
-	src/screen_status.c src/screen_list.c src/screen_find.c \
-	src/screen_utils.c src/screen_client.c src/screen_queue.c \
-	src/screen_browser.c src/screen_file.c src/list_window.c \
-	src/song_paint.c src/colors.c src/charset.c src/wreadln.c \
-	src/strfsong.c src/utils.c src/hscroll.c src/match.c \
-	src/conf.c src/screen_help.c src/screen_artist.c \
-	src/screen_search.c src/screen_song.c src/screen_keydef.c \
-	src/plugin.c src/screen_text.c src/screen_lyrics.c \
-	src/lyrics.c src/screen_outputs.c src/screen_chat.c src/lirc.c
-am__objects_1 =
+am__src_ncmpc_SOURCES_DIST = src/Compiler.h src/ncmpc.h src/defaults.h \
+	src/ncmpc_curses.h src/i18n.h src/main.c src/gidle.c \
+	src/gidle.h src/mpdclient.c src/mpdclient.h src/callbacks.c \
+	src/callbacks.h src/playlist.c src/playlist.h src/filelist.c \
+	src/filelist.h src/options.c src/options.h src/command.c \
+	src/command.h src/keyboard.c src/keyboard.h src/ncfix.h \
+	src/ncu.c src/ncu.h src/player_command.c src/player_command.h \
+	src/title_bar.c src/title_bar.h src/progress_bar.c \
+	src/progress_bar.h src/status_bar.c src/status_bar.h \
+	src/screen.c src/screen.h src/screen_interface.h \
+	src/screen_init.c src/screen_paint.c src/screen_utils.c \
+	src/screen_utils.h src/screen_status.c src/screen_status.h \
+	src/screen_list.c src/screen_list.h src/screen_find.c \
+	src/screen_find.h src/screen_client.c src/screen_client.h \
+	src/screen_queue.c src/screen_queue.h src/screen_browser.c \
+	src/screen_browser.h src/screen_file.c src/screen_file.h \
+	src/list_window.c src/list_window.h src/save_playlist.c \
+	src/save_playlist.h src/paint.h src/song_paint.c \
+	src/song_paint.h src/colors.c src/colors.h src/charset.c \
+	src/charset.h src/window.h src/wreadln.c src/wreadln.h \
+	src/strfsong.c src/strfsong.h src/time_format.c \
+	src/time_format.h src/utils.c src/utils.h src/net/types.h \
+	src/net/socket.c src/net/socket.h src/net/resolver.c \
+	src/net/resolver.h src/net/async_connect.c \
+	src/net/async_connect.h src/net/async_rconnect.c \
+	src/net/async_rconnect.h src/aconnect.c src/aconnect.h \
+	src/signals.c src/signals.h src/db_completion.c \
+	src/db_completion.h src/xterm_title.c src/xterm_title.h \
+	src/hscroll.c src/hscroll.h src/match.c src/match.h src/conf.c \
+	src/conf.h src/screen_help.c src/screen_help.h \
+	src/screen_artist.c src/screen_artist.h src/screen_search.c \
+	src/screen_search.h src/screen_song.c src/screen_song.h \
+	src/screen_keydef.c src/screen_keydef.h src/plugin.c \
+	src/plugin.h src/screen_text.c src/screen_text.h \
+	src/screen_lyrics.c src/screen_lyrics.h src/lyrics.c \
+	src/lyrics.h src/screen_outputs.c src/screen_outputs.h \
+	src/screen_chat.c src/screen_chat.h src/lirc.c src/lirc.h
 am__dirstamp = $(am__leading_dot)dirstamp
-@NCMPC_MINI_FALSE@am__objects_2 = src/hscroll.$(OBJEXT) \
-@NCMPC_MINI_FALSE@	src/match.$(OBJEXT) src/conf.$(OBJEXT)
-@ENABLE_HELP_SCREEN_TRUE@am__objects_3 = src/screen_help.$(OBJEXT)
-@ENABLE_ARTIST_SCREEN_TRUE@am__objects_4 =  \
+@ENABLE_ASYNC_CONNECT_TRUE@am__objects_1 = src/net/socket.$(OBJEXT) \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/resolver.$(OBJEXT) \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/async_connect.$(OBJEXT) \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/net/async_rconnect.$(OBJEXT) \
+@ENABLE_ASYNC_CONNECT_TRUE@	src/aconnect.$(OBJEXT)
+@HAVE_WINDOWS_FALSE@am__objects_2 = src/signals.$(OBJEXT)
+@NCMPC_MINI_FALSE@am__objects_3 = src/db_completion.$(OBJEXT) \
+@NCMPC_MINI_FALSE@	src/xterm_title.$(OBJEXT) \
+@NCMPC_MINI_FALSE@	src/hscroll.$(OBJEXT) src/match.$(OBJEXT) \

ncmpc-0.24.tar.xz/NEWS -> ncmpc-0.27.tar.xz/NEWS Changed

ncmpc-0.24.tar.xz/aclocal.m4 -> ncmpc-0.27.tar.xz/aclocal.m4 Changed

@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,45 +20,7 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-#   been defined and thus are available for use.  This avoids random issues
-#   where a macro isn't expanded.  Instead the configure script emits a
-#   non-fatal:
-#
-#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-#   It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-#   Here's an example:
-#
-#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])dnl AX_REQUIRE_DEFINED
-
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -70,10 +32,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -89,14 +51,14 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -141,15 +103,14 @@
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -180,7 +141,7 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -371,7 +332,7 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -447,7 +408,7 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -537,8 +498,8 @@
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -612,6 +573,9 @@
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
 fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
@@ -641,7 +605,7 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -652,7 +616,7 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -662,7 +626,7 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -683,7 +647,7 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -733,7 +697,7 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -772,7 +736,7 @@

ncmpc-0.24.tar.xz/build/compile -> ncmpc-0.27.tar.xz/build/compile Changed

ncmpc-0.24.tar.xz/build/config.guess -> ncmpc-0.27.tar.xz/build/config.guess Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2014-03-23'
+timestamp='2016-10-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,19 +168,29 @@
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e$armv[0-9]$.*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*$eb$$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		os=netbsdelf
+		;;
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -197,6 +207,13 @@
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -207,13 +224,13 @@
 		release='-gnu'
 		;;
 	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
 		;;
 	esac
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -223,6 +240,10 @@
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -235,6 +256,9 @@
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -251,42 +275,42 @@
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha $.*$ processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -359,16 +383,16 @@
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`

ncmpc-0.24.tar.xz/build/config.sub -> ncmpc-0.27.tar.xz/build/config.sub Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2014-05-01'
+timestamp='2016-11-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -33,7 +33,7 @@
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,8 +116,8 @@
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^$.*$-$[^-]*-[^-]*$$/\1/'`
@@ -255,12 +254,13 @@
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
+	| ba \
 	| be32 | be64 \
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
@@ -301,10 +301,12 @@
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -312,6 +314,7 @@
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -326,6 +329,9 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -371,12 +377,13 @@
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| ba-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -422,13 +429,15 @@
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
+	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
@@ -436,6 +445,7 @@
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -512,6 +522,9 @@
 		basic_machine=i386-pc
 		os=-aros
 		;;
+	asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -632,6 +645,14 @@
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -773,6 +794,9 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -828,6 +852,10 @@
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -1004,7 +1032,7 @@
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown

ncmpc-0.24.tar.xz/build/depcomp -> ncmpc-0.27.tar.xz/build/depcomp Changed

ncmpc-0.24.tar.xz/build/install-sh -> ncmpc-0.27.tar.xz/build/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2014-09-12.12; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@
 
     *[0-7])
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -269,41 +274,15 @@
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X$//$[^/]' \| \
-	     X"$dst" : 'X$//$$' \| \
-	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
-		   s//\1/

ncmpc-0.24.tar.xz/build/missing -> ncmpc-0.27.tar.xz/build/missing Changed

ncmpc-0.24.tar.xz/config.h.in -> ncmpc-0.27.tar.xz/config.h.in Changed

ncmpc-0.24.tar.xz/configure -> ncmpc-0.27.tar.xz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ncmpc 0.24.
+# Generated by GNU Autoconf 2.69 for ncmpc 0.27.
 #
 # Report bugs to <max@duempel.org>.
 #
@@ -580,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='ncmpc'
 PACKAGE_TARNAME='ncmpc'
-PACKAGE_VERSION='0.24'
-PACKAGE_STRING='ncmpc 0.24'
+PACKAGE_VERSION='0.27'
+PACKAGE_STRING='ncmpc 0.27'
 PACKAGE_BUGREPORT='max@duempel.org'
 PACKAGE_URL=''
 
@@ -661,6 +661,8 @@
 ENABLE_LIRC_TRUE
 LIBLIRCCLIENT_LIBS
 LIBLIRCCLIENT_CFLAGS
+ENABLE_ASYNC_CONNECT_FALSE
+ENABLE_ASYNC_CONNECT_TRUE
 XGETTEXT_EXTRA_OPTIONS
 MSGMERGE
 XGETTEXT_015
@@ -692,9 +694,6 @@
 LIBMPDCLIENT_CFLAGS
 GLIB_LIBS
 GLIB_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
 HAVE_WINDOWS_FALSE
 HAVE_WINDOWS_TRUE
 WINDRES
@@ -708,7 +707,11 @@
 build
 NCMPC_MINI_FALSE
 NCMPC_MINI_TRUE
-CURSES_LIB
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+CURSES_CFLAGS
+CURSES_LIBS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -772,6 +775,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -802,6 +806,8 @@
 enable_multibyte
 enable_locale
 enable_nls
+enable_tcp
+enable_async_connect
 enable_colors
 enable_lirc
 enable_help_screen
@@ -827,7 +833,8 @@
 LDFLAGS
 LIBS
 CPPFLAGS
-CURSES_LIB
+CURSES_LIBS
+CURSES_CFLAGS
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -876,6 +883,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1128,6 +1136,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1265,7 +1282,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1378,7 +1395,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ncmpc 0.24 to adapt to many kinds of systems.
+\`configure' configures ncmpc 0.27 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1418,6 +1435,7 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1448,7 +1466,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ncmpc 0.24:";;
+     short | recursive ) echo "Configuration of ncmpc 0.27:";;
    esac
   cat <<\_ACEOF
 
@@ -1467,6 +1485,8 @@
   --disable-multibyte     Disable multibyte character support [default=yes]
   --disable-locale        Disable locale support [default=auto]
   --disable-nls           do not use Native Language Support
+  --disable-tcp           Disable TCP support [default=enabled]
+  --enable-async-connect  Disable asynchronous connect [default=yes]
   --enable-colors         Enable color support
   --enable-lirc           Enable LIRC support
   --enable-help-screen    Enable the help screen [default=yes]
@@ -1500,7 +1520,9 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
-  CURSES_LIB  linker library for Curses, e.g. -lcurses
+  CURSES_LIBS linker library for Curses, e.g. -lcurses
+  CURSES_CFLAGS
+              preprocessor flags for Curses, e.g. -I/usr/include/ncursesw
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -1584,7 +1606,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ncmpc configure 0.24
+ncmpc configure 0.27
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1953,7 +1975,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ncmpc $as_me 0.24, which was
+It was created by ncmpc $as_me 0.27, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2303,7 +2325,7 @@
 
 
 VERSION_MAJOR=0
-VERSION_MINOR=24
+VERSION_MINOR=27
 VERSION_REVISION=0
 VERSION_EXTRA=0
 
@@ -2337,7 +2359,7 @@
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
-am__api_version='1.14'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2509,8 +2531,8 @@
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.

ncmpc-0.24.tar.xz/configure.ac -> ncmpc-0.27.tar.xz/configure.ac Changed

@@ -1,8 +1,8 @@
 AC_PREREQ(2.60)
-AC_INIT(ncmpc, 0.24, max@duempel.org)
+AC_INIT(ncmpc, 0.27, max@duempel.org)
 
 VERSION_MAJOR=0
-VERSION_MINOR=24
+VERSION_MINOR=27
 VERSION_REVISION=0
 VERSION_EXTRA=0
 
@@ -99,17 +99,13 @@
 fi
 
 dnl Check for GLib
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14],,
-	[AC_MSG_ERROR([glib 2.14 is required])])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.30],,
+	[AC_MSG_ERROR([glib 2.30 is required])])
 
-dnl Check for libmpdclient 2.3
-PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.3],,
+dnl Check for libmpdclient 2.9
+PKG_CHECK_MODULES([LIBMPDCLIENT], [libmpdclient >= 2.9],,
 	[AC_MSG_ERROR([libmpdclient2 is required])])
 
-dnl Check for libmpdclient 2.5 (the chat screen requires this version)
-PKG_CHECK_EXISTS([libmpdclient >= 2.5],
-	[have_libmpdclient_2_5=yes], [have_libmpdclient_2_5=no])
-
 dnl i18n
 
 AC_ARG_ENABLE([locale],
@@ -153,11 +149,31 @@
   AM_PO_SUBDIRS
 fi
 
+dnl Networking
+
+AC_ARG_ENABLE(tcp,
+	AS_HELP_STRING([--disable-tcp],
+		[Disable TCP support @<:@default=enabled@:>@]),,
+	[enable_tcp=$disable_mini])
+if test "x$enable_tcp" = xyes; then
+	AC_DEFINE([ENABLE_TCP], 1, [Define to enable TCP support])
+	AC_SEARCH_LIBS([gethostbyname], [nsl])
+	AC_CHECK_FUNCS([getaddrinfo])
+fi
+
+AC_ARG_ENABLE([async-connect],
+	AS_HELP_STRING([--enable-async-connect],
+		[Disable asynchronous connect @<:@default=yes@:>@]),,
+		[enable_async_connect=$disable_mini])
+AM_CONDITIONAL(ENABLE_ASYNC_CONNECT, test x$enable_async_connect = xyes)
+if test "x$enable_async_connect" = xyes; then
+	AC_DEFINE([ENABLE_ASYNC_CONNECT], [1], [Enable asynchronous connect?])
+fi
+
 dnl enable colors
 AC_ARG_ENABLE([colors],
 	AS_HELP_STRING([--enable-colors],
-		[Enable color support]),
-		[enable_colors=$enableval],
+		[Enable color support]),,
 		[enable_colors=auto])
 AC_MSG_CHECKING([whether to include color support])
 AS_IF([ test "x$enable_colors" = xyes || test "x$enable_colors" = xauto ],
@@ -184,8 +200,12 @@
 		[Enable LIRC support]),,
 	[enable_lirc=no])
 if test x$enable_lirc = xyes; then
-	PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
-		[AC_MSG_ERROR([liblircclient0 not found])])
+	PKG_CHECK_MODULES([LIBLIRCCLIENT], [lirc],,
+		[PKG_CHECK_MODULES([LIBLIRCCLIENT], [liblircclient0],,
+			[AC_MSG_ERROR([lirc not found])]
+		)]
+	)
+
 	AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support])
 fi
 
@@ -207,16 +227,14 @@
 
 dnl Optional - curses getmouse support
 
-dnl AC_CHECK_LIB depends on being able to prepend a '-l', remove the '-l' from CURSES_LIB first
-AC_CHECK_LIB([$(expr substr $CURSES_LIB 3 99)],
-		[getmouse],
+MPD_WITH_LIBRARY([CURSES],
+	[AC_CHECK_FUNC([getmouse],
 		[ax_cv_curses_mouse=yes],
-		[ax_cv_curses_mouse=no])
+		[ax_cv_curses_mouse=no])])
 
 AC_ARG_ENABLE([mouse], 
 	AS_HELP_STRING([--enable-mouse],
-		[Enable curses getmouse support @<:@default=yes@:>@]),
-		[enable_mouse=$enableval],
+		[Enable curses getmouse support @<:@default=yes@:>@]),,
 		[enable_mouse=auto])
 
 AC_MSG_CHECKING([whether to include mouse support])
@@ -293,8 +311,7 @@
 AC_MSG_CHECKING([whether to include the lyrics screen]) 
 AC_ARG_ENABLE([lyrics-screen], 
               AS_HELP_STRING([--enable-lyrics-screen],
-		[Enable lyrics screen @<:@default=no@:>@]),
-	[enable_lyrics_screen=$enableval],
+		[Enable lyrics screen @<:@default=no@:>@]),,
 	[enable_lyrics_screen=no])
 
 case "$host_os" in
@@ -352,13 +369,10 @@
 		[Enable chat screen @<:@default=no@:>@]),,
 	[enable_chat_screen=no])
 if test "x$enable_chat_screen" = "xauto"; then
-	enable_chat_screen=$have_libmpdclient_2_5
+	enable_chat_screen=yes
 fi
 AC_MSG_RESULT([$enable_chat_screen])
 if test "x$enable_chat_screen" = "xyes" ; then
-	if test "x$have_libmpdclient_2_5" = "xno"; then
-		AC_MSG_ERROR(The chat screen requires at least libmpclient 2.5)
-	fi
 	AC_DEFINE(ENABLE_CHAT_SCREEN, 1, [Enable chat screen])
 fi
 AM_CONDITIONAL(ENABLE_CHAT_SCREEN, test x$enable_chat_screen = xyes)

ncmpc-0.24.tar.xz/doc/config.sample -> ncmpc-0.27.tar.xz/doc/config.sample Changed

ncmpc-0.24.tar.xz/doc/doxygen.conf -> ncmpc-0.27.tar.xz/doc/doxygen.conf Changed

ncmpc-0.24.tar.xz/doc/ncmpc.1 -> ncmpc-0.27.tar.xz/doc/ncmpc.1 Changed

ncmpc-0.24.tar.xz/lyrics/10-hd.sh -> ncmpc-0.27.tar.xz/lyrics/10-hd.sh Changed

ncmpc-0.24.tar.xz/lyrics/20-lyricwiki.rb -> ncmpc-0.27.tar.xz/lyrics/20-lyricwiki.rb Changed

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-#  (c) 2004-2008 The Music Player Daemon Project
+#  (c) 2004-2017 The Music Player Daemon Project
 #  http://www.musicpd.org/
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 #
 
 require 'uri'
-require 'net/http'
+require 'open-uri'
 require 'cgi'
 
 # We need this because URI.escape doesn't escape ampersands.
@@ -33,7 +33,7 @@
 
 url = "http://lyrics.wikia.com/api.php?action=lyrics&fmt=xml&func=getSong" + \
     "&artist=#{escape(ARGV[0])}&song=#{escape(ARGV[1])}"
-response = Net::HTTP.get(URI.parse(url))
+response = open(URI.parse(url)).read
 
 if not response =~ /<url>\s*(.*?)\s*<\/url>/im
 	$stderr.puts "No URL in response!"
@@ -43,17 +43,12 @@
 url = $1
 exit(69) if url =~ /action=edit$/
 
-response = Net::HTTP.get(URI.parse(url))
-if not response =~ /<div class='lyricbox'>\s*(.*?)\s*<!--/im
+response = open(URI.parse(url)).read
+if not response =~ /<div class='lyricbox'>\s*(.*?)\s*<div class='lyricsbreak'>/im
 	$stderr.puts "No <div class='lyricbox'> in lyrics page!\n"
 	exit(1)
 end
 
-if not $1 =~ /^.*<\/div>(.*?)$/im
-	$stderr.puts "Couldn't remove leading XML tags in lyricbox!\n"
-	exit(1)
-end
-
 lyrics = $1.gsub(/<br \/>/, "\n")
 
 if lyrics.respond_to?(:force_encoding)

ncmpc-0.24.tar.xz/m4/ax_append_compile_flags.m4 -> ncmpc-0.27.tar.xz/m4/ax_append_compile_flags.m4 Changed

@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
+#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -20,6 +20,8 @@
 #   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
 #   force the compiler to issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
 #   NOTE: This macro depends on the AX_APPEND_FLAG and
 #   AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
 #   AX_APPEND_LINK_FLAGS.
@@ -54,12 +56,12 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 4
+#serial 5
 
 AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
 [AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
 AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
 for flag in $1; do
-  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3])
+  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4])
 done
 ])dnl AX_APPEND_COMPILE_FLAGS

ncmpc-0.24.tar.xz/m4/ax_append_flag.m4 -> ncmpc-0.27.tar.xz/m4/ax_append_flag.m4 Changed

@@ -49,21 +49,23 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 2
+#serial 6
 
 AC_DEFUN([AX_APPEND_FLAG],
-[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
-AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
-AS_VAR_SET_IF(FLAGS,
-  [case " AS_VAR_GET(FLAGS) " in
-    *" $1 "*)
-      AC_RUN_LOG([: FLAGS already contains $1])
-      ;;
-    *)
-      AC_RUN_LOG([: FLAGS="$FLAGS $1"])
-      AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
-      ;;
-   esac],
-  [AS_VAR_SET(FLAGS,["$1"])])
+[dnl
+AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
+AS_VAR_SET_IF(FLAGS,[
+  AS_CASE([" AS_VAR_GET(FLAGS) "],
+    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
+    [
+     AS_VAR_APPEND(FLAGS,[" $1"])
+     AC_RUN_LOG([: FLAGS="$FLAGS"])
+    ])
+  ],
+  [
+  AS_VAR_SET(FLAGS,[$1])
+  AC_RUN_LOG([: FLAGS="$FLAGS"])
+  ])
 AS_VAR_POPDEF([FLAGS])dnl
 ])dnl AX_APPEND_FLAG

ncmpc-0.24.tar.xz/m4/ax_append_link_flags.m4 -> ncmpc-0.27.tar.xz/m4/ax_append_link_flags.m4 Changed

@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS])
+#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
 #
 # DESCRIPTION
 #
@@ -19,6 +19,8 @@
 #   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
 #   issue an error when a bad flag is given.
 #
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
 #   NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG.
 #   Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS.
 #
@@ -52,12 +54,12 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 4
+#serial 5
 
 AC_DEFUN([AX_APPEND_LINK_FLAGS],
 [AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
 AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
 for flag in $1; do
-  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3])
+  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4])
 done
 ])dnl AX_APPEND_LINK_FLAGS

ncmpc-0.24.tar.xz/m4/ax_check_compile_flag.m4 -> ncmpc-0.27.tar.xz/m4/ax_check_compile_flag.m4 Changed

ncmpc-0.24.tar.xz/m4/ax_check_link_flag.m4 -> ncmpc-0.27.tar.xz/m4/ax_check_link_flag.m4 Changed

ncmpc-0.27.tar.xz/m4/ax_require_defined.m4 Added

@@ -0,0 +1,37 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+#   been defined and thus are available for use.  This avoids random issues
+#   where a macro isn't expanded.  Instead the configure script emits a
+#   non-fatal:
+#
+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+#   It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+#   Here's an example:
+#
+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 1
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED

ncmpc-0.24.tar.xz/m4/ax_with_curses.m4 -> ncmpc-0.27.tar.xz/m4/ax_with_curses.m4 Changed

@@ -12,7 +12,9 @@
 #   present, along with the associated header file.  The NcursesW
 #   (wide-character) library is searched for first, followed by Ncurses,
 #   then the system-default plain Curses.  The first library found is the
-#   one returned.
+#   one returned. Finding libraries will first be attempted by using
+#   pkg-config, and should the pkg-config files not be available, will
+#   fallback to combinations of known flags itself.
 #
 #   The following options are understood: --with-ncursesw, --with-ncurses,
 #   --without-ncursesw, --without-ncurses.  The "--with" options force the
@@ -52,23 +54,29 @@
 #
 #   (These preprocessor symbols are discussed later in this document.)
 #
-#   The following output variable is defined by this macro; it is precious
-#   and may be overridden on the ./configure command line:
+#   The following output variables are defined by this macro; they are
+#   precious and may be overridden on the ./configure command line:
 #
-#     CURSES_LIB  - library to add to xxx_LDADD
+#     CURSES_LIBS  - library to add to xxx_LDADD
+#     CURSES_CFLAGS  - include paths to add to xxx_CPPFLAGS
 #
-#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
-#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
-#   Makefile.am.  For example:
+#   In previous versions of this macro, the flags CURSES_LIB and
+#   CURSES_CPPFLAGS were defined. These have been renamed, in keeping with
+#   AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should
+#   eventually supersede the use of AX_WITH_CURSES. Neither the library
+#   listed in CURSES_LIBS, nor the flags in CURSES_CFLAGS are added to LIBS,
+#   respectively CPPFLAGS, by default. You need to add both to the
+#   appropriate xxx_LDADD/xxx_CPPFLAGS line in your Makefile.am. For
+#   example:
 #
-#     prog_LDADD = @CURSES_LIB@
+#     prog_LDADD = @CURSES_LIBS@
+#     prog_CPPFLAGS = @CURSES_CFLAGS@
 #
-#   If CURSES_LIB is set on the configure command line (such as by running
-#   "./configure CURSES_LIB=-lmycurses"), then the only header searched for
-#   is <curses.h>.  The user may use the CPPFLAGS precious variable to
-#   override the standard #include search path.  If the user needs to
-#   specify an alternative path for a library (such as for a non-standard
-#   NcurseW), the user should use the LDFLAGS variable.
+#   If CURSES_LIBS is set on the configure command line (such as by running
+#   "./configure CURSES_LIBS=-lmycurses"), then the only header searched for
+#   is <curses.h>. If the user needs to specify an alternative path for a
+#   library (such as for a non-standard NcurseW), the user should use the
+#   LDFLAGS variable.
 #
 #   The following shell variables may be defined by this macro:
 #
@@ -182,11 +190,66 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 15
+#serial 17
+
+# internal function to factorize common code that is used by both ncurses
+# and ncursesw
+AC_DEFUN([_FIND_CURSES_FLAGS], [
+    AC_MSG_CHECKING([for $1 via pkg-config])
+
+    AX_REQUIRE_DEFINED([PKG_CHECK_EXISTS])
+    _PKG_CONFIG([_ax_cv_$1_libs], [libs], [$1])
+    _PKG_CONFIG([_ax_cv_$1_cppflags], [cflags], [$1])
+
+    AS_IF([test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"],[
+        AC_MSG_RESULT([no])
+        # No suitable .pc file found, have to find flags via fallback
+        AC_CACHE_CHECK([for $1 via fallback], [ax_cv_$1], [
+            AS_ECHO()
+            pkg_cv__ax_cv_$1_libs="-l$1"
+            pkg_cv__ax_cv_$1_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
+            LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
+            CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
+
+            AC_MSG_CHECKING([for initscr() with $pkg_cv__ax_cv_$1_libs])
+            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
+                [
+                    AC_MSG_RESULT([yes])
+                    AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
+                    AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
+                        ax_cv_$1=yes
+                        ],[
+                        AC_MSG_RESULT([no])
+                        m4_if(
+                            [$1],[ncursesw],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfow"],
+                            [$1],[ncurses],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfo"]
+                        )
+                        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
+
+                        AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
+                        AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
+                            ax_cv_$1=yes
+                            ],[
+                            ax_cv_$1=no
+                        ])
+                    ])
+                ],[
+                    ax_cv_$1=no
+            ])
+        ])
+        ],[
+        AC_MSG_RESULT([yes])
+        # Found .pc file, using its information
+        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
+        CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
+        ax_cv_$1=yes
+    ])
+])
 
 AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
 AC_DEFUN([AX_WITH_CURSES], [
-    AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
+    AC_ARG_VAR([CURSES_LIBS], [linker library for Curses, e.g. -lcurses])
+    AC_ARG_VAR([CURSES_CFLAGS], [preprocessor flags for Curses, e.g. -I/usr/include/ncursesw])
     AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
         [force the use of Ncurses or NcursesW])],
         [], [with_ncurses=check])
@@ -195,20 +258,17 @@
         [], [with_ncursesw=check])
 
     ax_saved_LIBS=$LIBS
+    ax_saved_CPPFLAGS=$CPPFLAGS
+
     AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
         [ax_with_plaincurses=no], [ax_with_plaincurses=check])
 
     ax_cv_curses_which=no
 
     # Test for NcursesW
+    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno], [
+        _FIND_CURSES_FLAGS([ncursesw])
 
-    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [
-        LIBS="$ax_saved_LIBS -lncursesw"
-
-        AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [
-            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
-                [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no])
-        ])
         AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [
             AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library])
         ])
@@ -216,7 +276,8 @@
         AS_IF([test "x$ax_cv_ncursesw" = xyes], [
             ax_cv_curses=yes
             ax_cv_curses_which=ncursesw
-            CURSES_LIB="-lncursesw"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags"
             AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
             AC_DEFINE([HAVE_CURSES],   [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
 
@@ -318,16 +379,13 @@
             ])
         ])
     ])
+    unset pkg_cv__ax_cv_ncursesw_libs
+    unset pkg_cv__ax_cv_ncursesw_cppflags
 
     # Test for Ncurses
+    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
+        _FIND_CURSES_FLAGS([ncurses])
 
-    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
-        LIBS="$ax_saved_LIBS -lncurses"
-
-        AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [
-            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
-                [ax_cv_ncurses=yes], [ax_cv_ncurses=no])
-        ])
         AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [
             AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library])
         ])
@@ -335,7 +393,8 @@
         AS_IF([test "x$ax_cv_ncurses" = xyes], [
             ax_cv_curses=yes
             ax_cv_curses_which=ncurses
-            CURSES_LIB="-lncurses"
+            CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs"
+            CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags"
             AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present])
             AC_DEFINE([HAVE_CURSES],  [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
 
@@ -390,12 +449,13 @@
             ])
         ])
     ])
+    unset pkg_cv__ax_cv_ncurses_libs
+    unset pkg_cv__ax_cv_ncurses_cppflags
 
-    # Test for plain Curses (or if CURSES_LIB was set by user)
-
+    # Test for plain Curses (or if CURSES_LIBS was set by user)
     AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [

ncmpc-0.24.tar.xz/m4/glib-gettext.m4 -> ncmpc-0.27.tar.xz/m4/glib-gettext.m4 Changed

@@ -239,6 +239,10 @@
 	      [CATOBJEXT=.mo
                DATADIRNAME=lib])
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -280,7 +284,7 @@
 
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
+    dnl in configure.ac.
     for lang in $ALL_LINGUAS; do
       GMOFILES="$GMOFILES $lang.gmo"
       POFILES="$POFILES $lang.po"
@@ -309,9 +313,8 @@
 # on various variables needed by the Makefile.in.in installed by 
 # glib-gettextize.
 dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
+AU_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -380,7 +383,8 @@
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/$.*$ \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
-  ])
+  ],
+  [[$0: This macro is deprecated. You should use upstream gettext instead.]])
 
 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 # -------------------------------
@@ -409,7 +413,7 @@
 dnl
 dnl Now the definitions that aclocal will find
 dnl
-ifdef(glib_configure_in,[],[
+ifdef(glib_configure_ac,[],[
 AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl

ncmpc-0.27.tar.xz/m4/mpd_with_flags.m4 Added

ncmpc-0.24.tar.xz/m4/nls.m4 -> ncmpc-0.27.tar.xz/m4/nls.m4 Changed

@@ -1,17 +1,17 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:

ncmpc-0.24.tar.xz/m4/pkg.m4 -> ncmpc-0.27.tar.xz/m4/pkg.m4 Changed

@@ -1,29 +1,60 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, 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.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -45,18 +76,19 @@
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -66,8 +98,10 @@
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -79,10 +113,11 @@
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -90,19 +125,17 @@
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -156,16 +189,40 @@
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],

ncmpc-0.24.tar.xz/m4/po.m4 -> ncmpc-0.27.tar.xz/m4/po.m4 Changed

@@ -1,16 +1,16 @@
-# po.m4 serial 21 (gettext-0.18.3)
-dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -30,7 +30,7 @@
 
   dnl Release version of the gettext macros. This is used to ensure that
   dnl the gettext macros and po/Makefile.in.in are in sync.
-  AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
+  AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
 
   dnl Perform the following tests also if --disable-nls has been given,
   dnl because they are needed for "make dist" to work.

ncmpc-0.24.tar.xz/m4/progtest.m4 -> ncmpc-0.27.tar.xz/m4/progtest.m4 Changed

@@ -1,22 +1,22 @@
-# progtest.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-AC_PREREQ(2.50)
+AC_PREREQ([2.50])
 
 # Search path for a program which passes the given test.
 
@@ -27,15 +27,14 @@
 # Prepare PATH_SEPARATOR.
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
+  # contains only /bin. Note that ksh looks also at the FPATH variable,
+  # so we have to set that as well for the test.
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+    && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
+           || PATH_SEPARATOR=';'
+       }
 fi
 
 # Find out how to test for executable files. Don't use a zero-byte file,
@@ -55,7 +54,7 @@
 # Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
+AC_CACHE_VAL([ac_cv_path_$1],
 [case "[$]$1" in
   [[\\/]]* | ?:[[\\/]]*)
     ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
@@ -84,9 +83,9 @@
 esac])dnl
 $1="$ac_cv_path_$1"
 if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
+  AC_MSG_RESULT([$][$1])
 else
-  AC_MSG_RESULT(no)
+  AC_MSG_RESULT([no])
 fi
-AC_SUBST($1)dnl
+AC_SUBST([$1])dnl
 ])

ncmpc-0.24.tar.xz/po/POTFILES.in -> ncmpc-0.27.tar.xz/po/POTFILES.in Changed

ncmpc-0.24.tar.xz/po/cs.gmo -> ncmpc-0.27.tar.xz/po/cs.gmo Changed

ncmpc-0.24.tar.xz/po/cs.po -> ncmpc-0.27.tar.xz/po/cs.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-03-02 13:59+0000\n"
 "Last-Translator: Zbyněk Schwarz <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Připojuji se k %s... [Pro přerušení stiskněte %s]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Chyba: MPD verze %d.%d.%d je příliš stará (potřebuji %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Připojeno k %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "stiskněte %s pro otevření správce klávesových zkratek"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Seznam skladeb zamíchán"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Seznam skladeb smazán"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Chyba: Příliš malá obrazovka"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Opakování je zapnuto"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Opakování je vypnuto"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Náhodné přehrávání je zapnuto"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Náhodné přehrávání je vypnuto"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Jednoduchý mód je zapnutý"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Jednoduchý mód je vypnutý"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Režim konzumace zapnut"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Režim konzumace vypnut"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Přerušení %d sekund"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databáze aktualizována"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Režim vyhledávání: Zabalený"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Režim vyhledávání: Normální"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatické centrování zapnuto"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatické centrování vypnuto"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Všechny skladby"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Všichni interpreti"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Alba interpreta: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Všechny skladby interpreta: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Písničky bez alba zpěváka: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Přidávám album %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Přidávám %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Načítám seznam skladeb: %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/da.gmo -> ncmpc-0.27.tar.xz/po/da.gmo Changed

ncmpc-0.24.tar.xz/po/da.po -> ncmpc-0.27.tar.xz/po/da.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2009-09-24 10:26+0200\n"
 "Last-Translator: Niels Anker <nanker@webspeed.dk>\n"
 "Language-Team: da <da@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Forbinder til %s... [Tryk %s for at afbryde]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Fejl: MPD version %d.%d.%d er for gammel (mindst %s er nødvendig)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Forbundet til %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "tryk på %s for at redigere"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Afspilninsglisten blandet"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Sletter afspilningslisten"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Fejl: Skærm for lille"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Gentagelse er slået til"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Gentagelse er slået fra"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Tilfældig orden slået til"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Tilfældig orden slået fra"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Single afspilning slået til"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Single afspilning slået fra"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "\"Consume mode\" er slået til"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "\"Consume mode\" er slået fra"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databasen er opdateret"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Søg (begynd forfra)"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Søg normalt (start/slut)"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering er aktiv"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er inaktiv"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alle spor"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alle kunstnere"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album fra kunstneren: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle spor fra kunstneren: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Album fra kunstneren: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Henter %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "Tilføjer mappen %s...\n"
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Henter %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/de.gmo -> ncmpc-0.27.tar.xz/po/de.gmo Changed

ncmpc-0.24.tar.xz/po/de.po -> ncmpc-0.27.tar.xz/po/de.po Changed

@@ -9,7 +9,7 @@
 "Project-Id-Version: ncmpc 0.12\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-06-21 08:19+0000\n"
 "Last-Translator: Christoph Mende <angelos@gentoo.org>\n"
 "Language-Team: de <de@li.org>\n"
@@ -28,58 +28,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Verbinde mit %s…   [%s drücken, um abzubrechen]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Fehler: MPD-Version %d.%d.%d ist zu alt (%s wird benötigt)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Verbunden mit %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "drücken Sie %s für den Tasteneditor"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Playlist gemischt"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Playlist gelöscht"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Fehler: Anzeige zu klein"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Wiederhol-Modus ist aktiviert"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Wiederhol-Modus ist deaktiviert"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Zufalls-Modus ist aktiviert"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Zufalls-Modus ist deaktiviert"
 
@@ -88,11 +76,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Einzelabspiel-Modus ist aktiviert"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Einzelabspiel-Modus ist deaktiviert"
 
@@ -100,99 +88,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Verbrauchs-Modus Aktiviert"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Verbrauchs-Modus Deaktiviert"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "%d Sekunden Crossfade"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Datenbank aktualisiert"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Suchmodus: Wrapped"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Suchmodus: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Autozentriermodus: an"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Autozentriermodus: aus"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alle Stücke"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alle Künstler"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Alben des Künstlers: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle Lieder des Künstlers: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Titel von keinem Album des Künstlers: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Füge Album %s... hinzu"
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Hinzufügen %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Lade Playlist %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/eo.gmo -> ncmpc-0.27.tar.xz/po/eo.gmo Changed

ncmpc-0.24.tar.xz/po/eo.po -> ncmpc-0.27.tar.xz/po/eo.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-05-16 15:13+0000\n"
 "Last-Translator: Aleksej <Unknown>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Konektiĝado al %s...  [Premu %s por ĉesigi]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Problemo: la versio %d.%d.%d de MPD estas tro malnova (necesas %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Konektite al %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr ""
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
 msgstr ""
 
-#: src/player_command.c:187
-msgid "Cleared playlist"
+#: src/player_command.c:184
+msgid "Cleared queue"
 msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr ""
-
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr ""
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr ""
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr ""
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr ""
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Ĝisdatigis datumbazon"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr ""
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr ""
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr ""
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr ""
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr ""
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr ""
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr ""
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format

ncmpc-0.24.tar.xz/po/es.gmo -> ncmpc-0.27.tar.xz/po/es.gmo Changed

ncmpc-0.24.tar.xz/po/es.po -> ncmpc-0.27.tar.xz/po/es.po Changed

@@ -13,7 +13,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2012-01-30 07:08+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitoschido@gmail.com>\n"
 "Language-Team: es\n"
@@ -32,60 +32,48 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectándose a %s... [Presiona %s para interrumpir la ejecución]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr ""
 "Error: La versión %d.%d.%d del MPD es demasiado antigua (se necesita al "
 "menos la %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Conectado a %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "pressiona %s para accer al editor de teclas"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Lista de canciones barajada"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Vaciada la lista de canciones"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Error: La ventana/pantalla es muy pequeña"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Modo repetición activado"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Modo repetición desactivado"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Modo aleatorio activado"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Modo aleatorio desactivado"
 
@@ -94,11 +82,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Modo compacto activado"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Modo compacto desactivado"
 
@@ -106,99 +94,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Modo completo activado"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Modo compacto desactivado"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Desvanecimiento de %d segundos"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Base de datos actualizada"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Tipo de búsqueda: simple"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Tipo de búsqueda: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Modo autocentrado activado"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Modo autocentrado desactivado"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Todas las pistas"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Todos los artistas"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbumes del artista: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas las pistas del artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Pistas del no álbum de artista: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Agregando álbum %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Agregando %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Cargando la lista %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292

ncmpc-0.24.tar.xz/po/fi.gmo -> ncmpc-0.27.tar.xz/po/fi.gmo Changed

ncmpc-0.24.tar.xz/po/fi.po -> ncmpc-0.27.tar.xz/po/fi.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-03-06 16:02+0000\n"
 "Last-Translator: Sami Sankala <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "e"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Yhdistetään kohteeseen %s... [Paina %s keskeyttääksesi]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Virhe: MPD versio %d.%d.%d on liian vanha (tarvitaan %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Yhdistetty kohteeseen %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "Painalla %s pääset näppäineditoriin"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Sekoitettu soittolista"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Tyhjennetty soittolista"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Virhe: Ruutu on liian pieni"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Jatkuva toisto on päällä"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Jatkuva toisto on poissa päältä"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Satunnaistoisto on päällä"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Satunnaistoisto poissa päältä"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Kertatoisto on päällä"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Kertatoisto on poissa päältä"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Kertakäyttökuuntelu päällä"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Kertakäyttökuuntelu poissa päältä"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Ristiinhäivytys %d sekuntia"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Tietokanta päivitetty"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Hakutyyli: 'Wrapped'"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Hakutyyli: Normaali"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Kaikki kappaleet"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Kaikki esittäjät"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Kaikki albumit esittäjältä: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Kaikki kappaleet esittäjältä: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Levy: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Kappaleet tuntemattomista albumeista esittäjältä: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Lisätään albumia %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Lisätään %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Ladataan soittolistaa %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/fr.gmo -> ncmpc-0.27.tar.xz/po/fr.gmo Changed

ncmpc-0.24.tar.xz/po/fr.po -> ncmpc-0.27.tar.xz/po/fr.po Changed

@@ -10,7 +10,7 @@
 "Project-Id-Version: ncmpc 0.14.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-09-23 11:15+0000\n"
 "Last-Translator: Thibault Févry <Unknown>\n"
 "Language-Team: <fr@li.org>\n"
@@ -29,58 +29,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Connexion à %s...  [Appuyez sur %s pour annuler]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Erreur: la version %d.%d.%d de MPD est trop ancienne (%s requise)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Connecté à %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "appuyez sur %s pour l'éditeur de touches"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Liste de lecture aléatoire"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Liste de lecture vidée"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Erreur: Ecran trop petit"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Répétition activé"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Répétition désactivé"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Mode Aléatoire activé"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Mode Aléatoire désactivé"
 
@@ -89,11 +77,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Mode seul activé"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Mode seul désactivé"
 
@@ -101,99 +89,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Mode consommateur activé"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Mode consommateur activé"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Fondu sur %d seconde(s)"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Base de données mise à jour"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Mode de recherche: Enveloppe"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Mode de recherche: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Mode d'auto-centrage: Actif"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Mode d'auto-centrage: Inactif"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Toutes les pistes"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Tous les artistes"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albums de l'artiste : %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Toutes les pistes de l'artiste : %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Piste sans album de l'artiste : %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Ajout de l'album %s en cours..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Ajout de %s en cours..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Chargement de la liste de lecture %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/gl.gmo -> ncmpc-0.27.tar.xz/po/gl.gmo Changed

ncmpc-0.24.tar.xz/po/gl.po -> ncmpc-0.27.tar.xz/po/gl.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-03-25 19:34+0000\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectandose con %s... [Prema %s para interromper]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Erro: a versión %d.%d.%d do MPD é moi antiga (precisase a %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Conectado a %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "prema %s para ir ao editor de atallos"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Lista de reprodución aleatoria"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Lista limpada"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Erro: A pantalla é moi pequena"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Activado o modo de repetición"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Modo repetición desactivado"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Modo aleatório activado"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Modo aleatório desactivado"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Modo compacto activado"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Modo compacto desactivado"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Modo completo activado"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Modo completo desactivado"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Esvaecemento cruzado %d segundos"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Base de dados actualizada"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Modo de busca: Limitada"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Modo de busca: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Modo de autocentrado: activado"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Modo de autocentrado: desactivado"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Todas as pistas"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Todos os artistas"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbumes do artista: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas as pistas do artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Pistas de ningún álbum do artista: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Engadindo álbum %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Engadindo %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Cargando a lista de reprodución %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/he.gmo -> ncmpc-0.27.tar.xz/po/he.gmo Changed

ncmpc-0.24.tar.xz/po/he.po -> ncmpc-0.27.tar.xz/po/he.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-09-07 20:35+0200\n"
 "Last-Translator: zeltak <Unknown>\n"
 "Language-Team: he <he@li.org>\n"
@@ -22,58 +22,46 @@
 msgid "n"
 msgstr "לא"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "מתחבר ל %s [לחץ על %s לביטול]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "שגיאה: גרסת התוכנה %d.%d.%d ישנה מדי (צריך %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "מתחבר ל %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "%s לעורך המקשים לחץ"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "רשימת שירים מעורבבת"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "רשימת שירים מנוקה"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "שגיאה: המסך קטן מידי"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "מצב חזרה מופעל"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "מצב חזרה מופסק"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "מצב רנדומלי מופעל"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "מצב רנדומלי מופסק"
 
@@ -82,11 +70,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "מצב יחיד מופעל"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "מצב יחיד מופסק"
 
@@ -94,99 +82,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "מצב מתכלה מופעל"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "מצב יחיד מופסק"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "קרוספייד שניות %d"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "בסיס הנתונים עודכן"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "מצב סופי: כרוך"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "מצב סופי: נורמלי"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "מצב מרכז אוטומטי: מופעל"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "מצב מרכז אוטומטי: מופסק"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "כל השירים"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "כל האמנים"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "אלבום של אומן %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "כל השירים של אומן: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "אלבום:%s-%s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "אלבום של אומן %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "טוען רשימת שירים %s...."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "טוען...."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "טוען רשימת שירים %s...."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/hu.gmo -> ncmpc-0.27.tar.xz/po/hu.gmo Changed

ncmpc-0.24.tar.xz/po/hu.po -> ncmpc-0.27.tar.xz/po/hu.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2009-09-24 21:45+0000\n"
 "Last-Translator: Kiszel Kristóf <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Kapcsolódás a következőhöz: %s... [Nyomj %s gombot a megszakításhoz]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Hiba: a(z) %d.%d.%d MPD verzió túl régi (%s kell)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Csatlakoztatva ide: %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "nyomj %s-t a szerkesztéshez"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Lejátszólista összekeverve"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Lejátszólista törölve"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Hiba: a képernyő túl kicsi"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Ismétlő mód be"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Ismétlő mód ki"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Véletlen mód be"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Véletlen mód ki"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Egyszeri lejátszás mód be"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Egyszeri lejátszás mód ki"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Fogyasztó mód be"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Fogyasztó mód ki"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Egymásba mosás %d másodperc"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Adatbázis frissítve"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Keresési mód: újrakezdő"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Keresési mód: normál"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Középre igazítás bekapcsolva"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Középre igazítás kikapcsolva"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Minden szám"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Minden előadó"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "%s előadó albumai"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "%s előadó minden száma"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "%s előadó albumai"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "%s lejátszólista betöltése..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "%s könyvtár hozzáadása...\n"
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "%s lejátszólista betöltése..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/it.gmo -> ncmpc-0.27.tar.xz/po/it.gmo Changed

ncmpc-0.24.tar.xz/po/it.po -> ncmpc-0.27.tar.xz/po/it.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-10-31 19:53+0000\n"
 "Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -27,60 +27,48 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Collegandosi a %s... [Preme %s per annullare]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr ""
 "Errore: La versione di MPD %d.%d.%d è troppo vecchia (bisogna avere al meno "
 "la %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Connesso a %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "preme %s per accedere al editore di tasti"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Lista di canzoni mescolata"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Lista di canzoni vuotata"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Errore: La finestra è tropo piccola"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Modo ripetizione attivato"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Modo ripetizione disattivato"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Modo randomizzato attivo"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Modo randomizzato disattivato"
 
@@ -89,11 +77,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Modo singolo attivato"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Modo singolo disattivato"
 
@@ -101,99 +89,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Modo consumazione attivato"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Modo consumazione disattivato"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Database aggiornato"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Modo di ricerca: semplice"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Modo di ricerca: Normale"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Modo di auto-centrato: attivato"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Modo di auto-centrato: disattivato"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Tutte le piste"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Tutti gli artisti"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album del artista: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Tutte le piste del artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Aggiungendo album %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Aggiungendo %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Caricando la lista %s"
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292

ncmpc-0.24.tar.xz/po/ko.gmo -> ncmpc-0.27.tar.xz/po/ko.gmo Changed

ncmpc-0.24.tar.xz/po/ko.po -> ncmpc-0.27.tar.xz/po/ko.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2009-10-16 17:35+0000\n"
 "Last-Translator: Jay Whang <jaypedia@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "%s(으)로 연결중입니다. [취소하려면 %s키를 누르십시오]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "MPD 버전 %d%d%d (은)는 너무 낮습니다. (필요한 버전 %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "%s로 접속함"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "키 편집기 사용을 위하여 %s(을)를 누르십시오."
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "섞여진 연주목록"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "지워진 연주목록"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "오류: 화면이 너무 작습니다."
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "반복 모드 켜짐"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "반복 모드 꺼짐"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "무작위 모드 켜짐"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "무작위 모드 꺼짐"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "싱글 모드 켜짐"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "싱글 모드 꺼짐"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "소비 모드 켜짐"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "소비 모드 꺼짐"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "곡바뀜 %d 초"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "데이터베이스를 업데이트 하였습니다."
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "찾기 방식: 줄 이어짐"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "찾기 방식: 보통"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "자동 가운데 방식: 켜짐"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "자동 가운데 방식: 꺼짐"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "모든 트랙"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "모든 아티스트"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "아티스트의 앨범: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "아티스트의 모든 트랙: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "앨범: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "아티스트의 앨범: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "연주목록 %s(을)를 올리는 중..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "올리는 중..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "연주목록 %s(을)를 올리는 중..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/nb.gmo -> ncmpc-0.27.tar.xz/po/nb.gmo Changed

ncmpc-0.24.tar.xz/po/nb.po -> ncmpc-0.27.tar.xz/po/nb.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc 0.11.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-07-03 16:34+0000\n"
 "Last-Translator: Mathias Bøhn Grytemark <Unknown>\n"
 "Language-Team: no <no@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Kobler til %s... [Trykk %s for å avslutte]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "MPD versjon %d.%d.%d er for gammel - oppgrader til versjon %s"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Koblet til %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "trykk %s for å rette"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Tilfeldigjort spillelisten"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Sletter spillelisten"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Feil: Skjermbildet er for lite"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Repeter er på"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Repeter er av"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr ""
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr ""
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Crossfade %d sekunder"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databasen er oppdatert"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Søkt rundt (starter på ny)"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Søk normalt (til slutt/begynnelse)"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatisk sentrering er på"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering er av"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alle spor"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alle artister"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumer fra artist: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle spor fra artist: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Albumer fra artist: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Henter spilleliste %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "laster..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Henter spilleliste %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/ncmpc.pot -> ncmpc-0.27.tar.xz/po/ncmpc.pot Changed

@@ -9,7 +9,7 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-07-14 11:56+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,59 +18,55 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/max/git/ncmpc/src/i18n.h:42
+#: src/i18n.h:42
 msgid "y"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/i18n.h:43
+#: src/i18n.h:43
 msgid "n"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/main.c:244 /home/max/git/ncmpc/src/main.c:266
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/main.c:294
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/main.c:316
+#: src/main.c:214
 #, c-format
 msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/main.c:496
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/player_command.c:175
-#: /home/max/git/ncmpc/src/screen_queue.c:740
+#: src/player_command.c:174
+#: src/screen_queue.c:739
 msgid "Shuffled queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/player_command.c:185
+#: src/player_command.c:184
 msgid "Cleared queue"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:204 /home/max/git/ncmpc/src/screen.c:271
-msgid "Error: Screen too small"
-msgstr ""
-
-#: /home/max/git/ncmpc/src/screen.c:393
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:394
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:398
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:399
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr ""
 
@@ -79,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: /home/max/git/ncmpc/src/screen.c:408
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:409
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -91,180 +87,187 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: /home/max/git/ncmpc/src/screen.c:417
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:418
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:421
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:433
+#: src/screen.c:198
 msgid "Database updated"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:513
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:514
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:519
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen.c:520
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:72
-#: /home/max/git/ncmpc/src/screen_artist.c:364
+#: src/screen_artist.c:72
+#: src/screen_artist.c:354
 msgid "All tracks"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:396
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:401
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:410
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:413
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:417
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:462
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_artist.c:464
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_browser.c:127
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr ""
 
-#: /home/max/git/ncmpc/src/screen_browser.c:168
-#: /home/max/git/ncmpc/src/screen_browser.c:261
-#: /home/max/git/ncmpc/src/screen_browser.c:286
+#: src/screen_browser.c:168

ncmpc-0.24.tar.xz/po/nl.gmo -> ncmpc-0.27.tar.xz/po/nl.gmo Changed

ncmpc-0.24.tar.xz/po/nl.po -> ncmpc-0.27.tar.xz/po/nl.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-02-24 11:17+0000\n"
 "Last-Translator: Tom Postma <tom-postma@hetnet.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Verbind met %s... [druk %s om af te breken]"
 
-#: src/main.c:339
+#: src/main.c:214
 #, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr ""
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Verbonden met %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr ""
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
 msgstr ""
 
-#: src/player_command.c:187
-msgid "Cleared playlist"
+#: src/player_command.c:184
+msgid "Cleared queue"
 msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Fout: Scherm te klein"
-
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Herhaling modus aan"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Herhaling modus uit"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Willekeurige modus is aan"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Willekeurige modus is uit"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr ""
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr ""
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr ""
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Database bijgewerkt"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr ""
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr ""
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr ""
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr ""
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alle nummers"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alle artiesten"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albums van artiest: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alle nummers van artiest: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Albums van artiest: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Laden afspeellijst %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "laden..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Laden afspeellijst %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"
+#: src/screen_browser.c:168 src/screen_browser.c:261 src/screen_browser.c:286
+#, fuzzy, c-format
+msgid "Adding '%s' to queue"

ncmpc-0.24.tar.xz/po/pl.gmo -> ncmpc-0.27.tar.xz/po/pl.gmo Changed

ncmpc-0.24.tar.xz/po/pl.po -> ncmpc-0.27.tar.xz/po/pl.po Changed

@@ -9,7 +9,7 @@
 "Project-Id-Version: ncmpc 0.19\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-07-23 21:08+0200\n"
 "Last-Translator:  <krzysztof.krakowiak@gmail.com>\n"
 "Language-Team: Polish\n"
@@ -28,58 +28,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Łączenie z %s... [Wciśnij %s by anulować]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Błąd: MPD w wersji %d.%d.%d jest za stary (potrzebny jest %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Połączony z %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "wciśnij %s by odpalić edytor klawiszy"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Przetasowano listę odtwarzania"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Wyczyszczono listę odtwarzania"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Błąd: Ekran za mały"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Tryb powtarzania jest włączony"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Tryb powtarzania jest wyłączony"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Tryb losowy jest włączony"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Tryb losowy jest wyłączony"
 
@@ -88,11 +76,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Tryb pojedynczej piosenki jest włączony"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Tryb pojedynczej piosenki jest wyłączony"
 
@@ -100,99 +88,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Tryb pożerania jest włączony"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Tryb pożerania jest wyłączony"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Przenikaj %d sekund"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Baza zaktualizowana"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Tryb wyszukiwania: Zawinięty"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Tryb wyszukiwania: Normalny"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Tryb automatycznego centrowania: Włączony"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Tryb automatycznego centrowania: Wyłączony"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Wszystkie ścieżki"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Wszyscy artyści"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumy artysty: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Wszystkie piosenki artysty: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Albumy: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Ścieżki bez albumów lub artystów: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Dodawanie albumu %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Dodawanie %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Ładowany listy odtwarzania %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/pt_BR.gmo -> ncmpc-0.27.tar.xz/po/pt_BR.gmo Changed

ncmpc-0.24.tar.xz/po/pt_BR.po -> ncmpc-0.27.tar.xz/po/pt_BR.po Changed

@@ -3,7 +3,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-12-19 01:05+0000\n"
 "Last-Translator: Jamerson Albuquerque Tiossi <jamersontiossi@yahoo.com.br>\n"
 "Language-Team: \n"
@@ -25,58 +25,46 @@
 msgid "n"
 msgstr "n (não)"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Conectando a %s... [Pressione %s para abortar]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Erro: Versão do MPD %d.%d.%d é muito antiga (necessária %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Conectado à %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "press %s para o editor de teclas"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Lista de Reprodução misturada"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Lista de Reprodução apagada"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Erro: Tela é muito pequena"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Modo de Repetição está ligado"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Modo de Repetição está desligado"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Modo Aleatório está ligado"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Modo Aleatório está desligado"
 
@@ -85,11 +73,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Modo de Faixa Única está ligado"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Modo de Faixa Única está desligado"
 
@@ -97,99 +85,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Modo de Deleção de Faixa Reproduzida está ligado"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Modo de Deleção de Faixa Reproduzida está desligado"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Inter-mixagem de %d segundos"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Banco de Dados atualizado"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Modo de Busca: Envolvido"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Modo de Busca: Normal"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Modo de Auto-Centralização: Ligado"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Modo de Auto-Centralização: Desligado"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Todas as faixas"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Todos os artistas"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Álbuns do artista: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Todas as faixas do artista: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Álbum: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Faixas sem álbuns do artista: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Adicionando álbum %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Adicionando %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Carregando Lista de Reprodução %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/ru.gmo -> ncmpc-0.27.tar.xz/po/ru.gmo Changed

ncmpc-0.24.tar.xz/po/ru.po -> ncmpc-0.27.tar.xz/po/ru.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-01-05 21:31+0100\n"
 "Last-Translator: Max Arnold <lwarxx@gmail.com>\n"
 "Language-Team: ru <ru@li.org>\n"
@@ -25,58 +25,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Подключение к %s...  [Нажмите %s для отмены]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Ошибка: MPD версии %d.%d.%d устарел (необходим %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Подключено к %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "%s - редактор клавиш"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Плейлист перемешан"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Плейлист очищен"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Ошибка: экран слишком мал"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Повтор включен"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Повтор выключен"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Случайный режим включен"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Случайный режим выключен"
 
@@ -85,11 +73,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Одиночный режим включен"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Одиночный режим выключен"
 
@@ -97,99 +85,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Режим удаления после проигрывания включен"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Режим удаления после проигрывания выключен"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Плавный переход %d секунд"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "База обновлена"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Режим поиска: циклический"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Режим поиска: нормальный"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Режим автоцентрирования: вкл."
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Режим автоцентрирования: выкл."
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Все композиции"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Все исполнители"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Альбомы исполнителя: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Все композиции исполнителя: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Альбом: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Композиции исполнителя: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Добавляется альбом %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Добавляется %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Загружается плейлист %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/sk.gmo -> ncmpc-0.27.tar.xz/po/sk.gmo Changed

ncmpc-0.24.tar.xz/po/sk.po -> ncmpc-0.27.tar.xz/po/sk.po Changed

@@ -7,7 +7,7 @@
 "Project-Id-Version: ncmpc 0.11.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-04-07 01:36+0000\n"
 "Last-Translator: Roman Horník <Unknown>\n"
 "Language-Team: sk <sk@li.org>\n"
@@ -26,58 +26,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Pripájam sa k %s... [Stlačte %s pre zrušenie]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Chyba: MPD verzie %d.%d.%d je príliš staré (%s je potrebná)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Pripojený k %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "stlačte %s pre editor klávesov"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Zamiešaný playlist"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Vyčistený playlist"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Chyba: Okno je príliš malé"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Režim opakovania zapnutý"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Režim opakovania vypnutý"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Náhodný režim zapnutý"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Náhodný režim vypnutý"
 
@@ -86,11 +74,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Jednotlivý režim zapnutý"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Jednotlivý režim vypnutý"
 
@@ -98,99 +86,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Spotrebný režim zapnutý"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Spotrebný režim vypnutý"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Prelínanie %d sekúnd"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databáza aktualizovaná"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Režim vyhľadávania: Zabalený"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Režim vyhľadávanie: Normálny"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatické centrovanie: Zapnuté"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatické centrovanie: Vypnuté"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Všetky stopy"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Všetci interpreti"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Albumy od interpreta: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Všetky stopy od interpreta: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Albumy od interpreta: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Nahrávam playlist %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "Pridávam adresár %s...\n"
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Nahrávam playlist %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/sv.gmo -> ncmpc-0.27.tar.xz/po/sv.gmo Changed

ncmpc-0.24.tar.xz/po/sv.po -> ncmpc-0.27.tar.xz/po/sv.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc 0.12\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2010-04-14 05:21+0000\n"
 "Last-Translator: Rickard Närström <rickard.narstrom@gmail.com>\n"
 "Language-Team: sv <sv@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Ansluter till %s... [Tryck %s för att avbryta]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Fel: MPD version %d.%d.%d är för gammal (%s krävs)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Ansluten till %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "tryck på %s för att korrigera"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Spellistan slumpsorterades"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Spellistan rensad"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Fel: Terminalen är för liten"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Upprepningsläge på"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Upprepningsläge av"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Slumpningsläge på"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Slumpningsläge av"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr ""
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr ""
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Förtäringsläge på"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Förtäringsläge av"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Mjuk övergång %d sekunder"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "Databas uppdaterad"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Sökläge: Börja om"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Sökläge: Till början/slut"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Automatisk centrering påslaget"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Automatisk centrering avslaget"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Alla spår"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Alla artister"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Album av artist: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Alla spår av artist: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Album: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, fuzzy, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Album av artist: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, fuzzy, c-format
 msgid "Adding album %s..."
 msgstr "Laddar spellista %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, fuzzy, c-format
 msgid "Adding %s..."
 msgstr "laddar..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Laddar spellista %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/uk.gmo -> ncmpc-0.27.tar.xz/po/uk.gmo Changed

ncmpc-0.24.tar.xz/po/uk.po -> ncmpc-0.27.tar.xz/po/uk.po Changed

@@ -7,7 +7,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-08-11 10:30+0300\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -28,58 +28,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr "невідомо"
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "Встановлення з'єднання з %s...  [Натисніть %s щоб припинити]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "Помилка: MPD версії %d.%d.%d застаріла (необхідна %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "Встановлене з'єднання з %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "натисніть %s щоб редагувати клавіші"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "Перемішаний перелік програвання"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "Очищений перелік програвання"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "Помилка: екран занадто маленький"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "Режим повторення увімкнений"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "Режим повторення вимкнений"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "Режим випадкового програвання увімкнений"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "Режим випадкового програвання вимкнений"
 
@@ -88,11 +76,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "Режим повторення однієї доріжки увімкнений"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "Режим повторення однієї доріжки вимкнений"
 
@@ -100,99 +88,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "Режим вичерпання увімкнений"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "Режим вичерпання вимкнений"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "Плавний перехід: %dс"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "База даних оновлена"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "Режим пошуку: завернутий (розділений???)"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "Режим пошуку: звичайний"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "Режим автоматичного центрування: увімкнено"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "Режим автоматичного центрування: вимкнено"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "Всі доріжки"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "Всі виконавці"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "Альбоми виконавця: %s"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "Всі доріжки виконавця: %s"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "Альбом: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "Доріжки без альбому виконавця: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "Додається альбом %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "Додається %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "Завантажується перелік програвання %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/po/zh_CN.gmo -> ncmpc-0.27.tar.xz/po/zh_CN.gmo Changed

ncmpc-0.24.tar.xz/po/zh_CN.po -> ncmpc-0.27.tar.xz/po/zh_CN.po Changed

@@ -8,7 +8,7 @@
 "Project-Id-Version: ncmpc\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-04-11 10:23+0200\n"
+"POT-Creation-Date: 2017-03-20 21:11+0100\n"
 "PO-Revision-Date: 2011-05-12 15:00+0000\n"
 "Last-Translator: snowdream <yanghui1986527@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -27,58 +27,46 @@
 msgid "n"
 msgstr "n"
 
-#: src/main.c:245 ../src/main.c:267 ../src/main.c:290
+#: src/main.c:154 src/main.c:173
 msgid "unknown"
 msgstr ""
 
-#: src/main.c:315
+#: src/main.c:193
 #, c-format
 msgid "Connecting to %s...  [Press %s to abort]"
 msgstr "连接到 %s... [按 %s 键取消]"
 
-#: src/main.c:339
-#, c-format
-msgid "Error: MPD version %d.%d.%d is to old (%s needed)"
+#: src/main.c:214
+#, fuzzy, c-format
+msgid "Error: MPD version %d.%d.%d is too old (%s needed)"
 msgstr "错误: MPD版本%d.%d.%d过低(需要 %s)"
 
-#: src/main.c:358
-#, c-format
-msgid "Connected to %s"
-msgstr "连接到 %s"
-
-#. to translators: a key was bound twice in the key editor,
-#. and this is a hint for the user what to press to correct
-#. that
-#: src/main.c:529
+#: src/main.c:339
 #, c-format
 msgid "press %s for the key editor"
 msgstr "按 %s 编辑快捷键"
 
-#: src/player_command.c:177 ../src/screen_queue.c:755
-msgid "Shuffled playlist"
-msgstr "乱序播放列表"
-
-#: src/player_command.c:187
-msgid "Cleared playlist"
-msgstr "清空播放列表"
+#: src/player_command.c:174 src/screen_queue.c:739
+msgid "Shuffled queue"
+msgstr ""
 
-#: src/screen.c:206 ../src/screen.c:273
-msgid "Error: Screen too small"
-msgstr "错误: 屏幕太小"
+#: src/player_command.c:184
+msgid "Cleared queue"
+msgstr ""
 
-#: src/screen.c:395
+#: src/screen.c:158
 msgid "Repeat mode is on"
 msgstr "重复播放 开"
 
-#: src/screen.c:396
+#: src/screen.c:159
 msgid "Repeat mode is off"
 msgstr "重复播放 关"
 
-#: src/screen.c:400
+#: src/screen.c:163
 msgid "Random mode is on"
 msgstr "随机播放 开"
 
-#: src/screen.c:401
+#: src/screen.c:164
 msgid "Random mode is off"
 msgstr "随机播放 关"
 
@@ -87,11 +75,11 @@
 #. automatically stop
 #. after playing one
 #. single song
-#: src/screen.c:410
+#: src/screen.c:173
 msgid "Single mode is on"
 msgstr "单曲播放 开"
 
-#: src/screen.c:411
+#: src/screen.c:174
 msgid "Single mode is off"
 msgstr "单曲播放 关"
 
@@ -99,99 +87,98 @@
 #. that MPD removes each
 #. song which has
 #. finished playing
-#: src/screen.c:419
+#: src/screen.c:182
 msgid "Consume mode is on"
 msgstr "消除模式 开"
 
-#: src/screen.c:420
+#: src/screen.c:183
 msgid "Consume mode is off"
 msgstr "消除模式 关"
 
-#: src/screen.c:423
+#: src/screen.c:186
 #, c-format
 msgid "Crossfade %d seconds"
 msgstr "淡入淡出 %d 秒"
 
-#: src/screen.c:435
+#: src/screen.c:198
 msgid "Database updated"
 msgstr "数据库已更新"
 
-#: src/screen.c:515
+#: src/screen.c:256
 msgid "Find mode: Wrapped"
 msgstr "查找模式: 循环"
 
-#: src/screen.c:516
+#: src/screen.c:257
 msgid "Find mode: Normal"
 msgstr "查找模式: 普通"
 
-#: src/screen.c:521
+#: src/screen.c:262
 msgid "Auto center mode: On"
 msgstr "自动居中模式: 开"
 
-#: src/screen.c:522
+#: src/screen.c:263
 msgid "Auto center mode: Off"
 msgstr "自动居中模式: 关"
 
-#: src/screen_artist.c:75 ../src/screen_artist.c:366
+#: src/screen_artist.c:72 src/screen_artist.c:354
 msgid "All tracks"
 msgstr "全部音轨"
 
-#: src/screen_artist.c:398
+#: src/screen_artist.c:386
 #, c-format
 msgid "All artists"
 msgstr "全部艺术家"
 
-#: src/screen_artist.c:403
+#: src/screen_artist.c:391
 #, c-format
 msgid "Albums of artist: %s"
 msgstr "%s 的专辑:"
 
-#: src/screen_artist.c:412
+#: src/screen_artist.c:400
 #, c-format
 msgid "All tracks of artist: %s"
 msgstr "%s 的所有曲目"
 
-#: src/screen_artist.c:415
+#: src/screen_artist.c:403
 #, c-format
 msgid "Album: %s - %s"
 msgstr "专辑: %s - %s"
 
-#: src/screen_artist.c:419
+#: src/screen_artist.c:407
 #, c-format
 msgid "Tracks of no album of artist: %s"
 msgstr "艺术家的无专辑曲目: %s"
 
-#: src/screen_artist.c:466
+#: src/screen_artist.c:452
 #, c-format
 msgid "Adding album %s..."
 msgstr "添加专辑 %s..."
 
-#: src/screen_artist.c:468
+#: src/screen_artist.c:454
 #, c-format
 msgid "Adding %s..."
 msgstr "添加 %s..."
 
-#: src/screen_browser.c:131
+#: src/screen_browser.c:127
 #, c-format
 msgid "Loading playlist %s..."
 msgstr "加载播放列表 %s..."
 
-#: src/screen_browser.c:172 ../src/screen_browser.c:267
-#: src/screen_browser.c:292
-#, c-format
-msgid "Adding '%s' to playlist"

ncmpc-0.24.tar.xz/src/Compiler.h -> ncmpc-0.27.tar.xz/src/Compiler.h Changed

@@ -20,19 +20,44 @@
 #ifndef COMPILER_H
 #define COMPILER_H
 
-#define GCC_CHECK_VERSION(major, minor) \
-  (defined(__GNUC__) &&                                                 \
-   (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor))))
+#define GCC_MAKE_VERSION(major, minor, patchlevel) ((major) * 10000 + (minor) * 100 + patchlevel)
 
 #ifdef __GNUC__
-#define GCC_VERSION (__GNUC__ * 10000 \
-                     + __GNUC_MINOR__ * 100 \
-                     + __GNUC_PATCHLEVEL__)
+#  define GCC_VERSION GCC_MAKE_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#else
+#  define GCC_VERSION 0
+#endif
+
+#ifdef __clang__
+#  define CLANG_VERSION GCC_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)
 #else
-#define GCC_VERSION 0
+#  define CLANG_VERSION 0
 #endif
 
-#if GCC_CHECK_VERSION(4,0)
+/**
+ * Are we building with the specified version of gcc (not clang or any
+ * other compiler) or newer?
+ */
+#define GCC_CHECK_VERSION(major, minor) \
+  (!CLANG_VERSION && \
+   GCC_VERSION >= GCC_MAKE_VERSION(major, minor, 0))
+
+/**
+ * Are we building with clang (any version) or at least the specified
+ * gcc version?
+ */
+#define CLANG_OR_GCC_VERSION(major, minor) \
+  (CLANG_VERSION || GCC_CHECK_VERSION(major, minor))
+
+/**
+ * Are we building with gcc (not clang or any other compiler) and a
+ * version older than the specified one?
+ */
+#define GCC_OLDER_THAN(major, minor) \
+  (GCC_VERSION && !CLANG_VERSION && \
+   GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0))
+
+#if CLANG_OR_GCC_VERSION(4,0)
 
 /* GCC 4.x */
 
@@ -92,7 +117,7 @@
 
 #endif
 
-#if GCC_CHECK_VERSION(4,3)
+#if CLANG_OR_GCC_VERSION(4,3)
 
 #define gcc_hot __attribute__((hot))
 #define gcc_cold __attribute__((cold))
@@ -104,7 +129,7 @@
 
 #endif /* ! GCC_UNUSED >= 40300 */
 
-#if GCC_CHECK_VERSION(4,6) && !defined(__clang__)
+#if GCC_CHECK_VERSION(4,6)
 #define gcc_flatten __attribute__((flatten))
 #else
 #define gcc_flatten
@@ -113,7 +138,7 @@
 #ifndef __cplusplus
 /* plain C99 has "restrict" */
 #define gcc_restrict restrict
-#elif GCC_CHECK_VERSION(4,0)
+#elif CLANG_OR_GCC_VERSION(4,0)
 /* "__restrict__" is a GCC extension for C++ */
 #define gcc_restrict __restrict__
 #else
@@ -126,12 +151,12 @@
 #if defined(__cplusplus)
 
 /* support for C++11 "override" was added in gcc 4.7 */
-#if !defined(__clang__) && !GCC_CHECK_VERSION(4,7)
+#if GCC_OLDER_THAN(4,7)
 #define override
 #define final
 #endif
 
-#if defined(__clang__) || GCC_CHECK_VERSION(4,8)
+#if CLANG_OR_GCC_VERSION(4,8)
 #define gcc_alignas(T, fallback) alignas(T)
 #else
 #define gcc_alignas(T, fallback) gcc_aligned(fallback)

ncmpc-0.27.tar.xz/src/aconnect.c Added

@@ -0,0 +1,163 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "aconnect.h"
+#include "net/async_rconnect.h"
+#include "net/socket.h"
+#include "Compiler.h"
+
+#include <mpd/client.h>
+#include <mpd/async.h>
+
+#include <glib.h>
+
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
+struct aconnect {
+	const struct aconnect_handler *handler;
+	void *handler_ctx;
+
+	struct async_rconnect *rconnect;
+
+	int fd;
+	guint source_id;
+};
+
+static gboolean
+aconnect_source_callback(gcc_unused GIOChannel *source,
+			 gcc_unused GIOCondition condition,
+			 gpointer data)
+{
+	struct aconnect *ac = data;
+	assert(ac->source_id != 0);
+	ac->source_id = 0;
+
+	char buffer[256];
+	ssize_t nbytes = recv(ac->fd, buffer, sizeof(buffer) - 1, 0);
+	if (nbytes < 0) {
+		snprintf(buffer, sizeof(buffer),
+			 "Failed to receive from MPD: %s",
+			 strerror(errno));
+		close_socket(ac->fd);
+		ac->handler->error(buffer, ac->handler_ctx);
+		g_free(ac);
+		return false;
+	}
+
+	if (nbytes == 0) {
+		close_socket(ac->fd);
+		ac->handler->error("MPD closed the connection",
+				   ac->handler_ctx);
+		g_free(ac);
+		return false;
+	}
+
+	buffer[nbytes] = 0;
+
+	struct mpd_async *async = mpd_async_new(ac->fd);
+	if (async == NULL) {
+		close_socket(ac->fd);
+		ac->handler->error("Out of memory", ac->handler_ctx);
+		g_free(ac);
+		return false;
+	}
+
+	struct mpd_connection *c = mpd_connection_new_async(async, buffer);
+	if (c == NULL) {
+		mpd_async_free(async);
+		ac->handler->error("Out of memory", ac->handler_ctx);
+		g_free(ac);
+		return false;
+	}
+
+	ac->handler->success(c, ac->handler_ctx);
+	g_free(ac);
+	return false;
+}
+
+static void
+aconnect_rconnect_success(int fd, void *ctx)
+{
+	struct aconnect *ac = ctx;
+	assert(ac->rconnect != NULL);
+	ac->rconnect = NULL;
+
+	ac->fd = fd;
+
+	GIOChannel *channel = g_io_channel_unix_new(fd);
+	ac->source_id = g_io_add_watch(channel, G_IO_IN,
+				       aconnect_source_callback, ac);
+	g_io_channel_unref(channel);
+}
+
+static void
+aconnect_rconnect_error(const char *message, void *ctx)
+{
+	struct aconnect *ac = ctx;
+	assert(ac->rconnect != NULL);
+	ac->rconnect = NULL;
+
+	ac->handler->error(message, ac->handler_ctx);
+	g_free(ac);
+}
+
+static const struct async_rconnect_handler aconnect_rconnect_handler = {
+	.success = aconnect_rconnect_success,
+	.error = aconnect_rconnect_error,
+};
+
+void
+aconnect_start(struct aconnect **acp,
+	       const char *host, unsigned port,
+	       const struct aconnect_handler *handler, void *ctx)
+{
+	struct aconnect *ac = g_new(struct aconnect, 1);
+	ac->handler = handler;
+	ac->handler_ctx = ctx;
+
+	*acp = ac;
+
+	async_rconnect_start(&ac->rconnect, host, port,
+			     &aconnect_rconnect_handler, ac);
+}
+
+void
+aconnect_cancel(struct aconnect *ac)
+{
+	if (ac->rconnect != NULL)
+		async_rconnect_cancel(ac->rconnect);
+	else {
+		g_source_remove(ac->source_id);
+		close_socket(ac->fd);
+	}
+
+	g_free(ac);
+}

ncmpc-0.27.tar.xz/src/aconnect.h Added

@@ -0,0 +1,50 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef ACONNECT_H
+#define ACONNECT_H
+
+#include <mpd/client.h>
+
+struct mpd_connection;
+struct aconnect;
+
+struct aconnect_handler {
+	void (*success)(struct mpd_connection *c, void *ctx);
+	void (*error)(const char *message, void *ctx);
+};
+
+void
+aconnect_start(struct aconnect **acp,
+	       const char *host, unsigned port,
+	       const struct aconnect_handler *handler, void *ctx);
+
+void
+aconnect_cancel(struct aconnect *ac);
+
+#endif

ncmpc-0.27.tar.xz/src/callbacks.c Added

@@ -0,0 +1,65 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "callbacks.h"
+#include "screen_utils.h"
+#include "screen_status.h"
+#include "mpdclient.h"
+
+static bool
+_mpdclient_auth_callback(struct mpdclient *c, gint recursion)
+{
+	struct mpd_connection *connection = mpdclient_get_connection(c);
+	if (connection == NULL)
+		return false;
+
+	mpd_connection_clear_error(connection);
+	if (recursion > 2)
+		return false;
+
+	char *password = screen_read_password(NULL);
+	if (password == NULL)
+		return false;
+
+	mpd_send_password(connection, password);
+	g_free(password);
+
+	mpd_response_finish(connection);
+	mpdclient_update(c);
+
+	if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
+	    mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_PASSWORD)
+		return _mpdclient_auth_callback(c, ++recursion);
+
+	return true;
+}
+
+bool
+mpdclient_auth_callback(struct mpdclient *c)
+{
+	return _mpdclient_auth_callback(c, 0);
+}
+
+void
+mpdclient_error_callback(const char *message)
+{
+	screen_status_message(message);
+	screen_bell();
+	doupdate();
+}

ncmpc-0.27.tar.xz/src/callbacks.h Added

@@ -0,0 +1,64 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef NCMPC_CALLBACKS_H
+#define NCMPC_CALLBACKS_H
+
+#include <mpd/client.h>
+
+#include <stdbool.h>
+
+struct mpdclient;
+
+/**
+ * A connection to MPD has been established.
+ */
+void
+mpdclient_connected_callback(void);
+
+/**
+ * An attempt to connect to MPD has failed.
+ * mpdclient_error_callback() has been called already.
+ */
+void
+mpdclient_failed_callback(void);
+
+/**
+ * The connection to MPD was lost.  If this was due to an error, then
+ * mpdclient_error_callback() has already been called.
+ */
+void
+mpdclient_lost_callback(void);
+
+/**
+ * To be implemented by the application: mpdclient.c calls this to
+ * display an error message.
+ *
+ * @param message a human-readable error message in the locale charset
+ */
+void
+mpdclient_error_callback(const char *message);
+
+bool
+mpdclient_auth_callback(struct mpdclient *c);
+
+void
+mpdclient_idle_callback(enum mpd_idle events);
+
+#endif

ncmpc-0.24.tar.xz/src/charset.c -> ncmpc-0.27.tar.xz/src/charset.c Changed

ncmpc-0.24.tar.xz/src/charset.h -> ncmpc-0.27.tar.xz/src/charset.h Changed

ncmpc-0.24.tar.xz/src/colors.c -> ncmpc-0.27.tar.xz/src/colors.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -80,7 +80,7 @@
 	return NULL;
 }
 
-static int
+static void
 colors_update_pair(enum color id)
 {
 	assert(id > 0 && id < COLOR_END);
@@ -93,7 +93,6 @@
 	init_pair(id,
 		(fg < 0 ? -1 : fg),
 		(bg < 0 ? -1 : bg));
-	return 0;
 }
 
 int
@@ -152,7 +151,8 @@
 			if (cur != endptr && endptr[0] == '\0') {
 				color |= tmp;
 			} else {
-				fprintf(stderr,_("Warning: Unknown color - %s\n"), str);
+				fprintf(stderr, "%s: %s\n",
+					_("Unknown color"), str);
 				return COLOR_ERROR;
 			}
 		}
@@ -165,13 +165,13 @@
 /* This function is called from conf.c before curses have been started,
  * it adds the definition to the color_definition_list and init_color() is
  * done in colors_start() */
-int
+bool
 colors_define(const char *name, short r, short g, short b)
 {
 	int color = colors_str2color(name);
 
 	if (color < 0)
-		return color;
+		return false;
 
 	color_definition_entry_t *entry =
 		g_malloc(sizeof(color_definition_entry_t));
@@ -182,29 +182,29 @@
 
 	color_definition_list = g_list_append(color_definition_list, entry);
 
-	return 0;
+	return true;
 }
 
-int
+bool
 colors_assign(const char *name, const char *value)
 {
 	color_entry_t *entry = colors_lookup_by_name(name);
 
 	if (!entry) {
-		fprintf(stderr,_("Warning: Unknown color field - %s\n"), name);
-		return -1;
+		fprintf(stderr, "%s: %s",
+			_("Unknown color field"), name);
+		return false;
 	}
 
 	const int color = colors_str2color(value);
 	if (color == COLOR_ERROR)
-		return -1;
+		return false;
 
 	entry->color = color;
-	return 0;
+	return true;
 }
 
-
-int
+void
 colors_start(void)
 {
 	if (has_colors()) {
@@ -240,22 +240,13 @@
 
 	/* free the color_definition_list */
 	if (color_definition_list) {
-		GList *list = color_definition_list;
-
-		while (list) {
-			g_free(list->data);
-			list=list->next;
-		}
-
-		g_list_free(color_definition_list);
+		g_list_free_full(color_definition_list, g_free);
 		color_definition_list = NULL;
 	}
-
-	return 0;
 }
 #endif
 
-int
+void
 colors_use(WINDOW *w, enum color id)
 {
 	color_entry_t *entry = &colors[id];
@@ -279,6 +270,4 @@
 #ifdef ENABLE_COLORS
 	}
 #endif
-
-	return 0;
 }

ncmpc-0.24.tar.xz/src/colors.h -> ncmpc-0.27.tar.xz/src/colors.h Changed

ncmpc-0.24.tar.xz/src/command.c -> ncmpc-0.27.tar.xz/src/command.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -18,12 +18,10 @@
  */
 
 #include "command.h"
-#include "config.h"
-#include "ncmpc.h"
 #include "i18n.h"
-#include "mpdclient.h"
-#include "screen.h"
+#include "ncmpc_curses.h"
 
+#include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
@@ -89,9 +87,9 @@
 	{ { 'v',  0, 0 }, 0, CMD_LIST_RANGE_SELECT, "range-select",
 	  N_("Range selection") },
 	{ { C('N'),  0, 0 }, 0, CMD_LIST_SCROLL_DOWN_LINE, "scroll-down-line",
-	  N_("Scroll up one line") },
-	{ { C('B'),  0, 0 }, 0, CMD_LIST_SCROLL_UP_LINE, "scroll-up-line",
 	  N_("Scroll down one line") },
+	{ { C('B'),  0, 0 }, 0, CMD_LIST_SCROLL_UP_LINE, "scroll-up-line",
+	  N_("Scroll up one line") },
 	{ { 'N',  0, 0 }, 0, CMD_LIST_SCROLL_DOWN_HALF, "scroll-down-half",
 	  N_("Scroll up half a screen") },
 	{ { 'B',  0, 0 }, 0, CMD_LIST_SCROLL_UP_HALF, "scroll-up-half",
@@ -438,21 +436,6 @@
 	return find_key_command(key, cmds);
 }
 
-command_t
-get_keyboard_command(void)
-{
-	int key = wgetch(stdscr);
-	if (key == ERR || key == '\0')
-		return CMD_NONE;
-
-#ifdef HAVE_GETMOUSE
-	if (key == KEY_MOUSE)
-		return CMD_MOUSE_EVENT;
-#endif
-
-	return get_key_command(key);
-}
-
 bool
 assign_keys(command_t command, int keys[MAX_COMMAND_KEYS])
 {

ncmpc-0.24.tar.xz/src/command.h -> ncmpc-0.27.tar.xz/src/command.h Changed

ncmpc-0.24.tar.xz/src/conf.c -> ncmpc-0.27.tar.xz/src/conf.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -209,12 +209,12 @@
 	return g_strchug(value);
 }
 
-static int
+static bool
 parse_color(char *str)
 {
 	char *value = separate_value(str);
 	if (value == NULL)
-		return -1;
+		return false;
 
 	return colors_assign(str, value);
 }
@@ -239,19 +239,19 @@
 	return comma;
 }
 
-static int
+static bool
 parse_color_definition(char *str)
 {
 	char *value = separate_value(str);
 	if (value == NULL)
-		return -1;
+		return false;
 
 	/* get the command name */
 	short color = colors_str2color(str);
 	if (color < 0) {
 		char buf[MAX_LINE_LENGTH];
 		print_error(_("Bad color name"), buf);
-		return -1;
+		return false;
 	}
 
 	/* parse r,g,b values */
@@ -261,13 +261,13 @@
 		char *next = after_comma(value), *endptr;
 		if (*value == 0) {
 			print_error(_("Incomplete color definition"), str);
-			return -1;
+			return false;
 		}
 
 		rgb[i] = strtol(value, &endptr, 0);
 		if (endptr == value || *endptr != 0) {
 			print_error(_("Invalid number"), value);
-			return -1;
+			return false;
 		}
 
 		value = next;
@@ -275,7 +275,7 @@
 
 	if (*value != 0) {
 		print_error(_("Malformed color definition"), str);
-		return -1;
+		return false;
 	}
 
 	return colors_define(str, rgb[0], rgb[1], rgb[2]);
@@ -501,11 +501,8 @@
 		g_free(options.scroll_sep);
 		options.scroll_sep = get_format(value);
 	} else if (!strcasecmp(CONF_DISPLAY_TIME, name))
-#ifdef NCMPC_MINI
+		/* obsolete, ignore */
 		{}
-#else
-		options.display_time = str2bool(value);
-#endif
 	else if (!strcasecmp(CONF_JUMP_PREFIX_ONLY, name))
 #ifdef NCMPC_MINI
 		{}

ncmpc-0.24.tar.xz/src/conf.h -> ncmpc-0.27.tar.xz/src/conf.h Changed

ncmpc-0.27.tar.xz/src/db_completion.c Added

@@ -0,0 +1,65 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "db_completion.h"
+#include "charset.h"
+#include "mpdclient.h"
+
+GList *
+gcmp_list_from_path(struct mpdclient *c, const gchar *path,
+		    GList *list, gint types)
+{
+	struct mpd_connection *connection = mpdclient_get_connection(c);
+	if (connection == NULL)
+		return list;
+
+	mpd_send_list_meta(connection, path);
+
+	struct mpd_entity *entity;
+	while ((entity = mpd_recv_entity(connection)) != NULL) {
+		char *name;
+
+		if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY &&
+		    types & GCMP_TYPE_DIR) {
+			const struct mpd_directory *dir =
+				mpd_entity_get_directory(entity);
+			gchar *tmp = utf8_to_locale(mpd_directory_get_path(dir));
+			name = g_strconcat(tmp, "/", NULL);
+			g_free(tmp);
+		} else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG &&
+			   types & GCMP_TYPE_FILE) {
+			const struct mpd_song *song =
+				mpd_entity_get_song(entity);
+			name = utf8_to_locale(mpd_song_get_uri(song));
+		} else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST &&
+			   types & GCMP_TYPE_PLAYLIST) {
+			const struct mpd_playlist *playlist =
+				mpd_entity_get_playlist(entity);
+			name = utf8_to_locale(mpd_playlist_get_path(playlist));
+		} else {
+			mpd_entity_free(entity);
+			continue;
+		}
+
+		list = g_list_append(list, name);
+		mpd_entity_free(entity);
+	}
+
+	return list;
+}

ncmpc-0.27.tar.xz/src/db_completion.h Added

@@ -0,0 +1,40 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef DB_COMPLETION_H
+#define DB_COMPLETION_H
+
+#include <glib.h>
+
+struct mpdclient;
+
+#define GCMP_TYPE_DIR       (0x01 << 0)
+#define GCMP_TYPE_FILE      (0x01 << 1)
+#define GCMP_TYPE_PLAYLIST  (0x01 << 2)
+#define GCMP_TYPE_RFILE     (GCMP_TYPE_DIR | GCMP_TYPE_FILE)
+#define GCMP_TYPE_RPLAYLIST (GCMP_TYPE_DIR | GCMP_TYPE_PLAYLIST)
+
+/**
+ * Create a list suitable for GCompletion from path.
+ */
+GList *
+gcmp_list_from_path(struct mpdclient *c, const gchar *path,
+		    GList *list, gint types);
+
+#endif

ncmpc-0.24.tar.xz/src/defaults.h -> ncmpc-0.27.tar.xz/src/defaults.h Changed

ncmpc-0.24.tar.xz/src/filelist.c -> ncmpc-0.27.tar.xz/src/filelist.c Changed

ncmpc-0.24.tar.xz/src/filelist.h -> ncmpc-0.27.tar.xz/src/filelist.h Changed

ncmpc-0.24.tar.xz/src/gidle.c -> ncmpc-0.27.tar.xz/src/gidle.c Changed

ncmpc-0.24.tar.xz/src/gidle.h -> ncmpc-0.27.tar.xz/src/gidle.h Changed

ncmpc-0.24.tar.xz/src/hscroll.c -> ncmpc-0.27.tar.xz/src/hscroll.c Changed

ncmpc-0.24.tar.xz/src/hscroll.h -> ncmpc-0.27.tar.xz/src/hscroll.h Changed

ncmpc-0.24.tar.xz/src/i18n.h -> ncmpc-0.27.tar.xz/src/i18n.h Changed

ncmpc-0.27.tar.xz/src/keyboard.c Added

@@ -0,0 +1,88 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "keyboard.h"
+#include "command.h"
+#include "ncmpc.h"
+#include "ncmpc_curses.h"
+#include "screen.h"
+#include "Compiler.h"
+
+#include <glib.h>
+
+#include <unistd.h>
+
+static bool
+ignore_key(int key)
+{
+	return key == ERR || key == '\0';
+}
+
+gcc_pure
+static command_t
+translate_key(int key)
+{
+#ifdef HAVE_GETMOUSE
+	if (key == KEY_MOUSE)
+		return CMD_MOUSE_EVENT;
+#endif
+
+	return get_key_command(key);
+}
+
+static gboolean
+keyboard_event(gcc_unused GIOChannel *source,
+	       gcc_unused GIOCondition condition,
+	       gcc_unused gpointer data)
+{
+	int key = wgetch(screen.main_window.w);
+	if (ignore_key(key))
+		return true;
+
+	command_t cmd = translate_key(key);
+	if (cmd == CMD_NONE)
+		return true;
+
+	begin_input_event();
+
+	if (!do_input_event(cmd))
+		return FALSE;
+
+	end_input_event();
+	return TRUE;
+}
+
+void
+keyboard_init(void)
+{
+	GIOChannel *channel = g_io_channel_unix_new(STDIN_FILENO);
+	g_io_add_watch(channel, G_IO_IN, keyboard_event, NULL);
+	g_io_channel_unref(channel);
+}
+
+void
+keyboard_unread(int key)
+{
+	if (ignore_key(key))
+		return;
+
+	command_t cmd = translate_key(key);
+	if (cmd != CMD_NONE)
+		do_input_event(cmd);
+}

ncmpc-0.27.tar.xz/src/keyboard.h Added

ncmpc-0.24.tar.xz/src/lirc.c -> ncmpc-0.27.tar.xz/src/lirc.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -23,32 +23,11 @@
 
 #include <lirc/lirc_client.h>
 
-static struct lirc_config *lc = NULL;
-
-int ncmpc_lirc_open()
-{
-	char prog[] = "ncmpc";
-	int lirc_socket = 0;
+#include <glib.h>
 
-	if ((lirc_socket = lirc_init(prog, 0)) == -1)
-		return -1;
-
-	if (lirc_readconfig(NULL, &lc, NULL)) {
-		lirc_deinit();
-		return -1;
-	}
-
-	return lirc_socket;
-}
-
-void ncmpc_lirc_close()
-{
-	if (lc)
-		lirc_freeconfig(lc);
-	lirc_deinit();
-}
+static struct lirc_config *lc = NULL;
 
-gboolean
+static gboolean
 lirc_event(gcc_unused GIOChannel *source,
 	   gcc_unused GIOCondition condition, gcc_unused gpointer data)
 {
@@ -60,7 +39,7 @@
 	if (lirc_nextcode(&code) == 0) {
 		while (lirc_code2char(lc, code, &txt) == 0 && txt != NULL) {
 			cmd = get_key_command_from_name(txt);
-			if (do_input_event(cmd) != 0)
+			if (!do_input_event(cmd))
 				return FALSE;
 		}
 	}
@@ -68,3 +47,30 @@
 	end_input_event();
 	return TRUE;
 }
+
+void
+ncmpc_lirc_init()
+{
+	char prog[] = "ncmpc";
+	int lirc_socket = 0;
+
+	if ((lirc_socket = lirc_init(prog, 0)) == -1)
+		return;
+
+	if (lirc_readconfig(NULL, &lc, NULL)) {
+		lirc_deinit();
+		return;
+	}
+
+	GIOChannel *channel = g_io_channel_unix_new(lirc_socket);
+	g_io_add_watch(channel, G_IO_IN, lirc_event, NULL);
+	g_io_channel_unref(channel);
+}
+
+void
+ncmpc_lirc_deinit()
+{
+	if (lc)
+		lirc_freeconfig(lc);
+	lirc_deinit();
+}

ncmpc-0.24.tar.xz/src/lirc.h -> ncmpc-0.27.tar.xz/src/lirc.h Changed

ncmpc-0.24.tar.xz/src/list_window.c -> ncmpc-0.27.tar.xz/src/list_window.c Changed

ncmpc-0.24.tar.xz/src/list_window.h -> ncmpc-0.27.tar.xz/src/list_window.h Changed

ncmpc-0.24.tar.xz/src/lyrics.c -> ncmpc-0.27.tar.xz/src/lyrics.c Changed

ncmpc-0.24.tar.xz/src/lyrics.h -> ncmpc-0.27.tar.xz/src/lyrics.h Changed

ncmpc-0.24.tar.xz/src/main.c -> ncmpc-0.27.tar.xz/src/main.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -20,17 +20,20 @@
 #include "config.h"
 #include "ncmpc.h"
 #include "mpdclient.h"
-#include "gidle.h"
+#include "callbacks.h"
 #include "charset.h"
 #include "options.h"
 #include "command.h"
 #include "ncu.h"
 #include "screen.h"
-#include "screen_utils.h"
 #include "screen_status.h"
+#include "xterm_title.h"
 #include "strfsong.h"
 #include "i18n.h"
 #include "player_command.h"
+#include "keyboard.h"
+#include "lirc.h"
+#include "signals.h"
 
 #ifndef NCMPC_MINI
 #include "conf.h"
@@ -40,10 +43,6 @@
 #include "lyrics.h"
 #endif
 
-#ifdef ENABLE_LIRC
-#include "lirc.h"
-#endif
-
 #include <mpd/client.h>
 
 #include <stdlib.h>
@@ -64,7 +63,6 @@
 static struct mpdclient *mpd = NULL;
 static GMainLoop *main_loop;
 static guint reconnect_source_id, update_source_id;
-static int sigwinch_pipes[2];
 
 #ifndef NCMPC_MINI
 static guint check_key_bindings_source_id;
@@ -74,97 +72,26 @@
 static void
 update_xterm_title(void)
 {
-	struct mpd_status *status = NULL;
-	const struct mpd_song *song = NULL;
-	if (mpd) {
-		status = mpd->status;
-		song = mpd->song;
-	}
+	const struct mpd_song *song = mpd->song;
 
 	char tmp[BUFSIZE];
-	if (options.xterm_title_format && status && song &&
-	    mpd_status_get_state(status) == MPD_STATE_PLAY)
-		strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
-	else
-		g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
+	const char *new_title = NULL;
+	if (options.xterm_title_format && mpd->playing && song)
+		new_title = strfsong(tmp, BUFSIZE, options.xterm_title_format, song) > 0
+			? tmp
+			: NULL;
+
+	if (new_title == NULL)
+		new_title = PACKAGE " version " VERSION;
 
 	static char title[BUFSIZE];
-	if (strncmp(title, tmp, BUFSIZE)) {
-		g_strlcpy(title, tmp, BUFSIZE);
-		set_xterm_title("%s", title);
+	if (strncmp(title, new_title, BUFSIZE)) {
+		g_strlcpy(title, new_title, BUFSIZE);
+		set_xterm_title(title);
 	}
 }
 #endif
 
-static void
-exit_and_cleanup(void)
-{
-	screen_exit();
-#ifndef NCMPC_MINI
-	set_xterm_title("");
-#endif
-	printf("\n");
-
-	if (mpd) {
-		mpdclient_disconnect(mpd);
-		mpdclient_free(mpd);
-	}
-}
-
-#ifndef WIN32
-static void
-catch_sigint(gcc_unused int sig)
-{
-	g_main_loop_quit(main_loop);
-}
-
-
-static void
-catch_sigcont(gcc_unused int sig)
-{
-	char irrelevant = 'a';
-	if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
-		exit(EXIT_FAILURE);
-}
-
-void
-sigstop(void)
-{
-	def_prog_mode();  /* save the tty modes */
-	endwin();         /* end curses mode temporarily */
-	kill(0, SIGSTOP); /* issue SIGSTOP */
-}
-
-static gboolean
-sigwinch_event(gcc_unused GIOChannel *source,
-               gcc_unused GIOCondition condition, gcc_unused gpointer data)
-{
-	char ignoreme[64];
-	if (1 > read(sigwinch_pipes[0], ignoreme, 64))
-		exit(EXIT_FAILURE);
-
-	endwin();
-	refresh();
-	screen_resize(mpd);
-
-	return TRUE;
-}
-
-static void
-catch_sigwinch(gcc_unused int sig)
-{
-	char irrelevant = 'a';
-	if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
-		exit(EXIT_FAILURE);
-}
-#endif /* WIN32 */
-
-static void
-idle_callback(enum mpd_error error,
-	      gcc_unused enum mpd_server_error server_error,
-	      const char *message, enum mpd_idle events,
-	      gcc_unused void *ctx);
-
 static gboolean
 timer_mpd_update(gpointer data);
 
@@ -191,14 +118,7 @@
 static bool
 should_enable_update_timer(void)
 {
-	return (mpdclient_is_connected(mpd) &&
-		(mpd->source == NULL || /* "idle" not supported */
-		 (mpd->status != NULL &&
-		  mpd_status_get_state(mpd->status) == MPD_STATE_PLAY)))
-#ifndef NCMPC_MINI
-		|| options.display_time
-#endif
-		;
+	return mpd->playing;
 }
 
 static void
@@ -211,15 +131,10 @@
 }
 
 static void
-check_reconnect(void);
-
-static void
 do_mpd_update(void)
 {
 	if (mpdclient_is_connected(mpd) &&
-	    (mpd->source == NULL || mpd->events != 0 ||
-	     (mpd->status != NULL &&
-	      mpd_status_get_state(mpd->status) == MPD_STATE_PLAY)))
+	    (mpd->events != 0 || mpd->playing))
 		mpdclient_update(mpd);
 
 #ifndef NCMPC_MINI
@@ -229,54 +144,6 @@
 
 	screen_update(mpd);
 	mpd->events = 0;
-
-	mpdclient_put_connection(mpd);
-	check_reconnect();
-}

ncmpc-0.24.tar.xz/src/match.c -> ncmpc-0.27.tar.xz/src/match.c Changed

ncmpc-0.24.tar.xz/src/match.h -> ncmpc-0.27.tar.xz/src/match.h Changed

ncmpc-0.24.tar.xz/src/mpdclient.c -> ncmpc-0.27.tar.xz/src/mpdclient.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -18,47 +18,113 @@
  */
 
 #include "mpdclient.h"
+#include "callbacks.h"
 #include "filelist.h"
-#include "screen_client.h"
 #include "config.h"
-#include "options.h"
-#include "strfsong.h"
-#include "utils.h"
 #include "gidle.h"
+#include "charset.h"
+
+#ifdef ENABLE_ASYNC_CONNECT
+#include "aconnect.h"
+#endif
 
 #include <mpd/client.h>
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <time.h>
-#include <string.h>
-
-#define BUFSIZE 1024
-
-/* sort by song format */
-gint
-compare_filelistentry_format(gconstpointer filelist_entry1,
-			     gconstpointer filelist_entry2,
-			     const char *song_format)
-{
-	const struct mpd_entity *e1 =
-		((const struct filelist_entry *)filelist_entry1)->entity;
-	const struct mpd_entity *e2 =
-		((const struct filelist_entry *)filelist_entry2)->entity;
-
-	int n = 0;
-	if (e1 && e2 &&
-	    mpd_entity_get_type(e1) == MPD_ENTITY_TYPE_SONG &&
-	    mpd_entity_get_type(e2) == MPD_ENTITY_TYPE_SONG) {
-		char key1[BUFSIZE], key2[BUFSIZE];
-		strfsong(key1, BUFSIZE, song_format, mpd_entity_get_song(e1));
-		strfsong(key2, BUFSIZE, song_format, mpd_entity_get_song(e2));
-		n = strcmp(key1,key2);
+#include <assert.h>
+
+static gboolean
+mpdclient_enter_idle_callback(gpointer user_data)
+{
+	struct mpdclient *c = user_data;
+	assert(c->enter_idle_source_id != 0);
+	assert(c->source != NULL);
+	assert(!c->idle);
+
+	c->enter_idle_source_id = 0;
+	c->idle = mpd_glib_enter(c->source);
+	return false;
+}
+
+static void
+mpdclient_schedule_enter_idle(struct mpdclient *c)
+{
+	assert(c != NULL);
+	assert(c->source != NULL);
+
+	if (c->enter_idle_source_id == 0)
+		/* automatically re-enter MPD "idle" mode */
+		c->enter_idle_source_id =
+			g_idle_add(mpdclient_enter_idle_callback, c);
+}
+
+static void
+mpdclient_cancel_enter_idle(struct mpdclient *c)
+{
+	if (c->enter_idle_source_id != 0) {
+		g_source_remove(c->enter_idle_source_id);
+		c->enter_idle_source_id = 0;
 	}
+}
 
-	return n;
+static void
+mpdclient_invoke_error_callback(enum mpd_error error,
+				const char *message)
+{
+	char *allocated;
+	if (error == MPD_ERROR_SERVER)
+		/* server errors are UTF-8, the others are locale */
+		message = allocated = utf8_to_locale(message);
+	else
+		allocated = NULL;
+
+	mpdclient_error_callback(message);
+	g_free(allocated);
 }
 
+static void
+mpdclient_invoke_error_callback1(struct mpdclient *c)
+{
+	assert(c != NULL);
+	assert(c->connection != NULL);
+
+	struct mpd_connection *connection = c->connection;
+
+	enum mpd_error error = mpd_connection_get_error(connection);
+	assert(error != MPD_ERROR_SUCCESS);
+
+	mpdclient_invoke_error_callback(error,
+					mpd_connection_get_error_message(connection));
+}
+
+static void
+mpdclient_gidle_callback(enum mpd_error error,
+			 gcc_unused enum mpd_server_error server_error,
+			 const char *message, enum mpd_idle events,
+			 void *ctx)
+{
+	struct mpdclient *c = ctx;
+
+	c->idle = false;
+
+	assert(mpdclient_is_connected(c));
+
+	if (error != MPD_ERROR_SUCCESS) {
+		mpdclient_invoke_error_callback(error, message);
+		mpdclient_disconnect(c);
+		mpdclient_lost_callback();
+		return;
+	}
+
+	c->events |= events;
+	mpdclient_update(c);
+
+	mpdclient_idle_callback(c->events);
+
+	c->events = 0;
+
+	if (c->source != NULL)
+		mpdclient_schedule_enter_idle(c);
+}
 
 /****************************************************************************/
 /*** mpdclient functions ****************************************************/
@@ -73,24 +139,70 @@
 
 	if (error == MPD_ERROR_SERVER &&
 	    mpd_connection_get_server_error(c->connection) == MPD_SERVER_ERROR_PERMISSION &&
-	    screen_auth(c))
+	    mpdclient_auth_callback(c))
 		return true;
 
-	mpdclient_ui_error(mpd_connection_get_error_message(c->connection));
+	mpdclient_invoke_error_callback(error,
+					mpd_connection_get_error_message(c->connection));
 
-	if (!mpd_connection_clear_error(c->connection))
+	if (!mpd_connection_clear_error(c->connection)) {
 		mpdclient_disconnect(c);
+		mpdclient_lost_callback();
+	}
 
 	return false;
 }
 
+#ifdef ENABLE_ASYNC_CONNECT
+#ifndef WIN32
+
+static bool
+is_local_socket(const char *host)
+{
+	return *host == '/' || *host == '@';
+}
+
+static bool
+settings_is_local_socket(const struct mpd_settings *settings)
+{
+	const char *host = mpd_settings_get_host(settings);
+	return host != NULL && is_local_socket(host);
+}
+
+#endif
+#endif
+
 struct mpdclient *
-mpdclient_new(void)
+mpdclient_new(const gchar *host, unsigned port,
+	      unsigned timeout_ms, const gchar *password)
 {
 	struct mpdclient *c = g_new0(struct mpdclient, 1);
+
+#ifdef ENABLE_ASYNC_CONNECT

ncmpc-0.24.tar.xz/src/mpdclient.h -> ncmpc-0.27.tar.xz/src/mpdclient.h Changed

@@ -1,6 +1,7 @@
 #ifndef MPDCLIENT_H
 #define MPDCLIENT_H
 
+#include "config.h"
 #include "playlist.h"
 #include "Compiler.h"
 
@@ -9,26 +10,71 @@
 struct filelist;
 
 struct mpdclient {
+#ifdef ENABLE_ASYNC_CONNECT
+	/**
+	 * These settings are used to connect to MPD asynchronously.
+	 */
+	struct mpd_settings *settings;
+
+#ifndef WIN32
+	/**
+	 * A second set of settings, just in case #settings did not
+	 * work.  This is only used if #settings refers to a local
+	 * socket path, and this one is supposed to be a fallback to
+	 * IP on the default port (6600).
+	 */
+	struct mpd_settings *settings2;
+#endif
+
+#else
+	const char *host;
+	unsigned port;
+#endif
+
+	unsigned timeout_ms;
+
+	const char *password;
+
 	/* playlist */
 	struct mpdclient_playlist playlist;
 
+#ifdef ENABLE_ASYNC_CONNECT
+	struct aconnect *async_connect;
+#endif
+
 	struct mpd_connection *connection;
 
 	/**
+	 * Tracks idle events.  It is automatically called by
+	 * mpdclient_get_connection().
+	 */
+	struct mpd_glib_source *source;
+
+	struct mpd_status *status;
+	const struct mpd_song *song;
+
+	/**
+	 * The GLib source id which re-enters MPD idle mode before the
+	 * next main loop interation.
+	 */
+	unsigned enter_idle_source_id;
+
+	/**
 	 * This attribute is incremented whenever the connection changes
 	 * (i.e. on disconnection and (re-)connection).
 	 */
 	unsigned connection_id;
 
+	int volume;
+
 	/**
-	 * If this object is non-NULL, it tracks idle events.  It is
-	 * automatically called by mpdclient_get_connection() and
-	 * mpdclient_put_connection().  It is not created by the
-	 * mpdclient library; the user of this library has to
-	 * initialize it.  However, it is freed when the MPD
-	 * connection is closed.
+	 * A bit mask of idle events occurred since the last update.
 	 */
-	struct mpd_glib_source *source;
+	enum mpd_idle events;
+
+#if defined(ENABLE_ASYNC_CONNECT) && !defined(WIN32)
+	bool connecting2;
+#endif
 
 	/**
 	 * This attribute is true when the connection is currently in
@@ -36,16 +82,10 @@
 	 */
 	bool idle;
 
-	struct mpd_status *status;
-	const struct mpd_song *song;
-
-	int volume;
-	unsigned update_id;
-
 	/**
-	 * A bit mask of idle events occurred since the last update.
+	 * Is MPD currently playing?
 	 */
-	enum mpd_idle events;
+	bool playing;
 };
 
 enum {
@@ -61,11 +101,9 @@
 		| MPD_IDLE_OUTPUT
 		| MPD_IDLE_OPTIONS
 		| MPD_IDLE_UPDATE
-#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
 		| MPD_IDLE_STICKER
 		| MPD_IDLE_SUBSCRIPTION
 		| MPD_IDLE_MESSAGE
-#endif
 };
 
 /** functions ***************************************************************/
@@ -81,10 +119,21 @@
 }
 
 struct mpdclient *
-mpdclient_new(void);
+mpdclient_new(const gchar *host, unsigned port,
+	      unsigned timeout_ms, const gchar *password);
 
 void mpdclient_free(struct mpdclient *c);
 
+/**
+ * Determine a human-readable "name" of the settings currently used to
+ * connect to MPD.
+ *
+ * @return an allocated string that needs to be freed (with g_free())
+ * by the caller
+ */
+char *
+mpdclient_settings_name(const struct mpdclient *c);
+
 gcc_pure
 static inline bool
 mpdclient_is_connected(const struct mpdclient *c)
@@ -92,6 +141,21 @@
 	return c->connection != NULL;
 }
 
+/**
+ * Is this object "dead"?  i.e. not connected and not currently doing
+ * anything to connect.
+ */
+gcc_pure
+static inline bool
+mpdclient_is_dead(const struct mpdclient *c)
+{
+	return c->connection == NULL
+#ifdef ENABLE_ASYNC_CONNECT
+		&& c->async_connect == NULL
+#endif
+		;
+}
+
 gcc_pure
 static inline bool
 mpdclient_is_playing(const struct mpdclient *c)
@@ -110,9 +174,8 @@
 		: NULL;
 }
 
-bool
-mpdclient_connect(struct mpdclient *c, const gchar *host, gint port,
-		  unsigned timeout_ms, const gchar *password);
+void
+mpdclient_connect(struct mpdclient *c);
 
 void
 mpdclient_disconnect(struct mpdclient *c);
@@ -123,16 +186,6 @@
 struct mpd_connection *
 mpdclient_get_connection(struct mpdclient *c);
 
-void
-mpdclient_put_connection(struct mpdclient *c);
-
-/**
- * To be implemented by the application: mpdclient.c calls this to
- * display an error message.
- */
-void
-mpdclient_ui_error(const char *message);
-
 /*** MPD Commands  **********************************************************/
 
 bool
@@ -165,7 +218,6 @@
 bool
 mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src);
 
-#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
 bool
 mpdclient_cmd_subscribe(struct mpdclient *c, const char *channel);

ncmpc-0.24.tar.xz/src/ncfix.h -> ncmpc-0.27.tar.xz/src/ncfix.h Changed

ncmpc-0.24.tar.xz/src/ncmpc.h -> ncmpc-0.27.tar.xz/src/ncmpc.h Changed

ncmpc-0.24.tar.xz/src/ncmpc_curses.h -> ncmpc-0.27.tar.xz/src/ncmpc_curses.h Changed

ncmpc-0.24.tar.xz/src/ncu.c -> ncmpc-0.27.tar.xz/src/ncu.c Changed

ncmpc-0.24.tar.xz/src/ncu.h -> ncmpc-0.27.tar.xz/src/ncu.h Changed

ncmpc-0.27.tar.xz/src/net Added

ncmpc-0.27.tar.xz/src/net/async_connect.c Added

@@ -0,0 +1,132 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "async_connect.h"
+#include "../Compiler.h"
+
+#include <glib.h>
+
+#ifdef WIN32
+#include <ws2tcpip.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+struct async_connect {
+	const struct async_connect_handler *handler;
+	void *handler_ctx;
+
+	socket_t fd;
+
+	guint source_id;
+};
+
+static gboolean
+async_connect_source_callback(gcc_unused GIOChannel *source,
+			      gcc_unused GIOCondition condition,
+			      gpointer data)
+{
+	struct async_connect *ac = data;
+
+	const int fd = ac->fd;
+	const struct async_connect_handler *const handler = ac->handler;
+	void *const ctx = ac->handler_ctx;
+	g_free(ac);
+
+	int s_err = 0;
+	socklen_t s_err_size = sizeof(s_err);
+
+	if (getsockopt(fd, SOL_SOCKET, SO_ERROR,
+		       (char*)&s_err, &s_err_size) < 0)
+		s_err = -last_socket_error();
+
+	if (s_err == 0) {
+		handler->success(fd, ctx);
+	} else {
+		close_socket(fd);
+		char msg[256];
+		snprintf(msg, sizeof(msg), "Failed to connect socket: %s",
+			 strerror(-s_err));
+		handler->error(msg, ctx);
+	}
+
+	return false;
+}
+
+void
+async_connect_start(struct async_connect **acp,
+		    const struct sockaddr *address, size_t address_size,
+		    const struct async_connect_handler *handler, void *ctx)
+{
+	socket_t fd = create_socket(address->sa_family, SOCK_STREAM, 0);
+	if (fd == INVALID_SOCKET) {
+		char msg[256];
+		snprintf(msg, sizeof(msg), "Failed to create socket: %s",
+			 strerror(errno));
+		handler->error(msg, ctx);
+		return;
+	}
+
+	if (connect(fd, address, address_size) == 0) {
+		handler->success(fd, ctx);
+		return;
+	}
+
+	const int e = last_socket_error();
+	if (!would_block(e)) {
+		close_socket(fd);
+		char msg[256];
+		snprintf(msg, sizeof(msg), "Failed to connect socket: %s",
+			 strerror(e));
+		handler->error(msg, ctx);
+		return;
+	}
+
+	struct async_connect *ac = g_new(struct async_connect, 1);
+	ac->handler = handler;
+	ac->handler_ctx = ctx;
+	ac->fd = fd;
+
+	GIOChannel *channel = g_io_channel_unix_new(fd);
+	ac->source_id = g_io_add_watch(channel, G_IO_OUT,
+				       async_connect_source_callback, ac);
+	g_io_channel_unref(channel);
+
+	*acp = ac;
+}
+
+void
+async_connect_cancel(struct async_connect *ac)
+{
+	g_source_remove(ac->source_id);
+	close_socket(ac->fd);
+	g_free(ac);
+}

ncmpc-0.27.tar.xz/src/net/async_connect.h Added

@@ -0,0 +1,56 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef NET_ASYNC_CONNECT_H
+#define NET_ASYNC_CONNECT_H
+
+#include "socket.h"
+
+#include <stddef.h>
+
+struct sockaddr;
+struct async_connect;
+
+struct async_connect_handler {
+	void (*success)(socket_t fd, void *ctx);
+	void (*error)(const char *message, void *ctx);
+};
+
+/**
+ * Create a socket and connect it to the given address.
+ */
+void
+async_connect_start(struct async_connect **acp,
+		    const struct sockaddr *address,
+		    size_t address_size,
+		    const struct async_connect_handler *handler, void *ctx);
+
+void
+async_connect_cancel(struct async_connect *ac);
+
+#endif

ncmpc-0.27.tar.xz/src/net/async_rconnect.c Added

@@ -0,0 +1,145 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "async_rconnect.h"
+#include "async_connect.h"
+#include "resolver.h"
+#include "../Compiler.h"
+
+#include <glib.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+
+struct async_rconnect {
+	const struct async_rconnect_handler *handler;
+	void *handler_ctx;
+
+	const char *host;
+	struct resolver *resolver;
+
+	struct async_connect *connect;
+
+	char *last_error;
+};
+
+static void
+async_rconnect_next(struct async_rconnect *rc);
+
+static void
+async_rconnect_success(socket_t fd, void *ctx)
+{
+	struct async_rconnect *rc = ctx;
+
+	rc->handler->success(fd, rc->handler_ctx);
+	g_free(rc->last_error);
+	resolver_free(rc->resolver);
+	g_free(rc);
+}
+
+static void
+async_rconnect_error(const char *message, void *ctx)
+{
+	struct async_rconnect *rc = ctx;
+
+	g_free(rc->last_error);
+	rc->last_error = g_strdup(message);
+
+	async_rconnect_next(rc);
+}
+
+static const struct async_connect_handler async_rconnect_connect_handler = {
+	.success = async_rconnect_success,
+	.error = async_rconnect_error,
+};
+
+static void
+async_rconnect_next(struct async_rconnect *rc)
+{
+	const struct resolver_address *a = resolver_next(rc->resolver);
+	if (a == NULL) {
+		char msg[256];
+
+		if (rc->last_error == 0) {
+			snprintf(msg, sizeof(msg),
+				 "Host '%s' has no address",
+				 rc->host);
+		} else {
+			snprintf(msg, sizeof(msg),
+				 "Failed to connect to host '%s': %s",
+				 rc->host, rc->last_error);
+			g_free(rc->last_error);
+		}
+
+		rc->handler->error(msg, rc->handler_ctx);
+		resolver_free(rc->resolver);
+		g_free(rc);
+		return;
+	}
+
+	async_connect_start(&rc->connect, a->addr, a->addrlen,
+			    &async_rconnect_connect_handler, rc);
+}
+
+void
+async_rconnect_start(struct async_rconnect **rcp,
+		     const char *host, unsigned port,
+		     const struct async_rconnect_handler *handler, void *ctx)
+{
+	struct resolver *r = resolver_new(host, port);
+	if (host == NULL)
+		host = "[default]";
+
+	if (r == NULL) {
+		char msg[256];
+		snprintf(msg, sizeof(msg), "Failed to resolve host '%s'",
+			 host);
+		handler->error(msg, ctx);
+		return;
+	}
+
+	struct async_rconnect *rc = g_new(struct async_rconnect, 1);
+	rc->handler = handler;
+	rc->handler_ctx = ctx;
+	rc->host = host;
+	rc->resolver = r;
+	rc->last_error = NULL;
+	*rcp = rc;
+
+	async_rconnect_next(rc);
+}
+
+void
+async_rconnect_cancel(struct async_rconnect *rc)
+{
+	g_free(rc->last_error);
+	async_connect_cancel(rc->connect);
+	resolver_free(rc->resolver);
+	g_free(rc);
+}

ncmpc-0.27.tar.xz/src/net/async_rconnect.h Added

@@ -0,0 +1,52 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef NET_ASYNC_RCONNECT_H
+#define NET_ASYNC_RCONNECT_H
+
+#include <mpd/client.h>
+
+struct async_rconnect;
+
+struct async_rconnect_handler {
+	void (*success)(int fd, void *ctx);
+	void (*error)(const char *message, void *ctx);
+};
+
+/**
+ * Resolve a host name and connect to it asynchronously.
+ */
+void
+async_rconnect_start(struct async_rconnect **rcp,
+		     const char *host, unsigned port,
+		     const struct async_rconnect_handler *handler, void *ctx);
+
+void
+async_rconnect_cancel(struct async_rconnect *rc);
+
+#endif

ncmpc-0.27.tar.xz/src/net/resolver.c Added

@@ -0,0 +1,200 @@
+/* libmpdclient
+   (c) 2003-2017 The Music Player Daemon Project
+   This project's homepage is: http://www.musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "resolver.h"
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef WIN32
+#  include <winsock2.h>
+#  include <ws2tcpip.h>
+#else
+#  include <sys/socket.h>
+#  include <sys/un.h>
+#ifdef ENABLE_TCP
+#  include <netinet/in.h>
+#  include <arpa/inet.h>
+#  include <netdb.h>
+#endif
+#endif
+
+struct resolver {
+	enum {
+		TYPE_ZERO, TYPE_ONE, TYPE_ANY
+	} type;
+
+#ifdef ENABLE_TCP
+#ifdef HAVE_GETADDRINFO
+	struct addrinfo *ai;
+	const struct addrinfo *next;
+#else
+	struct sockaddr_in sin;
+#endif
+#endif
+
+	struct resolver_address current;
+
+#ifndef WIN32
+	struct sockaddr_un saun;
+#endif
+};
+
+struct resolver *
+resolver_new(const char *host, unsigned port)
+{
+	struct resolver *resolver;
+
+	resolver = malloc(sizeof(*resolver));
+	if (resolver == NULL)
+		return NULL;
+
+	if (host[0] == '/' || host[0] == '@') {
+#ifndef WIN32
+		size_t path_length = strlen(host);
+		if (path_length >= sizeof(resolver->saun.sun_path)) {
+			free(resolver);
+			return NULL;
+		}
+
+		resolver->saun.sun_family = AF_UNIX;
+		memcpy(resolver->saun.sun_path, host, path_length + 1);
+
+		if (host[0] == '@')
+			/* abstract socket */
+			resolver->saun.sun_path[0] = 0;
+
+		resolver->current.family = PF_UNIX;
+		resolver->current.protocol = 0;
+		resolver->current.addrlen = sizeof(resolver->saun);
+		resolver->current.addr = (const struct sockaddr *)&resolver->saun;
+		resolver->type = TYPE_ONE;
+#else /* WIN32 */
+		/* there are no UNIX domain sockets on Windows */
+		free(resolver);
+		return NULL;
+#endif /* WIN32 */
+	} else {
+#ifdef ENABLE_TCP
+#ifdef HAVE_GETADDRINFO
+		struct addrinfo hints;
+		char service[20];
+		int ret;
+
+		memset(&hints, 0, sizeof(hints));
+		hints.ai_family = PF_UNSPEC;
+		hints.ai_socktype = SOCK_STREAM;
+		hints.ai_protocol = IPPROTO_TCP;
+
+		snprintf(service, sizeof(service), "%d", port);
+
+		ret = getaddrinfo(host, service, &hints, &resolver->ai);
+		if (ret != 0) {
+			free(resolver);
+			return NULL;
+		}
+
+		resolver->next = resolver->ai;
+		resolver->type = TYPE_ANY;
+#else
+		const struct hostent *he;
+
+		he = gethostbyname(host);
+		if (he == NULL) {
+			free(resolver);
+			return NULL;
+		}
+
+		if (he->h_addrtype != AF_INET) {
+			free(resolver);
+			return NULL;
+		}
+
+
+		memset(&resolver->sin, 0, sizeof(resolver->sin));
+		resolver->sin.sin_family = AF_INET;
+		resolver->sin.sin_port = htons(port);
+		memcpy((char *)&resolver->sin.sin_addr.s_addr,
+		       (char *)he->h_addr, he->h_length);
+
+		resolver->current.family = PF_INET;
+		resolver->current.protocol = 0;
+		resolver->current.addrlen = sizeof(resolver->sin);
+		resolver->current.addr = (const struct sockaddr *)&resolver->sin;
+
+		resolver->type = TYPE_ONE;
+#endif
+#else /* !ENABLE_TCP */
+		(void)port;
+		free(resolver);
+		return NULL;
+#endif
+	}
+
+	return resolver;
+}
+
+void
+resolver_free(struct resolver *resolver)
+{
+#if defined(ENABLE_TCP) && defined(HAVE_GETADDRINFO)
+	if (resolver->type == TYPE_ANY)
+		freeaddrinfo(resolver->ai);
+#endif
+	free(resolver);
+}
+
+const struct resolver_address *
+resolver_next(struct resolver *resolver)
+{
+	if (resolver->type == TYPE_ZERO)
+		return NULL;
+
+	if (resolver->type == TYPE_ONE) {
+		resolver->type = TYPE_ZERO;
+		return &resolver->current;
+	}
+
+#if defined(ENABLE_TCP) && defined(HAVE_GETADDRINFO)
+	if (resolver->next == NULL)
+		return NULL;
+
+	resolver->current.family = resolver->next->ai_family;
+	resolver->current.protocol = resolver->next->ai_protocol;
+	resolver->current.addrlen = resolver->next->ai_addrlen;
+	resolver->current.addr = resolver->next->ai_addr;
+
+	resolver->next = resolver->next->ai_next;
+
+	return &resolver->current;
+#else
+	return NULL;
+#endif

ncmpc-0.27.tar.xz/src/net/resolver.h Added

@@ -0,0 +1,52 @@
+/* libmpdclient
+   (c) 2003-2017 The Music Player Daemon Project
+   This project's homepage is: http://www.musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef LIBMPDCLIENT_RESOLVER_H
+#define LIBMPDCLIENT_RESOLVER_H
+
+#include <stddef.h>
+
+struct resolver;
+
+struct resolver_address {
+	int family;
+	int protocol;
+	size_t addrlen;
+	const struct sockaddr *addr;
+};
+
+struct resolver *
+resolver_new(const char *host, unsigned port);
+
+void
+resolver_free(struct resolver *resolver);
+
+const struct resolver_address *
+resolver_next(struct resolver *resolver);
+
+#endif

ncmpc-0.27.tar.xz/src/net/socket.c Added

@@ -0,0 +1,76 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "socket.h"
+
+#ifndef WIN32
+#include <fcntl.h>
+#endif
+
+static void
+socket_set_cloexec(socket_t fd)
+{
+#ifndef WIN32
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+#else
+	(void)fd;
+#endif
+}
+
+static void
+socket_set_nonblock(socket_t fd)
+{
+#ifdef WIN32
+	u_long val = 1;
+	ioctlsocket(fd, FIONBIO, &val);
+#else
+	int flags = fcntl(fd, F_GETFL);
+	if (flags >= 0)
+		fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+#endif
+}
+
+socket_t
+create_socket(int domain, int type, int protocol)
+{
+	socket_t fd;
+
+#if defined(SOCK_CLOEXEC) && defined(SOCK_NONBLOCK)
+	fd = socket(domain, type | SOCK_CLOEXEC | SOCK_NONBLOCK, protocol);
+	if (fd != INVALID_SOCKET || errno != EINVAL)
+		return fd;
+#endif
+
+	fd = socket(domain, type, protocol);
+	if (fd != INVALID_SOCKET) {
+		socket_set_cloexec(fd);
+		socket_set_nonblock(fd);
+	}
+
+	return fd;
+}

ncmpc-0.27.tar.xz/src/net/socket.h Added

@@ -0,0 +1,75 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef NET_SOCKET_H
+#define NET_SOCKET_H
+
+#include "types.h"
+
+#include <stdbool.h>
+
+#ifndef WIN32
+#include <errno.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#endif
+
+socket_t
+create_socket(int domain, int type, int protocol);
+
+static inline void
+close_socket(socket_t s)
+{
+#ifdef WIN32
+	closesocket(s);
+#else
+	close(s);
+#endif
+}
+
+static inline int
+last_socket_error(void)
+{
+#ifdef WIN32
+	return WSAGetLastError();
+#else
+	return errno;
+#endif
+}
+
+static inline bool
+would_block(int e)
+{
+#ifdef WIN32
+	return e == WSAEINPROGRESS || e == WSAEWOULDBLOCK;
+#else
+	return e == EINPROGRESS || e == EAGAIN;
+#endif
+}
+
+#endif

ncmpc-0.27.tar.xz/src/net/types.h Added

@@ -0,0 +1,44 @@
+/* ncmpc (Ncurses MPD Client)
+   (c) 2004-2017 The Music Player Daemon Project
+   Project homepage: http://musicpd.org
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef NET_TYPES_H
+#define NET_TYPES_H
+
+#ifdef WIN32
+
+#include <winsock2.h>
+typedef SOCKET socket_t;
+
+#else
+
+typedef int socket_t;
+#define INVALID_SOCKET -1
+
+#endif
+
+#endif

ncmpc-0.24.tar.xz/src/options.c -> ncmpc-0.27.tar.xz/src/options.c Changed

ncmpc-0.24.tar.xz/src/options.h -> ncmpc-0.27.tar.xz/src/options.h Changed

ncmpc-0.24.tar.xz/src/paint.h -> ncmpc-0.27.tar.xz/src/paint.h Changed

ncmpc-0.24.tar.xz/src/player_command.c -> ncmpc-0.27.tar.xz/src/player_command.c Changed

ncmpc-0.24.tar.xz/src/player_command.h -> ncmpc-0.27.tar.xz/src/player_command.h Changed

ncmpc-0.24.tar.xz/src/playlist.c -> ncmpc-0.27.tar.xz/src/playlist.c Changed

ncmpc-0.24.tar.xz/src/playlist.h -> ncmpc-0.27.tar.xz/src/playlist.h Changed

ncmpc-0.24.tar.xz/src/plugin.c -> ncmpc-0.27.tar.xz/src/plugin.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -29,12 +29,12 @@
 #include <sys/wait.h>
 
 struct plugin_pipe {
+	struct plugin_cycle *cycle;
+
 	/** the pipe to the plugin process, or -1 if none is currently
 	    open */
 	int fd;
-	/** the GLib channel of #fd */
-	GIOChannel *channel;
-	/** the GLib IO watch of #channel */
+	/** the GLib IO watch of #fd */
 	guint event_id;
 	/** the output of the current plugin */
 	GString *data;
@@ -127,7 +127,6 @@
 static void
 plugin_eof(struct plugin_cycle *cycle, struct plugin_pipe *p)
 {
-	g_io_channel_unref(p->channel);
 	close(p->fd);
 	p->fd = -1;
 
@@ -167,18 +166,13 @@
 plugin_data(gcc_unused GIOChannel *source,
 	    gcc_unused GIOCondition condition, gpointer data)
 {
-	struct plugin_cycle *cycle = data;
+	struct plugin_pipe *p = data;
+	assert(p->fd >= 0);
+
+	struct plugin_cycle *cycle = p->cycle;
 	assert(cycle != NULL);
 	assert(cycle->pid > 0);
 
-	struct plugin_pipe *p = NULL;
-	if (source == cycle->pipe_stdout.channel)
-		p = &cycle->pipe_stdout;
-	else if (source == cycle->pipe_stderr.channel)
-		p = &cycle->pipe_stderr;
-	assert(p != NULL);
-	assert(p->fd >= 0);
-
 	char buffer[256];
 	ssize_t nbytes = condition & G_IO_IN
 		? read(p->fd, buffer, sizeof(buffer))
@@ -217,11 +211,13 @@
 static void
 plugin_fd_add(struct plugin_cycle *cycle, struct plugin_pipe *p, int fd)
 {
+	p->cycle = cycle;
 	p->fd = fd;
 	p->data = g_string_new(NULL);
-	p->channel = g_io_channel_unix_new(fd);
-	p->event_id = g_io_add_watch(p->channel, G_IO_IN|G_IO_HUP,
+	GIOChannel *channel = g_io_channel_unix_new(fd);
+	p->event_id = g_io_add_watch(channel, G_IO_IN|G_IO_HUP,
 				     plugin_data, cycle);
+	g_io_channel_unref(channel);
 }
 
 static int
@@ -298,7 +294,7 @@
 
 	if (cycle->next_plugin >= cycle->list->plugins->len) {
 		/* no plugins left */
-		g_timeout_add(0, plugin_delayed_fail, cycle);
+		g_idle_add(plugin_delayed_fail, cycle);
 		return;
 	}
 
@@ -306,7 +302,7 @@
 						    cycle->next_plugin++);
 	if (start_plugin(cycle, plugin_path) < 0) {
 		/* system error */
-		g_timeout_add(0, plugin_delayed_fail, cycle);
+		g_idle_add(plugin_delayed_fail, cycle);
 		return;
 	}
 }
@@ -363,7 +359,6 @@
 {
 	if (p->fd >= 0) {
 		g_source_remove(p->event_id);
-		g_io_channel_unref(p->channel);
 		close(p->fd);
 	}
 }

ncmpc-0.24.tar.xz/src/plugin.h -> ncmpc-0.27.tar.xz/src/plugin.h Changed

ncmpc-0.24.tar.xz/src/progress_bar.c -> ncmpc-0.27.tar.xz/src/progress_bar.c Changed

ncmpc-0.24.tar.xz/src/progress_bar.h -> ncmpc-0.27.tar.xz/src/progress_bar.h Changed

ncmpc-0.27.tar.xz/src/save_playlist.c Added

@@ -0,0 +1,174 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "save_playlist.h"
+#include "db_completion.h"
+#include "screen_status.h"
+#include "config.h"
+#include "i18n.h"
+#include "charset.h"
+#include "mpdclient.h"
+#include "utils.h"
+#include "wreadln.h"
+#include "screen_utils.h"
+#include "Compiler.h"
+
+#include <mpd/client.h>
+
+#include <glib.h>
+
+#include <string.h>
+
+#ifndef NCMPC_MINI
+
+typedef struct
+{
+	GList **list;
+	struct mpdclient *c;
+} completion_callback_data_t;
+
+/**
+ * Wrapper for strncmp().  We are not allowed to pass &strncmp to
+ * g_completion_set_compare(), because strncmp() takes size_t where
+ * g_completion_set_compare passes a gsize value.
+ */
+static gint
+completion_strncmp(const gchar *s1, const gchar *s2, gsize n)
+{
+	return strncmp(s1, s2, n);
+}
+
+static void
+save_pre_completion_cb(GCompletion *gcmp, gcc_unused gchar *line,
+		       void *data)
+{
+	completion_callback_data_t *tmp = (completion_callback_data_t *)data;
+	GList **list = tmp->list;
+	struct mpdclient *c = tmp->c;
+
+	if( *list == NULL ) {
+		/* create completion list */
+		*list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_PLAYLIST);
+		g_completion_add_items(gcmp, *list);
+	}
+}
+
+static void
+save_post_completion_cb(gcc_unused GCompletion *gcmp,
+			gcc_unused gchar *line, GList *items,
+			gcc_unused void *data)
+{
+	if (g_list_length(items) >= 1)
+		screen_display_completion_list(items);
+}
+
+#endif
+
+int
+playlist_save(struct mpdclient *c, char *name, char *defaultname)
+{
+	struct mpd_connection *connection;
+	gchar *filename;
+
+#ifdef NCMPC_MINI
+	(void)defaultname;
+#endif
+
+#ifndef NCMPC_MINI
+	if (name == NULL) {
+		/* initialize completion support */
+		GCompletion *gcmp = g_completion_new(NULL);
+		g_completion_set_compare(gcmp, completion_strncmp);
+		GList *list = NULL;
+		completion_callback_data_t data = {
+			.list = &list,
+			.c = c,
+		};
+		wrln_completion_callback_data = &data;
+		wrln_pre_completion_callback = save_pre_completion_cb;
+		wrln_post_completion_callback = save_post_completion_cb;
+
+
+		/* query the user for a filename */
+		filename = screen_readln(_("Save queue as"),
+					 defaultname,
+					 NULL,
+					 gcmp);
+		if (filename == NULL)
+			return -1;
+
+		/* destroy completion support */
+		wrln_completion_callback_data = NULL;
+		wrln_pre_completion_callback = NULL;
+		wrln_post_completion_callback = NULL;
+		g_completion_free(gcmp);
+		list = string_list_free(list);
+		filename = g_strstrip(filename);
+	} else
+#endif
+		filename=g_strdup(name);
+
+	/* send save command to mpd */
+
+	connection = mpdclient_get_connection(c);
+	if (connection == NULL) {
+		g_free(filename);
+		return -1;
+	}
+
+	char *filename_utf8 = locale_to_utf8(filename);
+	if (!mpd_run_save(connection, filename_utf8)) {
+		if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
+		    mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_EXIST &&
+		    mpd_connection_clear_error(connection)) {
+			char *buf = g_strdup_printf(_("Replace %s?"), filename);
+			bool replace = screen_get_yesno(buf, false);
+			g_free(buf);
+
+			if (!replace) {
+				g_free(filename_utf8);
+				g_free(filename);
+				screen_status_printf(_("Aborted"));
+				return -1;
+			}
+
+			if (!mpd_run_rm(connection, filename_utf8) ||
+			    !mpd_run_save(connection, filename_utf8)) {
+				mpdclient_handle_error(c);
+				g_free(filename_utf8);
+				g_free(filename);
+				return -1;
+			}
+		} else {
+			mpdclient_handle_error(c);
+			g_free(filename_utf8);
+			g_free(filename);
+			return -1;
+		}
+	}
+
+	c->events |= MPD_IDLE_STORED_PLAYLIST;
+
+	g_free(filename_utf8);
+
+	/* success */
+	screen_status_printf(_("Saved %s"), filename);
+	g_free(filename);
+	return 0;
+}

ncmpc-0.27.tar.xz/src/save_playlist.h Added

@@ -0,0 +1,28 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef SAVE_PLAYLIST_H
+#define SAVE_PLAYLIST_H
+
+struct mpdclient;
+
+int
+playlist_save(struct mpdclient *c, char *name, char *defaultname);
+
+#endif

ncmpc-0.24.tar.xz/src/screen.c -> ncmpc-0.27.tar.xz/src/screen.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -20,15 +20,12 @@
 #include "screen.h"
 #include "screen_interface.h"
 #include "screen_list.h"
-#include "screen_utils.h"
 #include "screen_status.h"
 #include "config.h"
 #include "i18n.h"
 #include "charset.h"
 #include "mpdclient.h"
-#include "utils.h"
 #include "options.h"
-#include "colors.h"
 #include "player_command.h"
 #include "screen_help.h"
 #include "screen_queue.h"
@@ -47,51 +44,37 @@
 #include <unistd.h>
 #include <string.h>
 #include <time.h>
-#include <locale.h>
-
-#ifndef NCMPC_MINI
-/** welcome message time [s] */
-static const GTime SCREEN_WELCOME_TIME = 10;
-#endif
-
-/* minimum window size */
-static const int SCREEN_MIN_COLS = 14;
-static const int SCREEN_MIN_ROWS = 5;
 
 /* screens */
 
-struct screen screen;
-static const struct screen_functions *mode_fn = &screen_queue;
-static const struct screen_functions *mode_fn_prev = &screen_queue;
+struct screen screen = {
+	.current_page = &screen_queue,
+};
 
-gboolean
-screen_is_visible(const struct screen_functions *sf)
-{
-	return sf == mode_fn;
-}
+static const struct screen_functions *mode_fn_prev = &screen_queue;
 
 void
 screen_switch(const struct screen_functions *sf, struct mpdclient *c)
 {
 	assert(sf != NULL);
 
-	if (sf == mode_fn)
+	if (sf == screen.current_page)
 		return;
 
-	mode_fn_prev = mode_fn;
+	mode_fn_prev = screen.current_page;
 
 	/* close the old mode */
-	if (mode_fn->close != NULL)
-		mode_fn->close();
+	if (screen.current_page->close != NULL)
+		screen.current_page->close();
 
 	/* get functions for the new mode */
-	mode_fn = sf;
+	screen.current_page = sf;
 
 	/* open the new mode */
-	if (mode_fn->open != NULL)
-		mode_fn->open(c);
+	if (sf->open != NULL)
+		sf->open(c);
 
-	screen_paint(c);
+	screen_paint(c, true);
 }
 
 void
@@ -134,7 +117,7 @@
 	int max = g_strv_length(options.screen_list);
 
 	/* find current screen */
-	int current = find_configured_screen(screen_get_name(mode_fn));
+	int current = find_configured_screen(screen_get_name(screen.current_page));
 	int next = current + offset;
 	if (next<0)
 		next = max-1;
@@ -147,224 +130,6 @@
 		screen_switch(sf, c);
 }
 
-static void
-paint_top_window(const char *header, const struct mpdclient *c)
-{
-	title_bar_paint(&screen.title_bar, header, c->status);
-}
-
-static void
-update_progress_window(struct mpdclient *c, bool repaint)
-{
-	unsigned elapsed;
-	if (c->status == NULL)
-		elapsed = 0;
-	else if (seek_id >= 0 && seek_id == mpd_status_get_song_id(c->status))
-		elapsed = seek_target_time;
-	else
-		elapsed = mpd_status_get_elapsed_time(c->status);
-
-	unsigned duration = mpdclient_is_playing(c)
-		? mpd_status_get_total_time(c->status)
-		: 0;
-
-	if (progress_bar_set(&screen.progress_bar, elapsed, duration) ||
-	    repaint)
-		progress_bar_paint(&screen.progress_bar);
-}
-
-void
-screen_exit(void)
-{
-	if (mode_fn->close != NULL)
-		mode_fn->close();
-
-	screen_list_exit();
-
-	string_list_free(screen.find_history);
-	g_free(screen.buf);
-	g_free(screen.findbuf);
-
-	title_bar_deinit(&screen.title_bar);
-	delwin(screen.main_window.w);
-	progress_bar_deinit(&screen.progress_bar);
-	status_bar_deinit(&screen.status_bar);
-
-#ifndef NCMPC_MINI
-	if (screen.welcome_source_id != 0)
-		g_source_remove(screen.welcome_source_id);
-#endif
-}
-
-void
-screen_resize(struct mpdclient *c)
-{
-	if (COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS) {
-		screen_exit();
-		fprintf(stderr, "%s\n", _("Error: Screen too small"));
-		exit(EXIT_FAILURE);
-	}
-#ifdef PDCURSES
-	resize_term(LINES, COLS);
-#else 
-	resizeterm(LINES, COLS);
-#endif
-
-	screen.cols = COLS;
-	screen.rows = LINES;
-
-	title_bar_resize(&screen.title_bar, screen.cols);
-
-	/* main window */
-	screen.main_window.cols = screen.cols;
-	screen.main_window.rows = screen.rows-4;
-	wresize(screen.main_window.w, screen.main_window.rows, screen.cols);
-	wclear(screen.main_window.w);
-
-	/* progress window */
-	progress_bar_resize(&screen.progress_bar, screen.cols,
-			    screen.rows - 2, 0);
-	progress_bar_paint(&screen.progress_bar);
-
-	/* status window */
-	status_bar_resize(&screen.status_bar, screen.cols, screen.rows - 1, 0);
-	status_bar_paint(&screen.status_bar, c->status, c->song);
-
-	screen.buf_size = screen.cols;
-	g_free(screen.buf);
-	screen.buf = g_malloc(screen.cols);
-
-	/* resize all screens */
-	screen_list_resize(screen.main_window.cols, screen.main_window.rows);
-
-	/* ? - without this the cursor becomes visible with aterm & Eterm */
-	curs_set(1);
-	curs_set(0);
-
-	screen_paint(c);
-}
-
-#ifndef NCMPC_MINI
-static gboolean
-welcome_timer_callback(gpointer data)

ncmpc-0.24.tar.xz/src/screen.h -> ncmpc-0.27.tar.xz/src/screen.h Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -32,6 +32,8 @@
 
 #include <glib.h>
 
+#include <stdbool.h>
+
 struct mpdclient;
 struct screen_functions;
 
@@ -41,7 +43,7 @@
 	struct progress_bar progress_bar;
 	struct status_bar status_bar;
 
-	unsigned cols, rows;
+	const struct screen_functions *current_page;
 
 	char *buf;
 	size_t buf_size;
@@ -63,7 +65,13 @@
 void screen_init(struct mpdclient *c);
 void screen_exit(void);
 void screen_resize(struct mpdclient *c);
-void screen_paint(struct mpdclient *c);
+
+void
+paint_top_window(const struct mpdclient *c);
+
+void
+screen_paint(struct mpdclient *c, bool main_dirty);
+
 void screen_update(struct mpdclient *c);
 void screen_cmd(struct mpdclient *c, command_t cmd);
 
@@ -72,8 +80,11 @@
 void 
 screen_swap(struct mpdclient *c, const struct mpd_song *song);
 
-gboolean
-screen_is_visible(const struct screen_functions *sf);
+static inline bool
+screen_is_visible(const struct screen_functions *sf)
+{
+	return sf == screen.current_page;
+}
 
 int
 screen_get_mouse_event(struct mpdclient *c, unsigned long *bstate, int *row);

ncmpc-0.24.tar.xz/src/screen_artist.c -> ncmpc-0.27.tar.xz/src/screen_artist.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -89,16 +89,6 @@
 }
 
 static void
-screen_artist_paint(void);
-
-static void
-artist_repaint(void)
-{
-	screen_artist_paint();
-	wrefresh(browser.lw->w);
-}
-
-static void
 string_array_free(GPtrArray *array)
 {
 	for (unsigned i = 0; i < array->len; ++i) {
@@ -299,7 +289,7 @@
 }
 
 static void
-screen_artist_init(WINDOW *w, int cols, int rows)
+screen_artist_init(WINDOW *w, unsigned cols, unsigned rows)
 {
 	browser.lw = list_window_init(w, cols, rows);
 	browser.song_format = options.list_format;
@@ -323,7 +313,7 @@
 }
 
 static void
-screen_artist_resize(int cols, int rows)
+screen_artist_resize(unsigned cols, unsigned rows)
 {
 	list_window_resize(browser.lw, cols, rows);
 }
@@ -440,7 +430,7 @@
 			 | MPD_IDLE_QUEUE
 #endif
 			 ))
-		artist_repaint();
+		screen_artist_paint();
 }
 
 /* add_query - Add all songs satisfying specified criteria.
@@ -530,7 +520,7 @@
 			open_album_list(c, g_strdup(selected));
 			list_window_reset(browser.lw);
 
-			artist_repaint();
+			screen_artist_paint();
 			return true;
 
 		case LIST_ALBUMS:
@@ -560,7 +550,7 @@
 				list_window_reset(browser.lw);
 			}
 
-			artist_repaint();
+			screen_artist_paint();
 			return true;
 
 		case LIST_SONGS:
@@ -583,7 +573,7 @@
 					list_window_center(browser.lw, idx);
 				}
 
-				artist_repaint();
+				screen_artist_paint();
 				return true;
 			}
 			break;
@@ -632,7 +622,7 @@
 			break;
 		}
 
-		artist_repaint();
+		screen_artist_paint();
 		break;
 
 	case CMD_GO_ROOT_DIRECTORY:
@@ -649,7 +639,7 @@
 			break;
 		}
 
-		artist_repaint();
+		screen_artist_paint();
 		break;
 
 	case CMD_SELECT:
@@ -701,13 +691,13 @@
 		case LIST_ARTISTS:
 			screen_find(browser.lw, cmd,
 				    screen_artist_lw_callback, artist_list);
-			artist_repaint();
+			screen_artist_paint();
 			return true;
 
 		case LIST_ALBUMS:
 			screen_find(browser.lw, cmd,
 				    screen_artist_lw_callback, album_list);
-			artist_repaint();
+			screen_artist_paint();
 			return true;
 
 		case LIST_SONGS:
@@ -720,14 +710,14 @@
 			screen_jump(browser.lw,
 				    screen_artist_lw_callback, artist_list,
 				    paint_artist_callback, artist_list);
-			artist_repaint();
+			screen_artist_paint();
 			return true;
 
 		case LIST_ALBUMS:
 			screen_jump(browser.lw,
 				    screen_artist_lw_callback, album_list,
 				    paint_album_callback, album_list);
-			artist_repaint();
+			screen_artist_paint();
 			return true;
 
 		case LIST_SONGS:
@@ -743,7 +733,7 @@
 
 	if (screen_artist_lw_cmd(c, cmd)) {
 		if (screen_is_visible(&screen_artist))
-			artist_repaint();
+			screen_artist_paint();
 		return true;
 	}

ncmpc-0.24.tar.xz/src/screen_artist.h -> ncmpc-0.27.tar.xz/src/screen_artist.h Changed

ncmpc-0.24.tar.xz/src/screen_browser.c -> ncmpc-0.27.tar.xz/src/screen_browser.c Changed

ncmpc-0.24.tar.xz/src/screen_browser.h -> ncmpc-0.27.tar.xz/src/screen_browser.h Changed

ncmpc-0.24.tar.xz/src/screen_chat.c -> ncmpc-0.27.tar.xz/src/screen_chat.c Changed

ncmpc-0.24.tar.xz/src/screen_chat.h -> ncmpc-0.27.tar.xz/src/screen_chat.h Changed

ncmpc-0.24.tar.xz/src/screen_client.c -> ncmpc-0.27.tar.xz/src/screen_client.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -18,57 +18,11 @@
  */
 
 #include "screen_client.h"
-#include "screen_utils.h"
 #include "screen_status.h"
 #include "mpdclient.h"
 #include "i18n.h"
 #include "charset.h"
 
-static bool
-_screen_auth(struct mpdclient *c, gint recursion)
-{
-	struct mpd_connection *connection = mpdclient_get_connection(c);
-	if (connection == NULL)
-		return false;
-
-	mpd_connection_clear_error(connection);
-	if (recursion > 2)
-		return false;
-
-	char *password = screen_read_password(NULL);
-	if (password == NULL)
-		return false;
-
-	mpd_send_password(connection, password);
-	g_free(password);
-
-	mpd_response_finish(connection);
-	mpdclient_update(c);
-
-	if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
-	    mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_PASSWORD)
-		return  _screen_auth(c, ++recursion);
-
-	return true;
-}
-
-bool
-screen_auth(struct mpdclient *c)
-{
-	return _screen_auth(c, 0);
-}
-
-void
-mpdclient_ui_error(const char *message_utf8)
-{
-	char *message_locale = utf8_to_locale(message_utf8);
-	screen_status_printf("%s", message_locale);
-	g_free(message_locale);
-
-	screen_bell();
-	doupdate();
-}
-
 void
 screen_database_update(struct mpdclient *c, const char *path)
 {
@@ -90,10 +44,6 @@
 		return;
 	}
 
-	/* set update_id to make sure the browse callback gets called
-	   even if the update has finished before status is updated */
-	c->update_id = id;
-
 	if (path != NULL && *path != 0) {
 		char *path_locale = utf8_to_locale(path);
 		screen_status_printf(_("Database update of %s started"), path);

ncmpc-0.24.tar.xz/src/screen_client.h -> ncmpc-0.27.tar.xz/src/screen_client.h Changed

ncmpc-0.24.tar.xz/src/screen_file.c -> ncmpc-0.27.tar.xz/src/screen_file.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -21,7 +21,7 @@
 #include "screen_browser.h"
 #include "screen_interface.h"
 #include "screen_status.h"
-#include "screen_queue.h"
+#include "save_playlist.h"
 #include "screen.h"
 #include "config.h"
 #include "i18n.h"
@@ -43,16 +43,6 @@
 static char *current_path;
 
 static void
-screen_file_paint(void);
-
-static void
-screen_file_repaint(void)
-{
-	screen_file_paint();
-	wrefresh(browser.lw->w);
-}
-
-static void
 screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
 {
 	struct mpd_connection *connection;
@@ -220,7 +210,7 @@
 
 		const struct mpd_playlist *playlist = mpd_entity_get_playlist(entity);
 		char *str = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist)));
-		char *buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO);
+		char *buf = g_strdup_printf(_("Delete playlist %s?"), str);
 		g_free(str);
 		bool delete = screen_get_yesno(buf, false);
 		g_free(buf);
@@ -245,7 +235,7 @@
 }
 
 static void
-screen_file_init(WINDOW *w, int cols, int rows)
+screen_file_init(WINDOW *w, unsigned cols, unsigned rows)
 {
 	current_path = g_strdup("");
 
@@ -254,7 +244,7 @@
 }
 
 static void
-screen_file_resize(int cols, int rows)
+screen_file_resize(unsigned cols, unsigned rows)
 {
 	list_window_resize(browser.lw, cols, rows);
 }
@@ -319,7 +309,7 @@
 #endif
 			 )) {
 		screen_browser_sync_highlights(browser.filelist, &c->playlist);
-		screen_file_repaint();
+		screen_file_paint();
 	}
 }
 
@@ -329,7 +319,7 @@
 	switch(cmd) {
 	case CMD_PLAY:
 		if (screen_file_handle_enter(c)) {
-			screen_file_repaint();
+			screen_file_paint();
 			return true;
 		}
 
@@ -337,11 +327,11 @@
 
 	case CMD_GO_ROOT_DIRECTORY:
 		change_directory(c, "");
-		screen_file_repaint();
+		screen_file_paint();
 		return true;
 	case CMD_GO_PARENT_DIRECTORY:
 		change_to_parent(c);
-		screen_file_repaint();
+		screen_file_paint();
 		return true;
 
 	case CMD_LOCATE:
@@ -353,7 +343,7 @@
 	case CMD_SCREEN_UPDATE:
 		screen_file_reload(c);
 		screen_browser_sync_highlights(browser.filelist, &c->playlist);
-		screen_file_repaint();
+		screen_file_paint();
 		return false;
 
 	default:
@@ -362,7 +352,7 @@
 
 	if (browser_cmd(&browser, c, cmd)) {
 		if (screen_is_visible(&screen_browse))
-			screen_file_repaint();
+			screen_file_paint();
 		return true;
 	}
 
@@ -372,7 +362,7 @@
 	switch(cmd) {
 	case CMD_DELETE:
 		handle_delete(c);
-		screen_file_repaint();
+		screen_file_paint();
 		break;
 
 	case CMD_SAVE_PLAYLIST:

ncmpc-0.24.tar.xz/src/screen_file.h -> ncmpc-0.27.tar.xz/src/screen_file.h Changed

ncmpc-0.24.tar.xz/src/screen_find.c -> ncmpc-0.27.tar.xz/src/screen_find.c Changed

ncmpc-0.24.tar.xz/src/screen_find.h -> ncmpc-0.27.tar.xz/src/screen_find.h Changed

ncmpc-0.24.tar.xz/src/screen_help.c -> ncmpc-0.27.tar.xz/src/screen_help.c Changed

ncmpc-0.24.tar.xz/src/screen_help.h -> ncmpc-0.27.tar.xz/src/screen_help.h Changed

ncmpc-0.27.tar.xz/src/screen_init.c Added

@@ -0,0 +1,177 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "screen.h"
+#include "screen_interface.h"
+#include "screen_list.h"
+#include "config.h"
+#include "i18n.h"
+#include "utils.h"
+#include "options.h"
+#include "colors.h"
+
+#include <stdlib.h>
+
+#ifndef NCMPC_MINI
+/** welcome message time [s] */
+static const GTime SCREEN_WELCOME_TIME = 10;
+#endif
+
+/* minimum window size */
+static const unsigned SCREEN_MIN_COLS = 14;
+static const unsigned SCREEN_MIN_ROWS = 5;
+
+void
+screen_exit(void)
+{
+	if (screen.current_page->close != NULL)
+		screen.current_page->close();
+
+	screen_list_exit();
+
+	string_list_free(screen.find_history);
+	g_free(screen.buf);
+	g_free(screen.findbuf);
+
+	title_bar_deinit(&screen.title_bar);
+	delwin(screen.main_window.w);
+	progress_bar_deinit(&screen.progress_bar);
+	status_bar_deinit(&screen.status_bar);
+
+#ifndef NCMPC_MINI
+	if (screen.welcome_source_id != 0)
+		g_source_remove(screen.welcome_source_id);
+#endif
+}
+
+void
+screen_resize(struct mpdclient *c)
+{
+	const unsigned cols = COLS, rows = LINES;
+	if (cols < SCREEN_MIN_COLS || rows < SCREEN_MIN_ROWS) {
+		screen_exit();
+		fprintf(stderr, "%s\n", _("Error: Screen too small"));
+		exit(EXIT_FAILURE);
+	}
+
+#ifdef PDCURSES
+	resize_term(rows, cols);
+#else 
+	resizeterm(rows, cols);
+#endif
+
+	title_bar_resize(&screen.title_bar, cols);
+
+	/* main window */
+	screen.main_window.cols = cols;
+	screen.main_window.rows = rows - 4;
+	wresize(screen.main_window.w, screen.main_window.rows, cols);
+
+	/* progress window */
+	progress_bar_resize(&screen.progress_bar, cols, rows - 2, 0);
+
+	/* status window */
+	status_bar_resize(&screen.status_bar, cols, rows - 1, 0);
+
+	screen.buf_size = cols;
+	g_free(screen.buf);
+	screen.buf = g_malloc(cols);
+
+	/* resize all screens */
+	screen_list_resize(screen.main_window.cols, screen.main_window.rows);
+
+	/* ? - without this the cursor becomes visible with aterm & Eterm */
+	curs_set(1);
+	curs_set(0);
+
+	screen_paint(c, true);
+}
+
+#ifndef NCMPC_MINI
+static gboolean
+welcome_timer_callback(gpointer data)
+{
+	struct mpdclient *c = data;
+
+	screen.welcome_source_id = 0;
+
+	paint_top_window(c);
+	doupdate();
+
+	return false;
+}
+#endif
+
+void
+screen_init(struct mpdclient *c)
+{
+	const unsigned cols = COLS, rows = LINES;
+	if (cols < SCREEN_MIN_COLS || rows < SCREEN_MIN_ROWS) {
+		fprintf(stderr, "%s\n", _("Error: Screen too small"));
+		exit(EXIT_FAILURE);
+	}
+
+	screen.buf = g_malloc(cols);
+	screen.buf_size = cols;
+	screen.findbuf = NULL;
+
+#ifndef NCMPC_MINI
+	if (options.welcome_screen_list)
+		screen.welcome_source_id =
+			g_timeout_add_seconds(SCREEN_WELCOME_TIME,
+					      welcome_timer_callback, c);
+#endif
+
+	/* create top window */
+	title_bar_init(&screen.title_bar, cols, 0, 0);
+
+	/* create main window */
+	window_init(&screen.main_window, rows - 4, cols, 2, 0);
+
+	if (!options.hardware_cursor)
+		leaveok(screen.main_window.w, TRUE);
+
+	keypad(screen.main_window.w, TRUE);
+
+	/* create progress window */
+	progress_bar_init(&screen.progress_bar, cols, rows - 2, 0);
+
+	/* create status window */
+	status_bar_init(&screen.status_bar, cols, rows - 1, 0);
+
+#ifdef ENABLE_COLORS
+	if (options.enable_colors) {
+		/* set background attributes */
+		wbkgd(stdscr, COLOR_PAIR(COLOR_LIST));
+		wbkgd(screen.main_window.w,     COLOR_PAIR(COLOR_LIST));
+		wbkgd(screen.title_bar.window.w, COLOR_PAIR(COLOR_TITLE));
+		wbkgd(screen.progress_bar.window.w,
+		      COLOR_PAIR(COLOR_PROGRESSBAR));
+		wbkgd(screen.status_bar.window.w, COLOR_PAIR(COLOR_STATUS));
+		colors_use(screen.progress_bar.window.w, COLOR_PROGRESSBAR);
+	}
+#endif
+
+	/* initialize screens */
+	screen_list_init(screen.main_window.w,
+			 screen.main_window.cols, screen.main_window.rows);
+
+	if (screen.current_page->open != NULL)
+		screen.current_page->open(c);
+}

ncmpc-0.24.tar.xz/src/screen_interface.h -> ncmpc-0.27.tar.xz/src/screen_interface.h Changed

ncmpc-0.24.tar.xz/src/screen_keydef.c -> ncmpc-0.27.tar.xz/src/screen_keydef.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -195,13 +195,6 @@
 static void
 keydef_paint(void);
 
-static void
-keydef_repaint(void)
-{
-	keydef_paint();
-	wrefresh(lw->w);
-}
-
 /** lw->start the last time switch_to_subcmd_mode() was called */
 static unsigned saved_start = 0;
 
@@ -216,7 +209,7 @@
 	list_window_reset(lw);
 	check_subcmd_length();
 
-	keydef_repaint();
+	keydef_paint();
 }
 
 static void
@@ -230,7 +223,7 @@
 
 	lw->start = saved_start;
 
-	keydef_repaint();
+	keydef_paint();
 }
 
 /**
@@ -257,7 +250,7 @@
 	screen_status_printf(_("Deleted"));
 
 	/* repaint */
-	keydef_repaint();
+	keydef_paint();
 
 	/* update key conflict flags */
 	check_key_bindings(cmds, NULL, 0);
@@ -300,7 +293,7 @@
 	check_subcmd_length();
 
 	/* repaint */
-	keydef_repaint();
+	keydef_paint();
 
 	/* update key conflict flags */
 	check_key_bindings(cmds, NULL, 0);
@@ -366,13 +359,13 @@
 }
 
 static void
-keydef_init(WINDOW *w, int cols, int rows)
+keydef_init(WINDOW *w, unsigned cols, unsigned rows)
 {
 	lw = list_window_init(w, cols, rows);
 }
 
 static void
-keydef_resize(int cols, int rows)
+keydef_resize(unsigned cols, unsigned rows)
 {
 	list_window_resize(lw, cols, rows);
 }
@@ -440,7 +433,7 @@
 		return false;
 
 	if (list_window_cmd(lw, cmd)) {
-		keydef_repaint();
+		keydef_paint();
 		return true;
 	}
 
@@ -490,7 +483,7 @@
 	case CMD_LIST_FIND_NEXT:
 	case CMD_LIST_RFIND_NEXT:
 		screen_find(lw, cmd, list_callback, NULL);
-		keydef_repaint();
+		keydef_paint();
 		return true;
 
 	default:

ncmpc-0.24.tar.xz/src/screen_keydef.h -> ncmpc-0.27.tar.xz/src/screen_keydef.h Changed

ncmpc-0.24.tar.xz/src/screen_list.c -> ncmpc-0.27.tar.xz/src/screen_list.c Changed

ncmpc-0.24.tar.xz/src/screen_list.h -> ncmpc-0.27.tar.xz/src/screen_list.h Changed

ncmpc-0.24.tar.xz/src/screen_lyrics.c -> ncmpc-0.27.tar.xz/src/screen_lyrics.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -269,13 +269,13 @@
 }
 
 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);
 }
@@ -363,11 +363,9 @@
 	}
 
 	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;
@@ -453,7 +451,7 @@
 	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:

ncmpc-0.24.tar.xz/src/screen_lyrics.h -> ncmpc-0.27.tar.xz/src/screen_lyrics.h Changed

ncmpc-0.24.tar.xz/src/screen_outputs.c -> ncmpc-0.27.tar.xz/src/screen_outputs.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -34,16 +34,6 @@
 
 static GPtrArray *mpd_outputs = NULL;
 
-static void
-outputs_paint(void);
-
-static void
-outputs_repaint(void)
-{
-	outputs_paint();
-	wrefresh(lw->w);
-}
-
 static bool
 toggle_output(struct mpdclient *c, unsigned int output_index)
 {
@@ -132,7 +122,7 @@
 }
 
 static void
-outputs_init(WINDOW *w, int cols, int rows)
+outputs_init(WINDOW *w, unsigned cols, unsigned rows)
 {
 	lw = list_window_init(w, cols, rows);
 
@@ -140,7 +130,7 @@
 }
 
 static void
-outputs_resize(int cols, int rows)
+outputs_resize(unsigned cols, unsigned rows)
 {
 	list_window_resize(lw, cols, rows);
 }
@@ -201,7 +191,7 @@
 	if (c->events & MPD_IDLE_OUTPUT) {
 		clear_outputs_list();
 		fill_outputs_list(c);
-		outputs_repaint();
+		outputs_paint();
 	}
 }
 
@@ -211,7 +201,7 @@
 	assert(mpd_outputs != NULL);
 
 	if (list_window_cmd(lw, cmd)) {
-		outputs_repaint();
+		outputs_paint();
 		return true;
 	}
 
@@ -223,7 +213,7 @@
 	case CMD_SCREEN_UPDATE:
 		clear_outputs_list();
 		fill_outputs_list(c);
-		outputs_repaint();
+		outputs_paint();
 		return true;
 
 	default:

ncmpc-0.24.tar.xz/src/screen_outputs.h -> ncmpc-0.27.tar.xz/src/screen_outputs.h Changed

ncmpc-0.27.tar.xz/src/screen_paint.c Added

@@ -0,0 +1,94 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "screen.h"
+#include "screen_interface.h"
+#include "config.h"
+#include "mpdclient.h"
+#include "options.h"
+#include "player_command.h"
+
+#include <mpd/client.h>
+
+#include <assert.h>
+
+void
+paint_top_window(const struct mpdclient *c)
+{
+	const char *title =
+#ifndef NCMPC_MINI
+		screen.welcome_source_id == 0 &&
+#endif
+		screen.current_page->get_title != NULL
+		? screen.current_page->get_title(screen.buf, screen.buf_size)
+		: "";
+	assert(title != NULL);
+
+	title_bar_paint(&screen.title_bar, title, c->status);
+}
+
+static void
+update_progress_window(struct mpdclient *c, bool repaint)
+{
+	unsigned elapsed;
+	if (c->status == NULL)
+		elapsed = 0;
+	else if (seek_id >= 0 && seek_id == mpd_status_get_song_id(c->status))
+		elapsed = seek_target_time;
+	else
+		elapsed = mpd_status_get_elapsed_time(c->status);
+
+	unsigned duration = mpdclient_is_playing(c)
+		? mpd_status_get_total_time(c->status)
+		: 0;
+
+	if (progress_bar_set(&screen.progress_bar, elapsed, duration) ||
+	    repaint)
+		progress_bar_paint(&screen.progress_bar);
+}
+
+void
+screen_paint(struct mpdclient *c, bool main_dirty)
+{
+	/* update title/header window */
+	paint_top_window(c);
+
+	/* paint the bottom window */
+
+	update_progress_window(c, true);
+	status_bar_paint(&screen.status_bar, c->status, c->song);
+
+	/* paint the main window */
+
+	if (main_dirty) {
+		wclear(screen.main_window.w);
+		if (screen.current_page->paint != NULL)
+			screen.current_page->paint();
+	}
+
+	/* move the cursor to the origin */
+
+	if (!options.hardware_cursor)
+		wmove(screen.main_window.w, 0, 0);
+
+	wnoutrefresh(screen.main_window.w);
+
+	/* tell curses to update */
+	doupdate();
+}

ncmpc-0.24.tar.xz/src/screen_queue.c -> ncmpc-0.27.tar.xz/src/screen_queue.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -22,6 +22,7 @@
 #include "screen_file.h"
 #include "screen_status.h"
 #include "screen_find.h"
+#include "save_playlist.h"
 #include "config.h"
 #include "i18n.h"
 #include "charset.h"
@@ -35,6 +36,7 @@
 #include "screen_utils.h"
 #include "screen_song.h"
 #include "screen_lyrics.h"
+#include "db_completion.h"
 #include "Compiler.h"
 
 #ifndef NCMPC_MINI
@@ -181,32 +183,6 @@
 }
 
 #ifndef NCMPC_MINI
-static void
-save_pre_completion_cb(GCompletion *gcmp, gcc_unused gchar *line,
-		       void *data)
-{
-	completion_callback_data_t *tmp = (completion_callback_data_t *)data;
-	GList **list = tmp->list;
-	struct mpdclient *c = tmp->c;
-
-	if( *list == NULL ) {
-		/* create completion list */
-		*list = gcmp_list_from_path(c, "", NULL, GCMP_TYPE_PLAYLIST);
-		g_completion_add_items(gcmp, *list);
-	}
-}
-
-static void
-save_post_completion_cb(gcc_unused GCompletion *gcmp,
-			gcc_unused gchar *line, GList *items,
-			gcc_unused void *data)
-{
-	if (g_list_length(items) >= 1)
-		screen_display_completion_list(items);
-}
-#endif
-
-#ifndef NCMPC_MINI
 /**
  * Wrapper for strncmp().  We are not allowed to pass &strncmp to
  * g_completion_set_compare(), because strncmp() takes size_t where
@@ -219,103 +195,6 @@
 }
 #endif
 
-int
-playlist_save(struct mpdclient *c, char *name, char *defaultname)
-{
-	struct mpd_connection *connection;
-	gchar *filename;
-
-#ifdef NCMPC_MINI
-	(void)defaultname;
-#endif
-
-#ifndef NCMPC_MINI
-	if (name == NULL) {
-		/* initialize completion support */
-		GCompletion *gcmp = g_completion_new(NULL);
-		g_completion_set_compare(gcmp, completion_strncmp);
-		GList *list = NULL;
-		completion_callback_data_t data = {
-			.list = &list,
-			.dir_list = NULL,
-			.c = c,
-		};
-		wrln_completion_callback_data = &data;
-		wrln_pre_completion_callback = save_pre_completion_cb;
-		wrln_post_completion_callback = save_post_completion_cb;
-
-
-		/* query the user for a filename */
-		filename = screen_readln(_("Save queue as"),
-					 defaultname,
-					 NULL,
-					 gcmp);
-
-		/* destroy completion support */
-		wrln_completion_callback_data = NULL;
-		wrln_pre_completion_callback = NULL;
-		wrln_post_completion_callback = NULL;
-		g_completion_free(gcmp);
-		list = string_list_free(list);
-		if( filename )
-			filename=g_strstrip(filename);
-	} else
-#endif
-		filename=g_strdup(name);
-
-	if (filename == NULL)
-		return -1;
-
-	/* send save command to mpd */
-
-	connection = mpdclient_get_connection(c);
-	if (connection == NULL) {
-		g_free(filename);
-		return -1;
-	}
-
-	char *filename_utf8 = locale_to_utf8(filename);
-	if (!mpd_run_save(connection, filename_utf8)) {
-		if (mpd_connection_get_error(connection) == MPD_ERROR_SERVER &&
-		    mpd_connection_get_server_error(connection) == MPD_SERVER_ERROR_EXIST &&
-		    mpd_connection_clear_error(connection)) {
-			char *buf = g_strdup_printf(_("Replace %s [%s/%s] ? "),
-						    filename, YES, NO);
-			bool replace = screen_get_yesno(buf, false);
-			g_free(buf);
-
-			if (!replace) {
-				g_free(filename_utf8);
-				g_free(filename);
-				screen_status_printf(_("Aborted"));
-				return -1;
-			}
-
-			if (!mpd_run_rm(connection, filename_utf8) ||
-			    !mpd_run_save(connection, filename_utf8)) {
-				mpdclient_handle_error(c);
-				g_free(filename_utf8);
-				g_free(filename);
-				return -1;
-			}
-		} else {
-			mpdclient_handle_error(c);
-			g_free(filename_utf8);
-			g_free(filename);
-			return -1;
-		}
-	}
-
-	c->events |= MPD_IDLE_STORED_PLAYLIST;
-
-	g_free(filename_utf8);
-
-	/* success */
-	screen_status_printf(_("Saved %s"), filename);
-	g_free(filename);
-	return 0;
-}
-
 #ifndef NCMPC_MINI
 static void add_dir(GCompletion *gcmp, gchar *dir, GList **dir_list,
 		    GList **list, struct mpdclient *c)
@@ -415,7 +294,7 @@
 }
 
 static void
-screen_queue_init(WINDOW *w, int cols, int rows)
+screen_queue_init(WINDOW *w, unsigned cols, unsigned rows)
 {
 	lw = list_window_init(w, cols, rows);
 
@@ -442,8 +321,8 @@
 		lw->hide_cursor = true;
 		screen_queue_repaint();
 	} else
-		timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
-						     timer_hide_cursor, c);
+		timer_hide_cursor_id = g_timeout_add_seconds(options.hide_cursor,
+							     timer_hide_cursor, c);
 
 	return FALSE;
 }
@@ -456,8 +335,8 @@
 	assert(timer_hide_cursor_id == 0);
 	if (options.hide_cursor > 0) {
 		lw->hide_cursor = false;
-		timer_hide_cursor_id = g_timeout_add(options.hide_cursor * 1000,
-						     timer_hide_cursor, c);
+		timer_hide_cursor_id = g_timeout_add_seconds(options.hide_cursor,
+							     timer_hide_cursor, c);
 	}
 
 	screen_queue_restore_selection();
@@ -479,7 +358,7 @@
 }
 
 static void
-screen_queue_resize(int cols, int rows)
+screen_queue_resize(unsigned cols, unsigned rows)
 {
 	list_window_resize(lw, cols, rows);
 }

ncmpc-0.24.tar.xz/src/screen_queue.h -> ncmpc-0.27.tar.xz/src/screen_queue.h Changed

ncmpc-0.24.tar.xz/src/screen_search.c -> ncmpc-0.27.tar.xz/src/screen_search.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -112,16 +112,6 @@
 	return help_text[idx];
 }
 
-static void
-screen_search_paint(void);
-
-static void
-search_repaint(void)
-{
-	screen_search_paint();
-	wrefresh(browser.lw->w);
-}
-
 /* sanity check search mode value */
 static void
 search_check_mode(void)
@@ -349,7 +339,7 @@
 }
 
 static void
-screen_search_init(WINDOW *w, int cols, int rows)
+screen_search_init(WINDOW *w, unsigned cols, unsigned rows)
 {
 	browser.lw = list_window_init(w, cols, rows);
 	if (options.search_format != NULL) {
@@ -387,7 +377,7 @@
 }
 
 static void
-screen_search_resize(int cols, int rows)
+screen_search_resize(unsigned cols, unsigned rows)
 {
 	list_window_resize(browser.lw, cols, rows);
 }
@@ -427,7 +417,7 @@
 {
 	if (browser.filelist != NULL && c->events & MPD_IDLE_QUEUE) {
 		screen_browser_sync_highlights(browser.filelist, &c->playlist);
-		search_repaint();
+		screen_search_paint();
 	}
 }
 
@@ -441,21 +431,21 @@
 			options.search_mode = 0;
 		screen_status_printf(_("Search mode: %s"),
 				     _(mode[options.search_mode].label));
-		/* continue and update... */
+		/* fall through */
 	case CMD_SCREEN_UPDATE:
 		screen_search_reload(c);
-		search_repaint();
+		screen_search_paint();
 		return true;
 
 	case CMD_SCREEN_SEARCH:
 		search_new(c);
-		search_repaint();
+		screen_search_paint();
 		return true;
 
 	case CMD_CLEAR:
 		search_clear(true);
 		list_window_reset(browser.lw);
-		search_repaint();
+		screen_search_paint();
 		return true;
 
 	default:
@@ -465,7 +455,7 @@
 	if (browser.filelist != NULL &&
 	    browser_cmd(&browser, c, cmd)) {
 		if (screen_is_visible(&screen_search))
-			search_repaint();
+			screen_search_paint();
 		return true;
 	}

ncmpc-0.24.tar.xz/src/screen_search.h -> ncmpc-0.27.tar.xz/src/screen_search.h Changed

ncmpc-0.24.tar.xz/src/screen_song.c -> ncmpc-0.27.tar.xz/src/screen_song.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -25,7 +25,7 @@
 #include "i18n.h"
 #include "screen.h"
 #include "charset.h"
-#include "utils.h"
+#include "time_format.h"
 #include "mpdclient.h"
 
 #include <mpd/client.h>
@@ -112,19 +112,6 @@
 	}
 }
 
-static void
-screen_song_paint(void);
-
-/**
- * Repaint and update the screen.
- */
-static void
-screen_song_repaint(void)
-{
-	screen_song_paint();
-	wrefresh(lw->w);
-}
-
 static const char *
 screen_song_list_callback(unsigned idx, gcc_unused void *data)
 {
@@ -135,7 +122,7 @@
 
 
 static void
-screen_song_init(WINDOW *w, int cols, int rows)
+screen_song_init(WINDOW *w, unsigned cols, unsigned rows)
 {
 	for (unsigned i = 0; i < G_N_ELEMENTS(tag_labels); ++i) {
 		if (tag_labels[i] != NULL) {
@@ -173,7 +160,7 @@
 }
 
 static void
-screen_song_resize(int cols, int rows)
+screen_song_resize(unsigned cols, unsigned rows)
 {
 	list_window_resize(lw, cols, rows);
 }
@@ -366,6 +353,41 @@
 }
 
 static void
+audio_format_to_string(char *buffer, size_t size,
+		       const struct mpd_audio_format *format)
+{
+#if LIBMPDCLIENT_CHECK_VERSION(2,10,0)
+	if (format->bits == MPD_SAMPLE_FORMAT_FLOAT) {
+		g_snprintf(buffer, size, "%u:f:%u",
+			   format->sample_rate,
+			   format->channels);
+		return;
+	}
+
+	if (format->bits == MPD_SAMPLE_FORMAT_DSD) {
+		if (format->sample_rate > 0 &&
+		    format->sample_rate % 44100 == 0) {
+			/* use shortcuts such as "dsd64" which implies the
+			   sample rate */
+			g_snprintf(buffer, size, "dsd%u:%u",
+				   format->sample_rate * 8 / 44100,
+				   format->channels);
+			return;
+		}
+
+		g_snprintf(buffer, size, "%u:dsd:%u",
+			   format->sample_rate,
+			   format->channels);
+		return;
+	}
+#endif
+
+	g_snprintf(buffer, size, "%u:%u:%u",
+		   format->sample_rate, format->bits,
+		   format->channels);
+}
+
+static void
 screen_song_update(struct mpdclient *c)
 {
 	/* Clear all lines */
@@ -410,9 +432,7 @@
 			mpd_status_get_audio_format(c->status);
 		if (format) {
 			char buf[32];
-			g_snprintf(buf, sizeof(buf), _("%u:%u:%u"),
-				   format->sample_rate, format->bits,
-				   format->channels);
+			audio_format_to_string(buf, sizeof(buf), format);
 			screen_song_append(_(tag_labels[LABEL_FORMAT]), buf,
 					   max_tag_label_width);
 		}
@@ -426,14 +446,14 @@
 		mpdclient_handle_error(c);
 
 	list_window_set_length(lw, current.lines->len);
-	screen_song_repaint();
+	screen_song_paint();
 }
 
 static bool
 screen_song_cmd(struct mpdclient *c, command_t cmd)
 {
 	if (list_window_scroll_cmd(lw, cmd)) {
-		screen_song_repaint();
+		screen_song_paint();
 		return true;
 	}
 
@@ -479,7 +499,7 @@
 	if (screen_find(lw, cmd, screen_song_list_callback, NULL)) {
 		/* center the row */
 		list_window_center(lw, lw->selected);
-		screen_song_repaint();
+		screen_song_paint();
 		return true;
 	}

ncmpc-0.24.tar.xz/src/screen_song.h -> ncmpc-0.27.tar.xz/src/screen_song.h Changed

ncmpc-0.24.tar.xz/src/screen_status.c -> ncmpc-0.27.tar.xz/src/screen_status.c Changed

ncmpc-0.24.tar.xz/src/screen_status.h -> ncmpc-0.27.tar.xz/src/screen_status.h Changed

ncmpc-0.24.tar.xz/src/screen_text.c -> ncmpc-0.27.tar.xz/src/screen_text.c Changed

ncmpc-0.24.tar.xz/src/screen_text.h -> ncmpc-0.27.tar.xz/src/screen_text.h Changed

ncmpc-0.24.tar.xz/src/screen_utils.c -> ncmpc-0.27.tar.xz/src/screen_utils.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -38,6 +38,17 @@
 		flash();
 }
 
+static bool
+ignore_key(int key)
+{
+	return
+#ifdef HAVE_GETMOUSE
+		/* ignore mouse events */
+		key == KEY_MOUSE ||
+#endif
+		key == ERR;
+}
+
 int
 screen_getch(const char *prompt)
 {
@@ -52,14 +63,7 @@
 	curs_set(1);
 
 	int key;
-	while ((key = wgetch(w)) == ERR)
-		;
-
-#ifdef HAVE_GETMOUSE
-	/* ignore mouse events */
-	if (key == KEY_MOUSE)
-		return screen_getch(prompt);
-#endif
+	while (ignore_key(key = wgetch(w))) {}
 
 	noecho();
 	curs_set(0);
@@ -68,12 +72,15 @@
 }
 
 bool
-screen_get_yesno(const char *prompt, bool def)
+screen_get_yesno(const char *_prompt, bool def)
 {
 	/* NOTE: if one day a translator decides to use a multi-byte character
 	   for one of the yes/no keys, we'll have to parse it properly */
 
+	char *prompt = g_strdup_printf(_("%s [%s/%s] "), _prompt, YES, NO);
 	int key = tolower(screen_getch(prompt));
+	g_free(prompt);
+
 	if (key == YES[0])
 		return true;
 	else if (key == NO[0])
@@ -153,28 +160,5 @@
 	}
 
 	wrefresh(w);
-	doupdate();
 	colors_use(w, COLOR_LIST);
 }
-
-#ifndef NCMPC_MINI
-void
-set_xterm_title(const char *format, ...)
-{
-	/* the current xterm title exists under the WM_NAME property */
-	/* and can be retrieved with xprop -id $WINDOWID */
-
-	if (options.enable_xterm_title) {
-		if (g_getenv("WINDOWID")) {
-			va_list ap;
-			va_start(ap,format);
-			char *msg = g_strdup_vprintf(format,ap);
-			va_end(ap);
-			printf("\033]0;%s\033\\", msg);
-			fflush(stdout);
-			g_free(msg);
-		} else
-			options.enable_xterm_title = FALSE;
-	}
-}
-#endif

ncmpc-0.24.tar.xz/src/screen_utils.h -> ncmpc-0.27.tar.xz/src/screen_utils.h Changed

ncmpc-0.27.tar.xz/src/signals.c Added

@@ -0,0 +1,119 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "signals.h"
+#include "screen.h"
+#include "Compiler.h"
+
+#include <glib-unix.h>
+
+#include <stdbool.h>
+
+static int sigwinch_pipes[2];
+
+static gboolean
+handle_quit_signal(gpointer data)
+{
+	GMainLoop *main_loop = data;
+
+	g_main_loop_quit(main_loop);
+	return false;
+}
+
+static gboolean
+sigwinch_event(gcc_unused GIOChannel *source,
+               gcc_unused GIOCondition condition, gpointer data)
+{
+	struct mpdclient *c = data;
+
+	char ignoreme[64];
+	if (1 > read(sigwinch_pipes[0], ignoreme, 64))
+		exit(EXIT_FAILURE);
+
+	endwin();
+	refresh();
+	screen_resize(c);
+
+	return TRUE;
+}
+
+static void
+catch_sigwinch(gcc_unused int sig)
+{
+	if (1 != write(sigwinch_pipes[1], "", 1))
+		exit(EXIT_FAILURE);
+}
+
+void
+signals_init(GMainLoop *main_loop, struct mpdclient *c)
+{
+	/* setup quit signals */
+	g_unix_signal_add(SIGTERM, handle_quit_signal, main_loop);
+	g_unix_signal_add(SIGINT, handle_quit_signal, main_loop);
+	g_unix_signal_add(SIGHUP, handle_quit_signal, main_loop);
+
+	/* setup signal behavior - SIGCONT */
+
+	struct sigaction act;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = 0;
+
+	act.sa_handler = catch_sigwinch;
+	if (sigaction(SIGCONT, &act, NULL) < 0) {
+		perror("sigaction(SIGCONT)");
+		exit(EXIT_FAILURE);
+	}
+
+	/* setup SIGWINCH */
+
+	act.sa_flags = SA_RESTART;
+	act.sa_handler = catch_sigwinch;
+	if (sigaction(SIGWINCH, &act, NULL) < 0) {
+		perror("sigaction(SIGWINCH)");
+		exit(EXIT_FAILURE);
+	}
+
+#ifndef WIN32
+	if (!pipe(sigwinch_pipes) &&
+		!fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
+		GIOChannel *sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);
+		g_io_add_watch(sigwinch_channel, G_IO_IN, sigwinch_event, c);
+		g_io_channel_unref(sigwinch_channel);
+	}
+	else {
+		perror("sigwinch pipe creation failed");
+		exit(EXIT_FAILURE);
+	}
+#endif
+
+	/* ignore SIGPIPE */
+
+	act.sa_handler = SIG_IGN;
+	if (sigaction(SIGPIPE, &act, NULL) < 0) {
+		perror("sigaction(SIGPIPE)");
+		exit(EXIT_FAILURE);
+	}
+}
+
+void
+signals_deinit(void)
+{
+	close(sigwinch_pipes[0]);
+	close(sigwinch_pipes[1]);
+}

ncmpc-0.27.tar.xz/src/signals.h Added

@@ -0,0 +1,49 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef SIGNALS_H
+#define SIGNALS_H
+
+#include <glib.h>
+
+struct mpdclient;
+
+#ifdef WIN32
+
+static inline void
+signals_init(GMainLoop *main_loop, struct mpdclient *c)
+{
+	(void)main_loop;
+	(void)c;
+}
+
+static inline void
+signals_deinit(void) {}
+
+#else
+
+void
+signals_init(GMainLoop *main_loop, struct mpdclient *c);
+
+void
+signals_deinit(void);
+
+#endif
+
+#endif

ncmpc-0.24.tar.xz/src/song_paint.c -> ncmpc-0.27.tar.xz/src/song_paint.c Changed

ncmpc-0.24.tar.xz/src/song_paint.h -> ncmpc-0.27.tar.xz/src/song_paint.h Changed

ncmpc-0.24.tar.xz/src/status_bar.c -> ncmpc-0.27.tar.xz/src/status_bar.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -24,7 +24,7 @@
 #include "charset.h"
 #include "strfsong.h"
 #include "player_command.h"
-#include "utils.h"
+#include "time_format.h"
 
 #include <mpd/client.h>
 
@@ -178,15 +178,7 @@
 #endif
 		}
 	} else {
-#ifndef NCMPC_MINI
-		if (options.display_time) {
-			time_t timep;
-
-			time(&timep);
-			strftime(buffer, sizeof(buffer), "%X ",localtime(&timep));
-		} else
-#endif
-			buffer[0] = 0;
+		buffer[0] = 0;
 	}
 
 	/* display song */
@@ -269,6 +261,6 @@
 
 	if (p->message_source_id != 0)
 		g_source_remove(p->message_source_id);
-	p->message_source_id = g_timeout_add(options.status_message_time * 1000,
-					     status_bar_clear_message_cb, p);
+	p->message_source_id = g_timeout_add_seconds(options.status_message_time,
+						     status_bar_clear_message_cb, p);
 }

ncmpc-0.24.tar.xz/src/status_bar.h -> ncmpc-0.27.tar.xz/src/status_bar.h Changed

ncmpc-0.24.tar.xz/src/strfsong.c -> ncmpc-0.27.tar.xz/src/strfsong.c Changed

ncmpc-0.24.tar.xz/src/strfsong.h -> ncmpc-0.27.tar.xz/src/strfsong.h Changed

ncmpc-0.27.tar.xz/src/time_format.c Added

@@ -0,0 +1,76 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "time_format.h"
+#include "i18n.h"
+
+#include <glib.h>
+
+void
+format_duration_short(char *buffer, size_t length, unsigned duration)
+{
+	if (duration < 3600)
+		g_snprintf(buffer, length,
+			   "%i:%02i", duration / 60, duration % 60);
+	else
+		g_snprintf(buffer, length,
+			   "%i:%02i:%02i", duration / 3600,
+			   (duration % 3600) / 60, duration % 60);
+}
+
+void
+format_duration_long(char *p, size_t length, unsigned long duration)
+{
+	unsigned bytes_written = 0;
+
+	if (duration / 31536000 > 0) {
+		if (duration / 31536000 == 1)
+			bytes_written = g_snprintf(p, length, "%d %s, ", 1, _("year"));
+		else
+			bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, _("years"));
+		duration %= 31536000;
+		length -= bytes_written;
+		p += bytes_written;
+	}
+	if (duration / 604800 > 0) {
+		if (duration / 604800 == 1)
+			bytes_written = g_snprintf(p, length, "%d %s, ",
+						   1, _("week"));
+		else
+			bytes_written = g_snprintf(p, length, "%lu %s, ",
+						   duration / 604800, _("weeks"));
+		duration %= 604800;
+		length -= bytes_written;
+		p += bytes_written;
+	}
+	if (duration / 86400 > 0) {
+		if (duration / 86400 == 1)
+			bytes_written = g_snprintf(p, length, "%d %s, ",
+						   1, _("day"));
+		else
+			bytes_written = g_snprintf(p, length, "%lu %s, ",
+						   duration / 86400, _("days"));
+		duration %= 86400;
+		length -= bytes_written;
+		p += bytes_written;
+	}
+
+	g_snprintf(p, length, "%02lu:%02lu:%02lu", duration / 3600,
+		   duration % 3600 / 60, duration % 3600 % 60);
+}

ncmpc-0.27.tar.xz/src/time_format.h Added

@@ -0,0 +1,31 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef TIME_FORMAT_H
+#define TIME_FORMAT_H
+
+#include <stddef.h>
+
+void
+format_duration_short(char *buffer, size_t length, unsigned duration);
+
+void
+format_duration_long(char *buffer, size_t length, unsigned long duration);
+
+#endif

ncmpc-0.24.tar.xz/src/title_bar.c -> ncmpc-0.27.tar.xz/src/title_bar.c Changed

ncmpc-0.24.tar.xz/src/title_bar.h -> ncmpc-0.27.tar.xz/src/title_bar.h Changed

ncmpc-0.24.tar.xz/src/utils.c -> ncmpc-0.27.tar.xz/src/utils.c Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -18,27 +18,14 @@
  */
 
 #include "utils.h"
-#include "options.h"
-#include "charset.h"
-#include "i18n.h"
-#include "mpdclient.h"
 
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 
 GList *
 string_list_free(GList *string_list)
 {
-	GList *list = g_list_first(string_list);
-
-	while (list) {
-		g_free(list->data);
-		list->data = NULL;
-		list = list->next;
-	}
-
-	g_list_free(string_list);
+	g_list_free_full(string_list, g_free);
 	return NULL;
 }
 
@@ -70,104 +57,3 @@
 	}
 	return list;
 }
-
-/* create a list suitable for GCompletion from path */
-GList *
-gcmp_list_from_path(struct mpdclient *c, const gchar *path,
-		    GList *list, gint types)
-{
-	struct mpd_connection *connection = mpdclient_get_connection(c);
-	if (connection == NULL)
-		return list;
-
-	mpd_send_list_meta(connection, path);
-
-	struct mpd_entity *entity;
-	while ((entity = mpd_recv_entity(connection)) != NULL) {
-		char *name;
-
-		if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY &&
-		    types & GCMP_TYPE_DIR) {
-			const struct mpd_directory *dir =
-				mpd_entity_get_directory(entity);
-			gchar *tmp = utf8_to_locale(mpd_directory_get_path(dir));
-			gsize size = strlen(tmp)+2;
-
-			name = g_malloc(size);
-			g_strlcpy(name, tmp, size);
-			g_strlcat(name, "/", size);
-			g_free(tmp);
-		} else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG &&
-			   types & GCMP_TYPE_FILE) {
-			const struct mpd_song *song =
-				mpd_entity_get_song(entity);
-			name = utf8_to_locale(mpd_song_get_uri(song));
-		} else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST &&
-			   types & GCMP_TYPE_PLAYLIST) {
-			const struct mpd_playlist *playlist =
-				mpd_entity_get_playlist(entity);
-			name = utf8_to_locale(mpd_playlist_get_path(playlist));
-		} else {
-			mpd_entity_free(entity);
-			continue;
-		}
-
-		list = g_list_append(list, name);
-		mpd_entity_free(entity);
-	}
-
-	return list;
-}
-
-void
-format_duration_short(char *buffer, size_t length, unsigned duration)
-{
-	if (duration < 3600)
-		g_snprintf(buffer, length,
-			   "%i:%02i", duration / 60, duration % 60);
-	else
-		g_snprintf(buffer, length,
-			   "%i:%02i:%02i", duration / 3600,
-			   (duration % 3600) / 60, duration % 60);
-}
-
-void
-format_duration_long(char *p, size_t length, unsigned long duration)
-{
-	unsigned bytes_written = 0;
-
-	if (duration / 31536000 > 0) {
-		if (duration / 31536000 == 1)
-			bytes_written = g_snprintf(p, length, "%d %s, ", 1, _("year"));
-		else
-			bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, _("years"));
-		duration %= 31536000;
-		length -= bytes_written;
-		p += bytes_written;
-	}
-	if (duration / 604800 > 0) {
-		if (duration / 604800 == 1)
-			bytes_written = g_snprintf(p, length, "%d %s, ",
-						   1, _("week"));
-		else
-			bytes_written = g_snprintf(p, length, "%lu %s, ",
-						   duration / 604800, _("weeks"));
-		duration %= 604800;
-		length -= bytes_written;
-		p += bytes_written;
-	}
-	if (duration / 86400 > 0) {
-		if (duration / 86400 == 1)
-			bytes_written = g_snprintf(p, length, "%d %s, ",
-						   1, _("day"));
-		else
-			bytes_written = g_snprintf(p, length, "%lu %s, ",
-						   duration / 86400, _("days"));
-		duration %= 86400;
-		length -= bytes_written;
-		p += bytes_written;
-	}
-
-	g_snprintf(p, length, "%02lu:%02lu:%02lu", duration / 3600,
-		   duration % 3600 / 60, duration % 3600 % 60);
-}

ncmpc-0.24.tar.xz/src/utils.h -> ncmpc-0.27.tar.xz/src/utils.h Changed

@@ -1,5 +1,5 @@
 /* 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
@@ -22,28 +22,9 @@
 
 #include <glib.h>
 
-struct mpdclient;
-
 /* functions for lists containing strings */
 GList *string_list_free(GList *string_list);
 GList *string_list_find(GList *string_list, const gchar *str);
 GList *string_list_remove(GList *string_list, const gchar *str);
 
-/* create a string list from path - used for completion */
-#define GCMP_TYPE_DIR       (0x01 << 0)
-#define GCMP_TYPE_FILE      (0x01 << 1)
-#define GCMP_TYPE_PLAYLIST  (0x01 << 2)
-#define GCMP_TYPE_RFILE     (GCMP_TYPE_DIR | GCMP_TYPE_FILE)
-#define GCMP_TYPE_RPLAYLIST (GCMP_TYPE_DIR | GCMP_TYPE_PLAYLIST)
-
-GList *
-gcmp_list_from_path(struct mpdclient *c, const gchar *path,
-		    GList *list, gint types);
-
-void
-format_duration_short(char *buffer, size_t length, unsigned duration);
-
-void
-format_duration_long(char *buffer, size_t length, unsigned long duration);
-
 #endif

ncmpc-0.24.tar.xz/src/window.h -> ncmpc-0.27.tar.xz/src/window.h Changed

ncmpc-0.24.tar.xz/src/wreadln.c -> ncmpc-0.27.tar.xz/src/wreadln.c Changed

ncmpc-0.24.tar.xz/src/wreadln.h -> ncmpc-0.27.tar.xz/src/wreadln.h Changed

ncmpc-0.27.tar.xz/src/xterm_title.c Added

@@ -0,0 +1,42 @@
+/* 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "xterm_title.h"
+#include "options.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+void
+set_xterm_title(const char *title)
+{
+	/* the current xterm title exists under the WM_NAME property */
+	/* and can be retrieved with xprop -id $WINDOWID */
+
+	if (!options.enable_xterm_title)
+		return;
+
+	if (getenv("WINDOWID") == NULL) {
+		options.enable_xterm_title = FALSE;
+		return;
+	}
+
+	printf("\033]0;%s\033\\", title);
+	fflush(stdout);
+}

ncmpc-0.27.tar.xz/src/xterm_title.h Added

Changes of Revision 7