oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge tag 'v0.21.13'

Browse Source 
release v0.21.13
This commit is contained in:
Max Kellermann
2019-08-06 11:39:25 +02:00
parent 91fb91d89c d4d2bc072e
commit 192ad91010
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decoder/plugins/MadDecoderPlugin.cxx
+3 -1
View File
@@ -79,12 +79,14 @@ static inline int32_t
mad_fixed_to_24_sample(mad_fixed_t sample) noexcept
{
static constexpr unsigned bits = 24;
static constexpr mad_fixed_t MIN = -MAD_F_ONE;
static constexpr mad_fixed_t MAX = MAD_F_ONE - 1;
/* round */
sample = sample + (1L << (MAD_F_FRACBITS - bits));
/* quantize */
return Clamp(sample, MAD_F_MIN, MAD_F_MAX)
return Clamp(sample, MIN, MAX)
>> (MAD_F_FRACBITS + 1 - bits);
}
src/input/plugins/CdioParanoiaInputPlugin.cxx
-4
View File
@@ -299,11 +299,7 @@ CdioParanoiaInputStream::Read(std::unique_lock<Mutex> &,
if (s_err) {
FormatError(cdio_domain,
"paranoia_read: %s", s_err);
#if LIBCDIO_VERSION_NUM >= 90
cdio_cddap_free_messages(s_err);
#else
free(s_err);
#endif
}
throw;
src/input/plugins/meson.build
+1 -1
View File
@@ -6,7 +6,7 @@ if alsa_dep.found()
input_plugins_sources += 'AlsaInputPlugin.cxx'
endif
libcdio_paranoia_dep = dependency('libcdio_paranoia', version: '>= 0.4', required: get_option('cdio_paranoia'))
libcdio_paranoia_dep = dependency('libcdio_paranoia', version: '>= 10.2+0.93+1', required: get_option('cdio_paranoia'))
conf.set('ENABLE_CDIO_PARANOIA', libcdio_paranoia_dep.found())
if libcdio_paranoia_dep.found()
input_plugins_sources += 'CdioParanoiaInputPlugin.cxx'
src/lib/cdio/Paranoia.hxx
-4
View File
@@ -34,11 +34,7 @@
#include "util/Compiler.h"
#include <cdio/version.h>
#if LIBCDIO_VERSION_NUM >= 90
#include <cdio/paranoia/paranoia.h>
#else
#include <cdio/paranoia.h>
#endif
#include <stdexcept>
#include <utility>