input/cdio_paranoia: drop support for libcdio-paranoia older than 10.2+0.93+1
Version 10.2+0.93+1 was released five years ago in 2014 and is the first version to feature cdio_cddap_free_messages(). There is no way to check the libcdio-paranoia version at compile time, so let's just remove support for older versions instead of attempting to fix the cdio_cddap_free_messages() check at build time. Closes https://github.com/MusicPlayerDaemon/MPD/issues/613
This commit is contained in:
parent
864d6f312d
commit
3ef043392c
2
NEWS
2
NEWS
|
@ -1,4 +1,6 @@
|
||||||
ver 0.21.13 (not yet released)
|
ver 0.21.13 (not yet released)
|
||||||
|
* input
|
||||||
|
- cdio_paranoia: require libcdio-paranoia 10.2+0.93+1
|
||||||
* decoder
|
* decoder
|
||||||
- mad: fix crackling sound (0.21.12 regression)
|
- mad: fix crackling sound (0.21.12 regression)
|
||||||
|
|
||||||
|
|
|
@ -298,11 +298,7 @@ CdioParanoiaInputStream::Read(void *ptr, size_t length)
|
||||||
if (s_err) {
|
if (s_err) {
|
||||||
FormatError(cdio_domain,
|
FormatError(cdio_domain,
|
||||||
"paranoia_read: %s", s_err);
|
"paranoia_read: %s", s_err);
|
||||||
#if LIBCDIO_VERSION_NUM >= 90
|
|
||||||
cdio_cddap_free_messages(s_err);
|
cdio_cddap_free_messages(s_err);
|
||||||
#else
|
|
||||||
free(s_err);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
throw;
|
throw;
|
||||||
|
|
|
@ -6,7 +6,7 @@ if alsa_dep.found()
|
||||||
input_plugins_sources += 'AlsaInputPlugin.cxx'
|
input_plugins_sources += 'AlsaInputPlugin.cxx'
|
||||||
endif
|
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())
|
conf.set('ENABLE_CDIO_PARANOIA', libcdio_paranoia_dep.found())
|
||||||
if libcdio_paranoia_dep.found()
|
if libcdio_paranoia_dep.found()
|
||||||
input_plugins_sources += 'CdioParanoiaInputPlugin.cxx'
|
input_plugins_sources += 'CdioParanoiaInputPlugin.cxx'
|
||||||
|
|
|
@ -34,11 +34,7 @@
|
||||||
#include "util/Compiler.h"
|
#include "util/Compiler.h"
|
||||||
|
|
||||||
#include <cdio/version.h>
|
#include <cdio/version.h>
|
||||||
#if LIBCDIO_VERSION_NUM >= 90
|
|
||||||
#include <cdio/paranoia/paranoia.h>
|
#include <cdio/paranoia/paranoia.h>
|
||||||
#else
|
|
||||||
#include <cdio/paranoia.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
Loading…
Reference in New Issue