diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-01-26 22:17:09 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-01-26 22:17:09 +0000 |
| commit | e5a7c14227a2ca69e0e07ac9dc62d6e31f16121a (patch) | |
| tree | 3a90c06682a7ec45d4466ea567becfa8619b2a8e | |
| parent | 8fe23fedd25c64a16acb2a95f3cd4b5eaee844ee (diff) | |
| download | mpd-e5a7c14227a2ca69e0e07ac9dc62d6e31f16121a.tar.gz mpd-e5a7c14227a2ca69e0e07ac9dc62d6e31f16121a.tar.xz mpd-e5a7c14227a2ca69e0e07ac9dc62d6e31f16121a.zip | |
fix builds that only have FLAC >= 1.1.3 but not Ogg-Vorbis
r7108 in trunk
git-svn-id: https://svn.musicpd.org/mpd/branches/branch-0.13.0-fixes@7164 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/inputPlugins/_flac_common.h | 12 | ||||
| -rw-r--r-- | src/inputPlugins/_ogg_common.c | 3 | ||||
| -rw-r--r-- | src/inputPlugins/_ogg_common.h | 3 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h index e04e70693..f72702e99 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; |