aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-12-31 00:54:32 +0000
committerEric Wong <normalperson@yhbt.net>2007-12-31 00:54:32 +0000
commit0d1a3539ad1d5fba353daf7bb4b08c6d8cbe83e6 (patch)
tree90cb9865dcdad8df7a015d2d85ac2a1a8c570b94
parentb79f6b882a70526ec2e9fc231e0baeebdfef1e52 (diff)
downloadmpd-0d1a3539ad1d5fba353daf7bb4b08c6d8cbe83e6.tar.gz
mpd-0d1a3539ad1d5fba353daf7bb4b08c6d8cbe83e6.tar.xz
mpd-0d1a3539ad1d5fba353daf7bb4b08c6d8cbe83e6.zip
fix builds that only have FLAC >= 1.1.3 but not Ogg-Vorbis
git-svn-id: https://svn.musicpd.org/mpd/trunk@7108 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/inputPlugins/_flac_common.h12
-rw-r--r--src/inputPlugins/_ogg_common.c3
-rw-r--r--src/inputPlugins/_ogg_common.h3
3 files changed, 9 insertions, 9 deletions
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h
index df96d9f9c..94f9cd1db 100644
--- a/src/inputPlugins/_flac_common.h
+++ b/src/inputPlugins/_flac_common.h
@@ -80,15 +80,13 @@ typedef unsigned flac_read_status_size_t;
# ifdef HAVE_OGGFLAC
# include <OggFLAC/seekable_stream_decoder.h>
# endif
-#else /* FLAC_API_VERSION_CURRENT >= 7 */
+#else /* FLAC_API_VERSION_CURRENT > 7 */
- /* OggFLAC support is handled by our flac_plugin already, and
- * thus we *can* always have it if libFLAC was compiled with it */
-# ifndef HAVE_OGGFLAC
-# define HAVE_OGGFLAC 1
-# endif
+/*
+ * OggFLAC support is handled by our flac_plugin already, and
+ * thus we *can* always have it if libFLAC was compiled with it
+ */
# include "_ogg_common.h"
-# undef HAVE_OGGFLAC /* we don't need this defined anymore */
# include <FLAC/stream_decoder.h>
# define flac_decoder FLAC__StreamDecoder
diff --git a/src/inputPlugins/_ogg_common.c b/src/inputPlugins/_ogg_common.c
index 09fc60c5a..32df2eb9a 100644
--- a/src/inputPlugins/_ogg_common.c
+++ b/src/inputPlugins/_ogg_common.c
@@ -24,7 +24,8 @@
#include "_flac_common.h"
#include "_ogg_common.h"
-#if defined(HAVE_OGGFLAC) || defined(HAVE_OGGVORBIS)
+#if defined(HAVE_OGGFLAC) || defined(HAVE_OGGVORBIS) || \
+ (defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7)
#include "../utils.h"
diff --git a/src/inputPlugins/_ogg_common.h b/src/inputPlugins/_ogg_common.h
index 5821e6641..3e997e95b 100644
--- a/src/inputPlugins/_ogg_common.h
+++ b/src/inputPlugins/_ogg_common.h
@@ -24,7 +24,8 @@
#include "../inputPlugin.h"
-#if defined(HAVE_OGGFLAC) || defined(HAVE_OGGVORBIS)
+#if defined(HAVE_OGGFLAC) || defined(HAVE_OGGVORBIS) || \
+ (defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7)
typedef enum _ogg_stream_type { VORBIS, FLAC } ogg_stream_type;