[Pkg-mpd-commits] [pkg-mpd] 02/04: Imported Upstream version 0.18.11
Florian Schlichting
fsfs at moszumanska.debian.org
Mon Jun 2 20:57:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository pkg-mpd.
commit 410737160ad1243724d856de388a524b09a2089d
Author: Florian Schlichting <fsfs at debian.org>
Date: Mon Jun 2 22:44:28 2014 +0200
Imported Upstream version 0.18.11
---
NEWS | 5 +++++
configure | 30 +++++++++++++++---------------
configure.ac | 2 +-
doc/doxygen.conf | 2 +-
src/decoder/OggUtil.cxx | 2 +-
src/event/DeferredMonitor.cxx | 28 ++++++++++++++++++----------
src/event/DeferredMonitor.hxx | 5 ++++-
7 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/NEWS b/NEWS
index d87626b..d8e9016 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+ver 0.18.11 (2014/05/12)
+* decoder
+ - opus: fix missing song length on high-latency files
+* fix race condition when using GLib event loop (non-Linux)
+
ver 0.18.10 (2014/04/10)
* decoder
- ffmpeg: fix seeking bug
diff --git a/configure b/configure
index 9fc8e3b..6079fe2 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.18.10.
+# Generated by GNU Autoconf 2.69 for mpd 0.18.11.
#
# Report bugs to <mpd-devel at musicpd.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mpd'
PACKAGE_TARNAME='mpd'
-PACKAGE_VERSION='0.18.10'
-PACKAGE_STRING='mpd 0.18.10'
+PACKAGE_VERSION='0.18.11'
+PACKAGE_STRING='mpd 0.18.11'
PACKAGE_BUGREPORT='mpd-devel at musicpd.org'
PACKAGE_URL=''
@@ -1673,7 +1673,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.18.10 to adapt to many kinds of systems.
+\`configure' configures mpd 0.18.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1743,7 +1743,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mpd 0.18.10:";;
+ short | recursive ) echo "Configuration of mpd 0.18.11:";;
esac
cat <<\_ACEOF
@@ -2041,7 +2041,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mpd configure 0.18.10
+mpd configure 0.18.11
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2494,7 +2494,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.18.10, which was
+It was created by mpd $as_me 0.18.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3364,7 +3364,7 @@ fi
# Define the identity of the package.
PACKAGE='mpd'
- VERSION='0.18.10'
+ VERSION='0.18.11'
cat >>confdefs.h <<_ACEOF
@@ -6832,7 +6832,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -6878,7 +6878,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -6902,7 +6902,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -6947,7 +6947,7 @@ else
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -6971,7 +6971,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
We can't simply define LARGE_OFF_T to be 9223372036854775807,
since some C++ compilers masquerading as C compilers
incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
&& LARGE_OFF_T % 2147483647 == 1)
? 1 : -1];
@@ -18461,7 +18461,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.18.10, which was
+This file was extended by mpd $as_me 0.18.11, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18527,7 +18527,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.18.10
+mpd config.status 0.18.11
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ae3a234..48933c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ(2.60)
-AC_INIT(mpd, 0.18.10, mpd-devel at musicpd.org)
+AC_INIT(mpd, 0.18.11, mpd-devel at musicpd.org)
VERSION_MAJOR=0
VERSION_MINOR=18
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 7ba773d..ba4e372 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.18.10
+PROJECT_NUMBER = 0.18.11
# 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/OggUtil.cxx b/src/decoder/OggUtil.cxx
index fd137f1..8f181ce 100644
--- a/src/decoder/OggUtil.cxx
+++ b/src/decoder/OggUtil.cxx
@@ -81,7 +81,7 @@ bool
OggExpectPageSeek(ogg_sync_state &oy, ogg_page &page,
Decoder *decoder, InputStream &input_stream)
{
- size_t remaining_skipped = 16384;
+ size_t remaining_skipped = 32768;
while (true) {
int r = ogg_sync_pageseek(&oy, &page);
diff --git a/src/event/DeferredMonitor.cxx b/src/event/DeferredMonitor.cxx
index 4ffffaa..62edb78 100644
--- a/src/event/DeferredMonitor.cxx
+++ b/src/event/DeferredMonitor.cxx
@@ -27,9 +27,11 @@ DeferredMonitor::Cancel()
#ifdef USE_EPOLL
pending = false;
#else
- const auto id = source_id.exchange(0);
- if (id != 0)
- g_source_remove(id);
+ const ScopeLock protect(mutex);
+ if (source_id != 0) {
+ g_source_remove(source_id);
+ source_id = 0;
+ }
#endif
}
@@ -40,10 +42,9 @@ DeferredMonitor::Schedule()
if (!pending.exchange(true))
fd.Write();
#else
- const unsigned id = loop.AddIdle(Callback, this);
- const auto old_id = source_id.exchange(id);
- if (old_id != 0)
- g_source_remove(old_id);
+ const ScopeLock protect(mutex);
+ if (source_id == 0)
+ source_id = loop.AddIdle(Callback, this);
#endif
}
@@ -65,9 +66,16 @@ DeferredMonitor::OnSocketReady(unsigned)
void
DeferredMonitor::Run()
{
- const auto id = source_id.exchange(0);
- if (id != 0)
- RunDeferred();
+ {
+ const ScopeLock protect(mutex);
+ if (source_id == 0)
+ /* cancelled */
+ return;
+
+ source_id = 0;
+ }
+
+ RunDeferred();
}
gboolean
diff --git a/src/event/DeferredMonitor.hxx b/src/event/DeferredMonitor.hxx
index 2380fb6..2ac832a 100644
--- a/src/event/DeferredMonitor.hxx
+++ b/src/event/DeferredMonitor.hxx
@@ -27,6 +27,7 @@
#include "SocketMonitor.hxx"
#include "WakeFD.hxx"
#else
+#include "thread/Mutex.hxx"
#include <glib.h>
#endif
@@ -48,7 +49,9 @@ class DeferredMonitor
#else
EventLoop &loop;
- std::atomic<guint> source_id;
+ Mutex mutex;
+
+ guint source_id;
#endif
public:
--
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