Package: daisy-player / 11.6.2.1-2

cdda Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
The path in Debian really is cdio/paranoia/cdda.h only nowadays

---
 configure.ac |    2 +-
 src/daisy.h  |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_CHECK_LIB([pulse], [main])
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h libintl.h locale.h stdlib.h string.h strings.h \
                   sys/ioctl.h unistd.h])
-#AC_CHECK_HEADERS([cdio/paranoia/cdda.h])
+AC_CHECK_HEADERS([cdio/paranoia/cdda.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
--- a/src/daisy.h
+++ b/src/daisy.h
@@ -42,12 +42,6 @@
 #include <libxml/xmlwriter.h>
 #include <libxml/HTMLparser.h>
 #include <cdio/cdio.h>
-#ifdef HAVE_CDIO_PARANOIA_CDDA_H
-   #include <cdio/paranoia/paranoia.h>
-#else
-   #include <cdio/cdda.h>
-   #include <cdio/paranoia.h>
-#endif
 #include <cdio/disc.h>
 #include <magic.h>
 #include <fnmatch.h>
@@ -64,6 +58,13 @@
 #undef VERSION
 #include "config.h"
 
+#ifdef HAVE_CDIO_PARANOIA_CDDA_H
+   #include <cdio/paranoia/paranoia.h>
+#else
+   #include <cdio/cdda.h>
+   #include <cdio/paranoia.h>
+#endif
+
 #define MAX_CMD 512
 #define MAX_STR 256
 #define MAX_TAG 1024