summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2014-11-01 15:33:23 +0000
committerTim-Philipp Müller <tim@centricular.com>2014-11-01 15:40:44 +0000
commit29e7b206103f587efc8cbe01b859fa7511b162ee (patch)
tree8c8767a5e00f3bcdd0e41e934f19754fe580f1fc /ext
parent0f4f948f5feba69336772c4234069b3fba9ebf6e (diff)
downloadgstreamer-plugins-good-29e7b206103f587efc8cbe01b859fa7511b162ee.tar.gz
wavpack: remove support for ancient API version
Diffstat (limited to 'ext')
-rw-r--r--ext/wavpack/gstwavpackcommon.c4
-rw-r--r--ext/wavpack/gstwavpackdec.c12
-rw-r--r--ext/wavpack/gstwavpackenc.c4
3 files changed, 0 insertions, 20 deletions
diff --git a/ext/wavpack/gstwavpackcommon.c b/ext/wavpack/gstwavpackcommon.c
index 7e3e492df..a17c9b266 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 10659ec13..9f9fd5363 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 cb697391c..386524b40 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 */