Disable unused ALAC(Apple Lossless Audio Codec) / CAF(Core Audio Format)

Change-Id: Iad288d072e30572f79fef1c6b3d86b602238a54a

diff --git a/src/Makefile.am b/src/Makefile.am
index e7640cd..ac79be8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libsndfile.la
 include_HEADERS = sndfile.hh
 nodist_include_HEADERS = sndfile.h
 
-noinst_LTLIBRARIES =  GSM610/libgsm.la G72x/libg72x.la ALAC/libalac.la libcommon.la
+noinst_LTLIBRARIES =  GSM610/libgsm.la G72x/libg72x.la libcommon.la
 
 SYMBOL_FILES = Symbols.gnu-binutils Symbols.darwin libsndfile-1.def Symbols.os2 Symbols.static
 
@@ -22,7 +22,7 @@ noinst_HEADERS = common.h sfconfig.h sfendian.h wavlike.h sf_unistd.h ogg.h chan
 
 check_PROGRAMS = test_main G72x/g72x_test
 
-FILESPECIFIC = sndfile.c aiff.c au.c avr.c caf.c dwd.c flac.c g72x.c htk.c ircam.c \
+FILESPECIFIC = sndfile.c aiff.c au.c avr.c dwd.c flac.c g72x.c htk.c ircam.c \
                macos.c mat4.c mat5.c nist.c paf.c pvf.c raw.c rx2.c sd2.c \
                sds.c svx.c txw.c voc.c wve.c w64.c wavlike.c wav.c xi.c mpc2k.c rf64.c \
                ogg_vorbis.c ogg_speex.c ogg_pcm.c ogg_opus.c
@@ -43,7 +43,7 @@ libsndfile_la_CPPFLAGS = -DSNDFILE_EXPORTS
 libsndfile_la_LDFLAGS = -no-undefined -version-info  $(SHARED_VERSION_INFO) $(SHLIB_VERSION_ARG)
 libsndfile_la_SOURCES = $(FILESPECIFIC) $(noinst_HEADERS)
 nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS)
-libsndfile_la_LIBADD = GSM610/libgsm.la G72x/libg72x.la ALAC/libalac.la \
+libsndfile_la_LIBADD = GSM610/libgsm.la G72x/libg72x.la \
                libcommon.la $(EXTERNAL_XIPH_LIBS) -lm
 
 EXTRA_libsndfile_la_DEPENDENCIES = $(SYMBOL_FILES)
@@ -51,7 +51,7 @@ EXTRA_libsndfile_la_DEPENDENCIES = $(SYMBOL_FILES)
 libcommon_la_SOURCES = common.c file_io.c command.c pcm.c ulaw.c alaw.c \
                float32.c double64.c ima_adpcm.c ms_adpcm.c gsm610.c dwvw.c vox_adpcm.c \
                interleave.c strings.c dither.c cart.c broadcast.c audio_detect.c \
-               ima_oki_adpcm.c ima_oki_adpcm.h alac.c chunk.c ogg.c chanmap.c \
+               ima_oki_adpcm.c ima_oki_adpcm.h chunk.c ogg.c chanmap.c \
                windows.c id3.c $(WIN_VERSION_FILE)
 
 
@@ -67,13 +67,6 @@ GSM610_libgsm_la_SOURCES = GSM610/config.h GSM610/gsm.h GSM610/gsm610_priv.h \
 G72x_libg72x_la_SOURCES = G72x/g72x.h G72x/g72x_priv.h \
                G72x/g721.c G72x/g723_16.c G72x/g723_24.c G72x/g723_40.c G72x/g72x.c
 
-ALAC_libalac_la_SOURCES = ALAC/ALACAudioTypes.h ALAC/ALACBitUtilities.h \
-               ALAC/EndianPortable.h ALAC/aglib.h ALAC/dplib.h ALAC/matrixlib.h \
-               ALAC/alac_codec.h ALAC/shift.h \
-               ALAC/ALACBitUtilities.c ALAC/ag_dec.c \
-               ALAC/ag_enc.c ALAC/dp_dec.c ALAC/dp_enc.c ALAC/matrix_dec.c \
-               ALAC/matrix_enc.c ALAC/alac_decoder.c ALAC/alac_encoder.c
-
 #===============================================================================
 # Test programs.
 

diff --git a/src/common.h b/src/common.h
index 0bd810c..8a13b1d 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -888,7 +888,6 @@ int         w64_open        (SF_PRIVATE *psf) ;
 int            wav_open        (SF_PRIVATE *psf) ;
 int            xi_open         (SF_PRIVATE *psf) ;
 int            flac_open       (SF_PRIVATE *psf) ;
-int            caf_open        (SF_PRIVATE *psf) ;
 int            mpc2k_open      (SF_PRIVATE *psf) ;
 int            rf64_open       (SF_PRIVATE *psf) ;
 
@@ -921,7 +920,6 @@ int         gsm610_init             (SF_PRIVATE *psf) ;
 int            vox_adpcm_init  (SF_PRIVATE *psf) ;
 int            flac_init               (SF_PRIVATE *psf) ;
 int            g72x_init               (SF_PRIVATE * psf) ;
-int            alac_init               (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info) ;
 
 int    dither_init             (SF_PRIVATE *psf, int mode) ;
 
@@ -1016,7 +1014,6 @@ typedef struct
 int audio_detect (SF_PRIVATE * psf, AUDIO_DETECT *ad, const unsigned char * data, int datalen) ;
 int id3_skip (SF_PRIVATE * psf) ;
 
-void   alac_get_desc_chunk_items (int subformat, uint32_t *fmt_flags, uint32_t *frames_per_packet) ;
 
 FILE * psf_open_tmpfile (char * fname, size_t fnamelen) ;
 

diff --git a/src/sndfile.c b/src/sndfile.c
index b76bfe9..a4e7ca9 100644 (file)
--- a/src/sndfile.c
+++ b/src/sndfile.c
@@ -3165,10 +3165,6 @@ psf_open_file (SF_PRIVATE *psf, SF_INFO *sfinfo)
                                error = flac_open (psf) ;
                                break ;
 
-               case    SF_FORMAT_CAF :
-                               error = caf_open (psf) ;
-                               break ;
-
                case    SF_FORMAT_MPC2K :
                                error = mpc2k_open (psf) ;
                                break ;