oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fix builds that only have FLAC >= 1.1.3 but not Ogg-Vorbis

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@7108 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Eric Wong
2007-12-31 00:54:32 +00:00
parent b79f6b882a
commit 0d1a3539ad
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/inputPlugins/_flac_common.h
View File

@@ -80,15 +80,13 @@ typedef unsigned flac_read_status_size_t;
# ifdef HAVE_OGGFLAC # ifdef HAVE_OGGFLAC
# include <OggFLAC/seekable_stream_decoder.h> # include <OggFLAC/seekable_stream_decoder.h>
# endif # 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 */ * OggFLAC support is handled by our flac_plugin already, and
# ifndef HAVE_OGGFLAC * thus we *can* always have it if libFLAC was compiled with it
# define HAVE_OGGFLAC 1 */
# endif
# include "_ogg_common.h" # include "_ogg_common.h"
# undef HAVE_OGGFLAC /* we don't need this defined anymore */
# include <FLAC/stream_decoder.h> # include <FLAC/stream_decoder.h>
# define flac_decoder FLAC__StreamDecoder # define flac_decoder FLAC__StreamDecoder

3
src/inputPlugins/_ogg_common.c
View File

@@ -24,7 +24,8 @@
#include "_flac_common.h" #include "_flac_common.h"
#include "_ogg_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" #include "../utils.h"

3
src/inputPlugins/_ogg_common.h
View File

@@ -24,7 +24,8 @@
#include "../inputPlugin.h" #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; typedef enum _ogg_stream_type { VORBIS, FLAC } ogg_stream_type;