From 29e7b206103f587efc8cbe01b859fa7511b162ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 1 Nov 2014 15:33:23 +0000 Subject: [PATCH] wavpack: remove support for ancient API version --- configure.ac | 11 +---------- ext/wavpack/gstwavpackcommon.c | 4 ---- ext/wavpack/gstwavpackdec.c | 12 ------------ ext/wavpack/gstwavpackenc.c | 4 ---- 4 files changed, 1 insertion(+), 30 deletions(-) diff --git a/configure.ac b/configure.ac index 21ad0e5ee1..c8f2188930 100644 --- a/configure.ac +++ b/configure.ac @@ -845,16 +845,7 @@ AG_GST_CHECK_FEATURE(VPX, [VPX decoder], vpx, [ dnl *** wavpack *** translit(dnm, m, l) AM_CONDITIONAL(USE_WAVPACK, true) AG_GST_CHECK_FEATURE(WAVPACK, [wavpack plug-in], wavpack, [ - PKG_CHECK_MODULES(WAVPACK, wavpack >= 4.40.0, HAVE_WAVPACK=yes, [ - PKG_CHECK_MODULES(WAVPACK, wavpack >= 4.20, [ - HAVE_WAVPACK=yes - AC_DEFINE(WAVPACK_OLD_API, 1, [old wavpack API]) - ],[ - HAVE_WAVPACK=no - ]) - ]) - AC_SUBST(WAVPACK_CFLAGS) - AC_SUBST(WAVPACK_LIBS) + AG_GST_PKG_CHECK_MODULES(WAVPACK, wavpack >= 4.60.0) ]) dnl *** qtdemux & matroska prefer to have zlib *** diff --git a/ext/wavpack/gstwavpackcommon.c b/ext/wavpack/gstwavpackcommon.c index 7e3e492dfa..a17c9b2669 100644 --- a/ext/wavpack/gstwavpackcommon.c +++ b/ext/wavpack/gstwavpackcommon.c @@ -38,11 +38,7 @@ gst_wavpack_read_header (WavpackHeader * header, guint8 * buf) { memmove (header, buf, sizeof (WavpackHeader)); -#ifndef WAVPACK_OLD_API WavpackLittleEndianToNative (header, (char *) WavpackHeaderFormat); -#else - little_endian_to_native (header, WavpackHeaderFormat); -#endif return (memcmp (header->ckID, "wvpk", 4) == 0); } diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c index 10659ec13c..9f9fd5363b 100644 --- a/ext/wavpack/gstwavpackdec.c +++ b/ext/wavpack/gstwavpackdec.c @@ -325,11 +325,7 @@ gst_wavpack_dec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buf) (dec->sample_rate != WavpackGetSampleRate (dec->context)) || (dec->channels != WavpackGetNumChannels (dec->context)) || (dec->depth != WavpackGetBytesPerSample (dec->context) * 8) || -#ifdef WAVPACK_OLD_API - (dec->channel_mask != dec->context->config.channel_mask); -#else (dec->channel_mask != WavpackGetChannelMask (dec->context)); -#endif if (!gst_pad_has_current_caps (GST_AUDIO_DECODER_SRC_PAD (dec)) || format_changed) { @@ -339,11 +335,7 @@ gst_wavpack_dec_handle_frame (GstAudioDecoder * bdec, GstBuffer * buf) dec->channels = WavpackGetNumChannels (dec->context); dec->depth = WavpackGetBytesPerSample (dec->context) * 8; -#ifdef WAVPACK_OLD_API - channel_mask = dec->context->config.channel_mask; -#else channel_mask = WavpackGetChannelMask (dec->context); -#endif if (channel_mask == 0) channel_mask = gst_wavpack_get_default_channel_mask (dec->channels); @@ -454,11 +446,7 @@ decode_error: const gchar *reason = "unknown"; if (dec->context) { -#ifdef WAVPACK_OLD_API - reason = dec->context->error_message; -#else reason = WavpackGetErrorMessage (dec->context); -#endif } else { reason = "couldn't create decoder context"; } diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c index cb697391c9..386524b406 100644 --- a/ext/wavpack/gstwavpackenc.c +++ b/ext/wavpack/gstwavpackenc.c @@ -136,9 +136,7 @@ gst_wavpack_enc_mode_get_type (void) {GST_WAVPACK_ENC_MODE_FAST, "Fast Compression", "fast"}, {GST_WAVPACK_ENC_MODE_DEFAULT, "Normal Compression", "normal"}, {GST_WAVPACK_ENC_MODE_HIGH, "High Compression", "high"}, -#ifndef WAVPACK_OLD_API {GST_WAVPACK_ENC_MODE_VERY_HIGH, "Very High Compression", "veryhigh"}, -#endif {0, NULL, NULL} }; @@ -466,12 +464,10 @@ gst_wavpack_enc_set_wp_config (GstWavpackEnc * enc) case GST_WAVPACK_ENC_MODE_HIGH: enc->wp_config->flags |= CONFIG_HIGH_FLAG; break; -#ifndef WAVPACK_OLD_API case GST_WAVPACK_ENC_MODE_VERY_HIGH: enc->wp_config->flags |= CONFIG_HIGH_FLAG; enc->wp_config->flags |= CONFIG_VERY_HIGH_FLAG; break; -#endif } /* Bitrate, enables lossy mode */