@@ -1,4 +1,20 @@

 -------------------------------------------------------------------

+Tue Aug 26 14:02:26 UTC 2014 - pascal.bleser@opensuse.org

+

+- enable chat screen feature from 0.21

+- update to 0.24:

+  * fix crash on "jump" (hotkey ".")

+  * save keys to path specified by --key-file

+- changes from 0.22:

+  * rename "playlist" to "queue"

+  * remove useless "Connected to ..." message

+  * require libmpdclient 2.3, MPD 0.16

+  * patched color line-flags

+  * configuration option "search-format"

+  * remove broken leoslyrics plugin

+  * show audio format in song screen

+

+-------------------------------------------------------------------

 Mon Feb 10 09:51:54 UTC 2014 - pascal.bleser@opensuse.org

 - update to 0.21:

​

@@ -14,15 +14,18 @@

 Name:           ncmpc

-Version:        0.21

+Version:        0.24

 Release:        1

 Summary:        Curses Client for the Music Player Daemon

 License:        GPL-2.0+

 Group:          Productivity/Multimedia/Sound/Players

-Source:         http://www.musicpd.org/download/ncmpc/0/ncmpc-%{version}.tar.bz2

+Source:         http://www.musicpd.org/download/ncmpc/0/ncmpc-%{version}.tar.xz

 URL:            http://mpd.wikia.com/wiki/Client:Ncmpc

 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

-BuildRequires:  glib2-devel libmpdclient-devel pkgconfig ncurses-devel

+BuildRequires:  glib2-devel

+BuildRequires:  libmpdclient-devel >= 2.3

+BuildRequires:  pkgconfig

+BuildRequires:  ncurses-devel

 %description

 ncmpc is a curses client for the Music Player Daemon (MPD). ncmpc connects to 

@@ -46,9 +49,10 @@

     --enable-key-screen \

     --disable-lyrics-screen \

     --enable-outputs-screen \

+    --enable-chat-screen \

     --disable-werror

-%__make %{?_smp_mflags}

+%__make %{?_smp_mflags} V=1

 %install

 %makeinstall

​

@@ -1,162 +0,0 @@

-#! /bin/sh

-# mkinstalldirs --- make directory hierarchy

-

-scriptversion=2009-04-28.21; # UTC

-

-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>

-# Created: 1993-05-16

-# Public domain.

-#

-# This file is maintained in Automake, please report

-# bugs to <bug-automake@gnu.org> or send patches to

-# <automake-patches@gnu.org>.

-

-nl='

-'

-IFS=" ""   $nl"

-errstatus=0

-dirmode=

-

-usage="\

-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...

-

-Create each directory DIR (with mode MODE, if specified), including all

-leading file name components.

-

-Report bugs to <bug-automake@gnu.org>."

-

-# process command line arguments

-while test $# -gt 0 ; do

-  case $1 in

-    -h | --help | --h*)         # -h for help

-      echo "$usage"

-      exit $?

-      ;;

-    -m)                         # -m PERM arg

-      shift

-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }

-      dirmode=$1

-      shift

-      ;;

-    --version)

-      echo "$0 $scriptversion"

-      exit $?

-      ;;

-    --)                         # stop option processing

-      shift

-      break

-      ;;

-    -*)                         # unknown option

-      echo "$usage" 1>&2

-      exit 1

-      ;;

-    *)                          # first non-opt arg

-      break

-      ;;

-  esac

-done

-

-for file

-do

-  if test -d "$file"; then

-    shift

-  else

-    break

-  fi

-done

-

-case $# in

-  0) exit 0 ;;

-esac

-

-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and

-# mkdir -p a/c at the same time, both will detect that a is missing,

-# one will create a, then the other will try to create a and die with

-# a "File exists" error.  This is a problem when calling mkinstalldirs

-# from a parallel make.  We use --version in the probe to restrict

-# ourselves to GNU mkdir, which is thread-safe.

-case $dirmode in

-  '')

-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then

-      echo "mkdir -p -- $*"

-      exec mkdir -p -- "$@"

-    else

-      # On NextStep and OpenStep, the `mkdir' command does not

-      # recognize any option.  It will interpret all options as

-      # directories to create, and then abort because `.' already

-      # exists.

-      test -d ./-p && rmdir ./-p

-      test -d ./--version && rmdir ./--version

-    fi

-    ;;

-  *)

-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&

-       test ! -d ./--version; then

-      echo "mkdir -m $dirmode -p -- $*"

-      exec mkdir -m "$dirmode" -p -- "$@"

-    else

-      # Clean up after NextStep and OpenStep mkdir.

-      for d in ./-m ./-p ./--version "./$dirmode";

-      do

-        test -d $d && rmdir $d

-      done

-    fi

-    ;;

-esac

-

-for file

-do

-  case $file in

-    /*) pathcomp=/ ;;

-    *)  pathcomp= ;;

-  esac

-  oIFS=$IFS

-  IFS=/

-  set fnord $file

-  shift

-  IFS=$oIFS

-

-  for d

-  do

-    test "x$d" = x && continue

-

-    pathcomp=$pathcomp$d

-    case $pathcomp in

-      -*) pathcomp=./$pathcomp ;;

-    esac

-

-    if test ! -d "$pathcomp"; then

-      echo "mkdir $pathcomp"

-

-      mkdir "$pathcomp" || lasterr=$?

-

-      if test ! -d "$pathcomp"; then

-   errstatus=$lasterr

-      else

-   if test ! -z "$dirmode"; then

-     echo "chmod $dirmode $pathcomp"

-     lasterr=

-     chmod "$dirmode" "$pathcomp" || lasterr=$?

-

-     if test ! -z "$lasterr"; then

-       errstatus=$lasterr

-     fi

-   fi

-      fi

-    fi

-

-    pathcomp=$pathcomp/

-  done

-done

-

-exit $errstatus

-

-# Local Variables:

-# mode: shell-script

-# sh-indentation: 2

-# eval: (add-hook 'write-file-hooks 'time-stamp)

-# time-stamp-start: "scriptversion="

-# time-stamp-format: "%:y-%02m-%02d.%02H"

-# time-stamp-time-zone: "UTC"

-# time-stamp-end: "; # UTC"

-# End:

​

@@ -1,21 +0,0 @@

-#!/bin/bash

-

-set -e

-

-search="http://api.leoslyrics.com/api_search.php?auth=ncmpc"

-lyrics="http://api.leoslyrics.com/api_lyrics.php?auth=ncmpc"

-cache="$HOME/.lyrics/$1 - $2.txt"

-

-hid=$(wget -q -O- "$search&artist=$1&songtitle=$2" |

-   sed -n 's/.*hid="\([^"]*\)".*exactMatch="true".*/\1/p' |

-   head -n 1)

-

-test "$hid"

-

-mkdir -p "$(dirname "$cache")"

-

-wget -q -O- "$lyrics&hid=$hid" | awk '

-   /<text>/   { go=1; sub(".*<text>", "")  };

-   /<\/text>/ { go=0; sub("</text>.*", "") };

-   go         { sub("
", ""); print    };

-' | tee "$cache"

​

@@ -1,96 +0,0 @@

-#!/usr/bin/python

-#

-#  (c) 2004-2008 The Music Player Daemon Project

-#  http://www.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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-#

-

-#

-# Load lyrics from leoslyrics.com

-#

-

-from sys import argv, exit, stderr

-from urllib import urlencode, urlopen

-from xml.sax import make_parser, SAXException

-from xml.sax.handler import ContentHandler

-

-class SearchContentHandler(ContentHandler):

-    def __init__(self):

-        self.code = None

-        self.hid = None

-

-    def startElement(self, name, attrs):

-        if name == 'response':

-            self.code = int(attrs['code'])

-        elif name == 'result':

-            if self.hid is None or attrs['exactMatch'] == 'true':

-                self.hid = attrs['hid']

-

-def search(artist, title):

-    query = urlencode({'auth': 'ncmpc',

-                       'artist': artist,

-                       'songtitle': title})

-    url = "http://api.leoslyrics.com/api_search.php?" + query

-    try:

-        f = urlopen(url)

-    except IOError:

-        stderr.write("Failed to connect to http://api.leoslyrics.com, it seems down!\n")

-        exit(1)

-    handler = SearchContentHandler()

-    parser = make_parser()

-    parser.setContentHandler(handler)

-    try:

-        parser.parse(f)

-    except SAXException:

-        stderr.write("Failed to parse the search result!\n")

-        exit(1)

-    return handler.hid

-

-class LyricsContentHandler(ContentHandler):

-    def __init__(self):

-        self.code = None

-        self.is_text = False

-        self.text = None

-

-    def startElement(self, name, attrs):

-        if name == 'text':

-            self.text = ''

-            self.is_text = True

-        else:

-            self.is_text = False

-

-    def characters(self, chars):

-        if self.is_text:

-            self.text += chars

-

-def lyrics(hid):

-    query = urlencode({'auth': 'ncmpc',

-                       'hid': hid})

-    url = "http://api.leoslyrics.com/api_lyrics.php?" + query

-    f = urlopen(url)

-    handler = LyricsContentHandler()

-    parser = make_parser()

-    parser.setContentHandler(handler)

-    try:

-        parser.parse(f)

-    except SAXException:

-        stderr.write("Failed to parse the lyrics!\n")

-        exit(1)

-    return handler.text

-

-hid = search(argv[1], argv[2])

-if hid is None:

-    exit(69)

-print lyrics(hid).encode('utf-8').rstrip()

​

@@ -1,62 +0,0 @@

-/*

- * Copyright (C) 2003-2009 The Music Player Daemon Project

- * http://www.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.

- */

-

-/*

- * Compatibility with older GLib versions.  Some of this isn't

- * implemented properly, just "good enough" to allow users with older

- * operating systems to run MPD.

- */

-

-#ifndef MPD_GLIB_COMPAT_H

-#define MPD_GLIB_COMPAT_H

-

-#include <glib.h>

-

-#if !GLIB_CHECK_VERSION(2,14,0)

-

-#define g_queue_clear(q) do { g_queue_free(q); q = g_queue_new(); } while (0)

-

-static inline guint

-g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data)

-{

-   return g_timeout_add(interval * 1000, function, data);

-}

-

-#endif /* !2.14 */

-

-#if !GLIB_CHECK_VERSION(2,16,0)

-

-static inline void

-g_propagate_prefixed_error(GError **dest_r, GError *src,

-              G_GNUC_UNUSED const gchar *format, ...)

-{

-   g_propagate_error(dest_r, src);

-}

-

-static inline char *

-g_uri_escape_string(const char *unescaped,

-           G_GNUC_UNUSED const char *reserved_chars_allowed,

-           G_GNUC_UNUSED gboolean allow_utf8)

-{

-   return g_strdup(unescaped);

-}

-

-#endif /* !2.16 */

-

-#endif

​

@@ -1,196 +0,0 @@

-/* libmpdclient

-   (c) 2008 Max Kellermann <max@duempel.org>

-   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.

-

-   - Neither the name of the Music Player Daemon nor the names of its

-   contributors may be used to endorse or promote products derived from

-   this software without specific prior written permission.

-

-   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 "config.h"

-#include "resolver.h"

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-#ifdef WIN32

-#  include <ws2tcpip.h>

-#  include <winsock.h>

-#else

-#  include <netdb.h>

-#  include <netinet/in.h>

-#  include <arpa/inet.h>

-#  include <sys/socket.h>

-#  include <sys/un.h>

-#  include <netdb.h>

-#endif

-

-#ifndef MPD_NO_GAI

-#  ifdef AI_ADDRCONFIG

-#    define MPD_HAVE_GAI

-#  endif

-#endif

-

-struct resolver {

-   enum {

-       TYPE_ZERO, TYPE_ONE, TYPE_ANY

-   } type;

-

-#ifdef MPD_HAVE_GAI

-   struct addrinfo *ai;

-   const struct addrinfo *next;

-#else

-   struct sockaddr_in sin;

-#endif

-

-   struct resolver_address current;

-

-#ifndef WIN32

-   struct sockaddr_un saun;

-#endif

-};

-

-struct resolver *

-resolver_new(const char *host, int port)

-{

-   struct resolver *resolver;

-

-   resolver = malloc(sizeof(*resolver));

-   if (resolver == NULL)

-       return NULL;

-

-#ifndef WIN32

-   if (host[0] == '/') {

-       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);

-

-       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 {

-#endif

-#ifdef MPD_HAVE_GAI

-       struct addrinfo hints;

-       char service[20];

-       int ret;

-

-       memset(&hints, 0, sizeof(hints));

-       hints.ai_flags = AI_ADDRCONFIG;

-       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

-#ifndef WIN32

-   }

-#endif

-

-   return resolver;

-}

-

-void

-resolver_free(struct resolver *resolver)

-{

-#ifdef MPD_HAVE_GAI

-   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;

-   }

-

-#ifdef MPD_HAVE_GAI

-   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

-}

​

@@ -1,56 +0,0 @@

-/* libmpdclient

-   (c) 2008 Max Kellermann <max@duempel.org>

-   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.

-

-   - Neither the name of the Music Player Daemon nor the names of its

-   contributors may be used to endorse or promote products derived from

-   this software without specific prior written permission.

-

-   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, int port);

-

-void

-resolver_free(struct resolver *resolver);

-

-const struct resolver_address *

-resolver_next(struct resolver *resolver);

-

-#endif

​

@@ -5,7 +5,7 @@

 ------------

   * a C99 compliant compiler (e.g. gcc)

-  * libmpdclient 2.2

+  * libmpdclient 2.3

   * ncurses (ncursesw for unicode / wide character support)

   * GLib 2.14

​

@@ -2,7 +2,7 @@

   po

 ACLOCAL_AMFLAGS = -I m4

-AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects

+AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects

 AM_CPPFLAGS = \

    $(LIBMPDCLIENT_CFLAGS) \

@@ -12,8 +12,6 @@

    -DSYSCONFDIR=\""$(sysconfdir)"\"

 ncmpc_headers = \

-   src/glib_compat.h \

-   src/resolver.h \

    src/gidle.h \

    src/mpdclient.h \

    src/playlist.h \

@@ -74,8 +72,8 @@

    $(LIBLIRCCLIENT_LIBS)

 src_ncmpc_SOURCES = \

+   src/Compiler.h \

    $(ncmpc_headers) \

-   src/resolver.c \

    src/main.c \

    src/gidle.c \

    src/mpdclient.c \

@@ -207,7 +205,7 @@

 # lyrics plugins

 #

-lyrics_plugins = lyrics/10-hd.sh lyrics/15-leoslyrics.sh lyrics/20-lyricwiki.rb lyrics/30-leoslyrics.py

+lyrics_plugins = lyrics/10-hd.sh lyrics/20-lyricwiki.rb

 if ENABLE_LYRICS_SCREEN

​

@@ -1,9 +1,8 @@

-# Makefile.in generated by automake 1.11.6 from Makefile.am.

+# Makefile.in generated by automake 1.14.1 from Makefile.am.

 # @configure_input@

-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software

-# Foundation, Inc.

+# Copyright (C) 1994-2013 Free Software Foundation, Inc.

+

 # This Makefile.in is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -18,23 +17,51 @@

 VPATH = @srcdir@

-am__make_dryrun = \

-  { \

-    am__dry=no; \

+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'

+am__make_running_with_option = \

+  case $${target_option-} in \

+      ?) ;; \

+      *) echo "am__make_running_with_option: internal error: invalid" \

+              "target option '$${target_option-}' specified" >&2; \

+         exit 1;; \

+  esac; \

+  has_opt=no; \

+  sane_makeflags=$$MAKEFLAGS; \

+  if $(am__is_gnu_make); then \

+    sane_makeflags=$$MFLAGS; \

+  else \

     case $$MAKEFLAGS in \

       *\\[\ \  ]*) \

-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \

-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \

-      *) \

-        for am__flg in $$MAKEFLAGS; do \

-          case $$am__flg in \

-            *=*|--*) ;; \

-            *n*) am__dry=yes; break;; \

-          esac; \

-        done;; \

+        bs=\\; \

+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \

+          | sed "s/$$bs$$bs[$$bs $$bs  ]*//g"`;; \

     esac; \

-    test $$am__dry = yes; \

-  }

+  fi; \

+  skip_next=no; \

+  strip_trailopt () \

+  { \

+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \

+  }; \

+  for flg in $$sane_makeflags; do \

+    test $$skip_next = yes && { skip_next=no; continue; }; \

+    case $$flg in \

+      *=*|--*) continue;; \

+        -*I) strip_trailopt 'I'; skip_next=yes;; \

+      -*I?*) strip_trailopt 'I';; \

+        -*O) strip_trailopt 'O'; skip_next=yes;; \

+      -*O?*) strip_trailopt 'O';; \

+        -*l) strip_trailopt 'l'; skip_next=yes;; \

+      -*l?*) strip_trailopt 'l';; \

+      -[dEDm]) skip_next=yes;; \

+      -[JT]) skip_next=yes;; \

+    esac; \

+    case $$flg in \

+      *$$target_option*) has_opt=yes; break;; \

+    esac; \

+  done; \

+  test $$has_opt = yes

+am__make_dryrun = (target_option=n; $(am__make_running_with_option))

+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))

 pkgdatadir = $(datadir)/@PACKAGE@

 pkgincludedir = $(includedir)/@PACKAGE@

 pkglibdir = $(libdir)/@PACKAGE@

@@ -76,16 +103,23 @@

 @ENABLE_LIRC_TRUE@am__append_12 = src/lirc.c

 check_PROGRAMS = test/run_hscroll$(EXEEXT)

 subdir = .

-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

-   $(srcdir)/Makefile.in $(srcdir)/config.h.in \

-   $(top_srcdir)/configure $(top_srcdir)/doc/doxygen.conf.in \

-   $(top_srcdir)/src/win/ncmpc_win32_rc.rc.in AUTHORS COPYING \

-   INSTALL NEWS build/config.guess build/config.sub build/depcomp \

-   build/install-sh build/missing build/mkinstalldirs

+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_with_curses.m4 \

    $(top_srcdir)/m4/glib-gettext.m4 $(top_srcdir)/m4/nls.m4 \

    $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \

@@ -94,16 +128,16 @@

    $(ACLOCAL_M4)

 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

  configure.lineno config.status.lineno

-mkinstalldirs = $(SHELL) $(top_srcdir)/build/mkinstalldirs

+mkinstalldirs = $(install_sh) -d

 CONFIG_HEADER = config.h

 CONFIG_CLEAN_FILES = src/win/ncmpc_win32_rc.rc doc/doxygen.conf

 CONFIG_CLEAN_VPATH_FILES =

 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(lyricsdir)" \

    "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"

 PROGRAMS = $(bin_PROGRAMS)

-am__src_ncmpc_SOURCES_DIST = src/glib_compat.h src/resolver.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 \

+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 \

@@ -116,9 +150,9 @@

    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/resolver.c 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/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 \

@@ -150,8 +184,8 @@

 @ENABLE_OUTPUTS_SCREEN_TRUE@   src/screen_outputs.$(OBJEXT)

 @ENABLE_CHAT_SCREEN_TRUE@am__objects_12 = src/screen_chat.$(OBJEXT)

 @ENABLE_LIRC_TRUE@am__objects_13 = src/lirc.$(OBJEXT)

-am_src_ncmpc_OBJECTS = $(am__objects_1) src/resolver.$(OBJEXT) \

-   src/main.$(OBJEXT) src/gidle.$(OBJEXT) src/mpdclient.$(OBJEXT) \

+am_src_ncmpc_OBJECTS = $(am__objects_1) src/main.$(OBJEXT) \

+   src/gidle.$(OBJEXT) src/mpdclient.$(OBJEXT) \

    src/playlist.$(OBJEXT) src/filelist.$(OBJEXT) \

    src/options.$(OBJEXT) src/command.$(OBJEXT) src/ncu.$(OBJEXT) \

    src/player_command.$(OBJEXT) src/title_bar.$(OBJEXT) \

@@ -206,24 +240,49 @@

          $(am__cd) "$$dir" && rm -f $$files; }; \

   }

 SCRIPTS = $(lyrics_SCRIPTS)

+AM_V_P = $(am__v_P_@AM_V@)

+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)

+am__v_P_0 = false

+am__v_P_1 = :

+AM_V_GEN = $(am__v_GEN_@AM_V@)

+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)

+am__v_GEN_0 = @echo "  GEN     " $@;

+am__v_GEN_1 = 

+AM_V_at = $(am__v_at_@AM_V@)

+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)

+am__v_at_0 = @

+am__v_at_1 = 

 DEFAULT_INCLUDES = -I.@am__isrc@

 depcomp = $(SHELL) $(top_srcdir)/build/depcomp

 am__depfiles_maybe = depfiles

 am__mv = mv -f

+AM_V_lt = $(am__v_lt_@AM_V@)

+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)

+am__v_lt_0 = --silent

+am__v_lt_1 = 

 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

    $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

+AM_V_CC = $(am__v_CC_@AM_V@)

+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)

+am__v_CC_0 = @echo "  CC      " $@;

+am__v_CC_1 = 

 CCLD = $(CC)

 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

+AM_V_CCLD = $(am__v_CCLD_@AM_V@)

+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)

+am__v_CCLD_0 = @echo "  CCLD    " $@;

+am__v_CCLD_1 = 

 SOURCES = $(src_ncmpc_SOURCES) $(test_run_hscroll_SOURCES)

 DIST_SOURCES = $(am__src_ncmpc_SOURCES_DIST) \

    $(test_run_hscroll_SOURCES)

-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

-   html-recursive info-recursive install-data-recursive \

-   install-dvi-recursive install-exec-recursive \

-   install-html-recursive install-info-recursive \

-   install-pdf-recursive install-ps-recursive install-recursive \

-   installcheck-recursive installdirs-recursive pdf-recursive \

-   ps-recursive uninstall-recursive

+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \

+   ctags-recursive dvi-recursive html-recursive info-recursive \

+   install-data-recursive install-dvi-recursive \

+   install-exec-recursive install-html-recursive \

+   install-info-recursive install-pdf-recursive \

+   install-ps-recursive install-recursive installcheck-recursive \

+   installdirs-recursive pdf-recursive ps-recursive \

+   tags-recursive uninstall-recursive

 am__can_run_installinfo = \

   case $$AM_UPDATE_INFO_DIR in \

     n|no|NO) false;; \

@@ -235,11 +294,33 @@

 DATA = $(doc_DATA) $(noinst_DATA)

 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive    \

   distclean-recursive maintainer-clean-recursive

-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

-   $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

-   distdir dist dist-all distcheck

+am__recursive_targets = \

+  $(RECURSIVE_TARGETS) \

+  $(RECURSIVE_CLEAN_TARGETS) \

+  $(am__extra_recursive_targets)

+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \

+   cscope distdir dist dist-all distcheck

+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \

+   $(LISP)config.h.in

+# Read a list of newline-separated strings from the standard input,

+# and print each of them once, without duplicates.  Input order is

+# *not* preserved.

+am__uniquify_input = $(AWK) '\

+  BEGIN { nonempty = 0; } \

+  { items[$$0] = 1; nonempty = 1; } \

+  END { if (nonempty) { for (i in items) print i; }; } \

+'

+# Make sure the list of sources is unique.  This is necessary because,

+# e.g., the same source file might be shared among _SOURCES variables

+# for different programs/libraries.

+am__define_uniq_tagged_files = \

+  list='$(am__tagged_files)'; \

+  unique=`for i in $$list; do \

+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

+  done | $(am__uniquify_input)`

 ETAGS = etags

 CTAGS = ctags

+CSCOPE = cscope

 DIST_SUBDIRS = $(SUBDIRS)

 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

 distdir = $(PACKAGE)-$(VERSION)

@@ -250,6 +331,7 @@

       && rm -rf "$(distdir)" \

       || { sleep 5 && rm -rf "$(distdir)"; }; \

   else :; fi

+am__post_remove_distdir = $(am__remove_distdir)

 am__relativize = \

   dir0=`pwd`; \

   sed_first='s,^\([^/]*\)/.*$$,\1,'; \

@@ -275,8 +357,9 @@

     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \

   done; \

   reldir="$$dir2"

-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2

+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz

 GZIP_ENV = --best

+DIST_TARGETS = dist-xz dist-gzip

 distuninstallcheck_listfiles = find . -type f -print

 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \

   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'

@@ -284,6 +367,7 @@

 ACLOCAL = @ACLOCAL@

 AMTAR = @AMTAR@

 AM_CFLAGS = @AM_CFLAGS@

+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@

 AUTOCONF = @AUTOCONF@

 AUTOHEADER = @AUTOHEADER@

 AUTOMAKE = @AUTOMAKE@

@@ -346,10 +430,13 @@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

 PKG_CONFIG = @PKG_CONFIG@

+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@

+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@

 POFILES = @POFILES@

 POSUB = @POSUB@

 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@

 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@

+SED = @SED@

 SET_MAKE = @SET_MAKE@

 SHELL = @SHELL@

 STRIP = @STRIP@

@@ -418,7 +505,7 @@

   po

 ACLOCAL_AMFLAGS = -I m4

-AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects

+AUTOMAKE_OPTIONS = foreign 1.11 dist-xz subdir-objects

 AM_CPPFLAGS = \

    $(LIBMPDCLIENT_CFLAGS) \

    $(GLIB_CFLAGS) \

@@ -427,8 +514,6 @@

    -DSYSCONFDIR=\""$(sysconfdir)"\"

 ncmpc_headers = \

-   src/glib_compat.h \

-   src/resolver.h \

    src/gidle.h \

    src/mpdclient.h \

    src/playlist.h \

@@ -486,7 +571,7 @@

    $(GLIB_LIBS) \

    $(LIBLIRCCLIENT_LIBS)

-src_ncmpc_SOURCES = $(ncmpc_headers) src/resolver.c src/main.c \

+src_ncmpc_SOURCES = src/Compiler.h $(ncmpc_headers) 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 \

@@ -520,7 +605,7 @@

 #

 # lyrics plugins

 #

-lyrics_plugins = lyrics/10-hd.sh lyrics/15-leoslyrics.sh lyrics/20-lyricwiki.rb lyrics/30-leoslyrics.py

+lyrics_plugins = lyrics/10-hd.sh lyrics/20-lyricwiki.rb

 @ENABLE_LYRICS_SCREEN_TRUE@lyricsdir = $(lyrics_plugin_dir)

 @ENABLE_LYRICS_SCREEN_TRUE@lyrics_SCRIPTS = $(lyrics_plugins)

@@ -593,8 +678,8 @@

 $(am__aclocal_m4_deps):

 config.h: stamp-h1

-   @if test ! -f $@; then rm -f stamp-h1; else :; fi

-   @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi

+   @test -f $@ || rm -f stamp-h1

+   @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1

 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status

    @rm -f stamp-h1

@@ -619,10 +704,11 @@

    fi; \

    for p in $$list; do echo "$$p $$p"; done | \

    sed 's/$(EXEEXT)$$//' | \

-   while read p p1; do if test -f $$p; \

-     then echo "$$p"; echo "$$p"; else :; fi; \

+   while read p p1; do if test -f $$p \

+     ; then echo "$$p"; echo "$$p"; else :; fi; \

    done | \

-   sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \

+   sed -e 'p;s,.*/,,;n;h' \

+       -e 's|.*|.|' \

        -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \

    sed 'N;N;N;s,\n, ,g' | \

    $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \

@@ -643,7 +729,8 @@

    @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \

    files=`for p in $$list; do echo "$$p"; done | \

      sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \

-         -e 's/$$/$(EXEEXT)/' `; \

+         -e 's/$$/$(EXEEXT)/' \

+   `; \

    test -n "$$list" || exit 0; \

    echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \

    cd "$(DESTDIR)$(bindir)" && rm -f $$files

@@ -659,8 +746,6 @@

 src/$(DEPDIR)/$(am__dirstamp):

    @$(MKDIR_P) src/$(DEPDIR)

    @: > src/$(DEPDIR)/$(am__dirstamp)

-src/resolver.$(OBJEXT): src/$(am__dirstamp) \

-   src/$(DEPDIR)/$(am__dirstamp)

 src/main.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)

 src/gidle.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)

 src/mpdclient.$(OBJEXT): src/$(am__dirstamp) \

@@ -740,9 +825,10 @@

 src/screen_chat.$(OBJEXT): src/$(am__dirstamp) \

    src/$(DEPDIR)/$(am__dirstamp)

 src/lirc.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)

+

 src/ncmpc$(EXEEXT): $(src_ncmpc_OBJECTS) $(src_ncmpc_DEPENDENCIES) $(EXTRA_src_ncmpc_DEPENDENCIES) src/$(am__dirstamp)

    @rm -f src/ncmpc$(EXEEXT)

-   $(src_ncmpc_LINK) $(src_ncmpc_OBJECTS) $(src_ncmpc_LDADD) $(LIBS)

+   $(AM_V_CCLD)$(src_ncmpc_LINK) $(src_ncmpc_OBJECTS) $(src_ncmpc_LDADD) $(LIBS)

 test/$(am__dirstamp):

    @$(MKDIR_P) test

    @: > test/$(am__dirstamp)

@@ -755,9 +841,10 @@

    src/$(DEPDIR)/$(am__dirstamp)

 src/test_run_hscroll-charset.$(OBJEXT): src/$(am__dirstamp) \

    src/$(DEPDIR)/$(am__dirstamp)

+

 test/run_hscroll$(EXEEXT): $(test_run_hscroll_OBJECTS) $(test_run_hscroll_DEPENDENCIES) $(EXTRA_test_run_hscroll_DEPENDENCIES) test/$(am__dirstamp)

    @rm -f test/run_hscroll$(EXEEXT)

-   $(LINK) $(test_run_hscroll_OBJECTS) $(test_run_hscroll_LDADD) $(LIBS)

+   $(AM_V_CCLD)$(LINK) $(test_run_hscroll_OBJECTS) $(test_run_hscroll_LDADD) $(LIBS)

 install-lyricsSCRIPTS: $(lyrics_SCRIPTS)

    @$(NORMAL_INSTALL)

    @list='$(lyrics_SCRIPTS)'; test -n "$(lyricsdir)" || list=; \

@@ -796,53 +883,8 @@

 mostlyclean-compile:

    -rm -f *.$(OBJEXT)

-   -rm -f src/charset.$(OBJEXT)

-   -rm -f src/colors.$(OBJEXT)

-   -rm -f src/command.$(OBJEXT)

-   -rm -f src/conf.$(OBJEXT)

-   -rm -f src/filelist.$(OBJEXT)

-   -rm -f src/gidle.$(OBJEXT)

-   -rm -f src/hscroll.$(OBJEXT)

-   -rm -f src/lirc.$(OBJEXT)

-   -rm -f src/list_window.$(OBJEXT)

-   -rm -f src/lyrics.$(OBJEXT)

-   -rm -f src/main.$(OBJEXT)

-   -rm -f src/match.$(OBJEXT)

-   -rm -f src/mpdclient.$(OBJEXT)

-   -rm -f src/ncu.$(OBJEXT)

-   -rm -f src/options.$(OBJEXT)

-   -rm -f src/player_command.$(OBJEXT)

-   -rm -f src/playlist.$(OBJEXT)

-   -rm -f src/plugin.$(OBJEXT)

-   -rm -f src/progress_bar.$(OBJEXT)

-   -rm -f src/resolver.$(OBJEXT)

-   -rm -f src/screen.$(OBJEXT)

-   -rm -f src/screen_artist.$(OBJEXT)

-   -rm -f src/screen_browser.$(OBJEXT)

-   -rm -f src/screen_chat.$(OBJEXT)

-   -rm -f src/screen_client.$(OBJEXT)

-   -rm -f src/screen_file.$(OBJEXT)

-   -rm -f src/screen_find.$(OBJEXT)

-   -rm -f src/screen_help.$(OBJEXT)

-   -rm -f src/screen_keydef.$(OBJEXT)

-   -rm -f src/screen_list.$(OBJEXT)

-   -rm -f src/screen_lyrics.$(OBJEXT)

-   -rm -f src/screen_outputs.$(OBJEXT)

-   -rm -f src/screen_queue.$(OBJEXT)

-   -rm -f src/screen_search.$(OBJEXT)

-   -rm -f src/screen_song.$(OBJEXT)

-   -rm -f src/screen_status.$(OBJEXT)

-   -rm -f src/screen_text.$(OBJEXT)

-   -rm -f src/screen_utils.$(OBJEXT)

-   -rm -f src/song_paint.$(OBJEXT)

-   -rm -f src/status_bar.$(OBJEXT)

-   -rm -f src/strfsong.$(OBJEXT)

-   -rm -f src/test_run_hscroll-charset.$(OBJEXT)

-   -rm -f src/test_run_hscroll-hscroll.$(OBJEXT)

-   -rm -f src/title_bar.$(OBJEXT)

-   -rm -f src/utils.$(OBJEXT)

-   -rm -f src/wreadln.$(OBJEXT)

-   -rm -f test/test_run_hscroll-run_hscroll.$(OBJEXT)

+   -rm -f src/*.$(OBJEXT)

+   -rm -f test/*.$(OBJEXT)

 distclean-compile:

    -rm -f *.tab.c

@@ -866,7 +908,6 @@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/playlist.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/plugin.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/progress_bar.Po@am__quote@

-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/resolver.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_artist.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/screen_browser.Po@am__quote@

@@ -896,62 +937,62 @@

 @AMDEP_TRUE@@am__include@ @am__quote@test/$(DEPDIR)/test_run_hscroll-run_hscroll.Po@am__quote@

 .c.o:

-@am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\

+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\

 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\

 @am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@  source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@  $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@  DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@  $(COMPILE) -c -o $@ $<

+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<

 .c.obj:

-@am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\

+@am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\

 @am__fastdepCC_TRUE@   $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\

 @am__fastdepCC_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@  source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@  $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@  DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@  $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`

 test/test_run_hscroll-run_hscroll.o: test/run_hscroll.c

-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_hscroll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_run_hscroll-run_hscroll.o -MD -MP -MF test/$(DEPDIR)/test_run_hscroll-run_hscroll.Tpo -c -o test/test_run_hscroll-run_hscroll.o `test -f 'test/run_hscroll.c' || echo '$(srcdir)/'`test/run_hscroll.c

-@am__fastdepCC_TRUE@   $(am__mv) test/$(DEPDIR)/test_run_hscroll-run_hscroll.Tpo test/$(DEPDIR)/test_run_hscroll-run_hscroll.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@  source='test/run_hscroll.c' object='test/test_run_hscroll-run_hscroll.o' libtool=no @AMDEPBACKSLASH@

+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_hscroll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_run_hscroll-run_hscroll.o -MD -MP -MF test/$(DEPDIR)/test_run_hscroll-run_hscroll.Tpo -c -o test/test_run_hscroll-run_hscroll.o `test -f 'test/run_hscroll.c' || echo '$(srcdir)/'`test/run_hscroll.c

+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test/$(DEPDIR)/test_run_hscroll-run_hscroll.Tpo test/$(DEPDIR)/test_run_hscroll-run_hscroll.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@  $(AM_V_CC)source='test/run_hscroll.c' object='test/test_run_hscroll-run_hscroll.o' libtool=no @AMDEPBACKSLASH@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@  DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_hscroll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_run_hscroll-run_hscroll.o `test -f 'test/run_hscroll.c' || echo '$(srcdir)/'`test/run_hscroll.c

+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_hscroll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_run_hscroll-run_hscroll.o `test -f 'test/run_hscroll.c' || echo '$(srcdir)/'`test/run_hscroll.c

 test/test_run_hscroll-run_hscroll.obj: test/run_hscroll.c

-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_hscroll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_run_hscroll-run_hscroll.obj -MD -MP -MF test/$(DEPDIR)/test_run_hscroll-run_hscroll.Tpo -c -o test/test_run_hscroll-run_hscroll.obj `if test -f 'test/run_hscroll.c'; then $(CYGPATH_W) 'test/run_hscroll.c'; else $(CYGPATH_W) '$(srcdir)/test/run_hscroll.c'; fi`

-@am__fastdepCC_TRUE@   $(am__mv) test/$(DEPDIR)/test_run_hscroll-run_hscroll.Tpo test/$(DEPDIR)/test_run_hscroll-run_hscroll.Po

-@AMDEP_TRUE@@am__fastdepCC_FALSE@  source='test/run_hscroll.c' object='test/test_run_hscroll-run_hscroll.obj' libtool=no @AMDEPBACKSLASH@

+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_hscroll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT test/test_run_hscroll-run_hscroll.obj -MD -MP -MF test/$(DEPDIR)/test_run_hscroll-run_hscroll.Tpo -c -o test/test_run_hscroll-run_hscroll.obj `if test -f 'test/run_hscroll.c'; then $(CYGPATH_W) 'test/run_hscroll.c'; else $(CYGPATH_W) '$(srcdir)/test/run_hscroll.c'; fi`

+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) test/$(DEPDIR)/test_run_hscroll-run_hscroll.Tpo test/$(DEPDIR)/test_run_hscroll-run_hscroll.Po

+@AMDEP_TRUE@@am__fastdepCC_FALSE@  $(AM_V_CC)source='test/run_hscroll.c' object='test/test_run_hscroll-run_hscroll.obj' libtool=no @AMDEPBACKSLASH@

 @AMDEP_TRUE@@am__fastdepCC_FALSE@  DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_hscroll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_run_hscroll-run_hscroll.obj `if test -f 'test/run_hscroll.c'; then $(CYGPATH_W) 'test/run_hscroll.c'; else $(CYGPATH_W) '$(srcdir)/test/run_hscroll.c'; fi`

+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_run_hscroll_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o test/test_run_hscroll-run_hscroll.obj `if test -f 'test/run_hscroll.c'; then $(CYGPATH_W) 'test/run_hscroll.c'; else $(CYGPATH_W) '$(srcdir)/test/run_hscroll.c'; fi`