input/cdio_paranoia: support libcdio-paranoia 0.90

3b0fea5f · Gaetan Bisson · Max Kellermann · 443516cd · 3b0fea5f · 3b0fea5f
Commit 3b0fea5f authored Nov 27, 2013 by Gaetan Bisson Committed by Max Kellermann Nov 27, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

NEWS NEWS +2 -0

configure.ac configure.ac +1 -0

CdioParanoiaInputPlugin.cxx src/input/CdioParanoiaInputPlugin.cxx +5 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.18.6 (not yet released)
+* input
+  - cdio_paranoia: support libcdio-paranoia 0.90

 ver 0.18.5 (2013/11/23)
 * configuration

--- a/configure.ac
+++ b/configure.ac
@@ -749,6 +749,7 @@ MPD_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia],
 if test x$enable_cdio_paranoia = xyes; then
 	AC_DEFINE([ENABLE_CDIO_PARANOIA], 1,
 		[Define to enable libcdio_paranoia support])
+	AC_CHECK_HEADERS(cdio/paranoia/paranoia.h)
 fi

 AM_CONDITIONAL(ENABLE_CDIO_PARANOIA, test x$enable_cdio_paranoia = xyes)

--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@@ -41,7 +41,12 @@
 #include <glib.h>
 #include <assert.h>

+#ifdef HAVE_CDIO_PARANOIA_PARANOIA_H
+#include <cdio/parannoia/paranoia.h>
+#else
 #include <cdio/paranoia.h>
+#endif
+
 #include <cdio/cd_types.h>

 struct CdioParanoiaInputStream {