[Pkg-mpd-commits] [pkg-mpd] 01/04: Imported Upstream version 0.17.6
Florian Schlichting
fsfs at alioth.debian.org
Tue Oct 15 19:33:10 UTC 2013
This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository pkg-mpd.
commit 5e4079fb8f345ce30a3123ec901f698b3b8d7b81
Author: Florian Schlichting <fsfs at debian.org>
Date: Tue Oct 15 21:03:47 2013 +0200
Imported Upstream version 0.17.6
---
NEWS | 9 +++++++++
configure | 20 ++++++++++----------
configure.ac | 2 +-
doc/doxygen.conf | 2 +-
src/decoder/modplug_decoder_plugin.c | 2 +-
src/mixer/alsa_mixer_plugin.c | 12 +++++++++++-
src/playlist_save.c | 11 +++++++++++
src/stored_playlist.c | 16 +++++++++++++---
8 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/NEWS b/NEWS
index f7c4551..aebf7a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+ver 0.17.6 (2013/10/14)
+* mixer:
+ - alsa: fix busy loop when USB sound device gets unplugged
+* decoder:
+ - modplug: fix build with Debian package 1:0.8.8.4-4
+* stored playlists:
+ - fix loading playlists with references to local files
+ - obey filesystem_charset for URLs
+
ver 0.17.5 (2013/08/04)
* protocol:
- fix "playlistadd" with URI
diff --git a/configure b/configure
index c663f9b..079360f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mpd 0.17.5.
+# Generated by GNU Autoconf 2.69 for mpd 0.17.6.
#
# Report bugs to <musicpd-dev-team at lists.sourceforge.net>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mpd'
PACKAGE_TARNAME='mpd'
-PACKAGE_VERSION='0.17.5'
-PACKAGE_STRING='mpd 0.17.5'
+PACKAGE_VERSION='0.17.6'
+PACKAGE_STRING='mpd 0.17.6'
PACKAGE_BUGREPORT='musicpd-dev-team at lists.sourceforge.net'
PACKAGE_URL=''
@@ -1670,7 +1670,7 @@ if test "$ac_init_help" = "long"; then
# 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 mpd 0.17.5 to adapt to many kinds of systems.
+\`configure' configures mpd 0.17.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1740,7 +1740,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpd 0.17.5:";;
+ short | recursive ) echo "Configuration of mpd 0.17.6:";;
esac
cat <<\_ACEOF
@@ -2033,7 +2033,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpd configure 0.17.5
+mpd configure 0.17.6
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2543,7 +2543,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mpd $as_me 0.17.5, which was
+It was created by mpd $as_me 0.17.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3365,7 +3365,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.17.5'
+ VERSION='0.17.6'
cat >>confdefs.h <<_ACEOF
@@ -16676,7 +16676,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mpd $as_me 0.17.5, which was
+This file was extended by mpd $as_me 0.17.6, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16742,7 +16742,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mpd config.status 0.17.5
+mpd config.status 0.17.6
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index fa2ec19..d9fd301 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.17.5, musicpd-dev-team at lists.sourceforge.net)
+AC_INIT(mpd, 0.17.6, musicpd-dev-team at lists.sourceforge.net)
VERSION_MAJOR=0
VERSION_MINOR=17
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 80b36f9..c97b54a 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -31,7 +31,7 @@ PROJECT_NAME = MPD
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.17.5
+PROJECT_NUMBER = 0.17.6
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/src/decoder/modplug_decoder_plugin.c b/src/decoder/modplug_decoder_plugin.c
index 21ee79e..5ae4b1a 100644
--- a/src/decoder/modplug_decoder_plugin.c
+++ b/src/decoder/modplug_decoder_plugin.c
@@ -22,7 +22,7 @@
#include "tag_handler.h"
#include <glib.h>
-#include <modplug.h>
+#include <libmodplug/modplug.h>
#include <assert.h>
#undef G_LOG_DOMAIN
diff --git a/src/mixer/alsa_mixer_plugin.c b/src/mixer/alsa_mixer_plugin.c
index 22e4e22..0c8625c 100644
--- a/src/mixer/alsa_mixer_plugin.c
+++ b/src/mixer/alsa_mixer_plugin.c
@@ -178,7 +178,17 @@ alsa_mixer_source_dispatch(GSource *_source,
{
struct alsa_mixer_source *source = (struct alsa_mixer_source *)_source;
- snd_mixer_handle_events(source->mixer);
+ int err = snd_mixer_handle_events(source->mixer);
+ if (err < 0) {
+ g_warning("snd_mixer_handle_events() failed: %s",
+ snd_strerror(err));
+
+ if (err == -ENODEV)
+ /* the sound device was unplugged; disable
+ this GSource */
+ return false;
+ }
+
return true;
}
diff --git a/src/playlist_save.c b/src/playlist_save.c
index 334159e..194bff0 100644
--- a/src/playlist_save.c
+++ b/src/playlist_save.c
@@ -32,6 +32,8 @@
#include <glib.h>
+#include <string.h>
+
void
playlist_print_song(FILE *file, const struct song *song)
{
@@ -128,6 +130,15 @@ playlist_load_spl(struct playlist *playlist, struct player_control *pc,
for (unsigned i = start_index; i < end_index; ++i) {
const char *temp = g_ptr_array_index(list, i);
+
+ if (memcmp(temp, "file:///", 8) == 0) {
+ const char *path = temp + 7;
+
+ if (playlist_append_file(playlist, pc, path, NULL) != PLAYLIST_RESULT_SUCCESS)
+ g_warning("can't add file \"%s\"", path);
+ continue;
+ }
+
if ((playlist_append_uri(playlist, pc, temp, NULL)) != PLAYLIST_RESULT_SUCCESS) {
/* for windows compatibility, convert slashes */
char *temp2 = g_strdup(temp);
diff --git a/src/stored_playlist.c b/src/stored_playlist.c
index 39ba2ba..86b7ff8 100644
--- a/src/stored_playlist.c
+++ b/src/stored_playlist.c
@@ -272,7 +272,14 @@ spl_load(const char *utf8path, GError **error_r)
if (*s == 0 || *s == PLAYLIST_COMMENT)
continue;
- if (!uri_has_scheme(s)) {
+ if (g_path_is_absolute(s)) {
+ char *t = fs_charset_to_utf8(s);
+ if (t == NULL)
+ continue;
+
+ s = g_strconcat("file://", t, NULL);
+ g_free(t);
+ } else if (!uri_has_scheme(s)) {
char *path_utf8;
path_utf8 = map_fs_to_utf8(s);
@@ -280,8 +287,11 @@ spl_load(const char *utf8path, GError **error_r)
continue;
s = path_utf8;
- } else
- s = g_strdup(s);
+ } else {
+ s = fs_charset_to_utf8(s);
+ if (s == NULL)
+ continue;
+ }
g_ptr_array_add(list, s);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git
More information about the Pkg-mpd-commits
mailing list