ext/wavpack/: Workaround the non-existance of WavpackGetChannelMask in Wavpack versio...

Original commit message from CVS:
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_chain):
* ext/wavpack/gstwavpackparse.c:
(gst_wavpack_parse_create_src_pad):
Workaround the non-existance of WavpackGetChannelMask in Wavpack
versions below 4.40.0.

diff --git a/ChangeLog b/ChangeLog
index 1a98295..f4d9952 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-12-09  Sebastian Dröge  <slomo@circular-chaos.org>
 
+       * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_chain):
+       * ext/wavpack/gstwavpackparse.c:
+         (gst_wavpack_parse_create_src_pad):
+         Workaround the non-existance of WavpackGetChannelMask in Wavpack
+         versions below 4.40.0.
+
+2007-12-09  Sebastian Dröge  <slomo@circular-chaos.org>
+
        * configure.ac:
          And now do it right for real...
 

diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c
index 0dde6c7..b819125 100644 (file)
--- a/ext/wavpack/gstwavpackdec.c
+++ b/ext/wavpack/gstwavpackdec.c
@@ -305,7 +305,11 @@ gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf)
       (dec->sample_rate != WavpackGetSampleRate (dec->context)) ||
       (dec->channels != WavpackGetNumChannels (dec->context)) ||
       (dec->depth != WavpackGetBitsPerSample (dec->context)) ||
+#ifdef WAVPACK_OLD_API
+      (dec->channel_mask != dec->context->config.channel_mask);
+#else
       (dec->channel_mask != WavpackGetChannelMask (dec->context));
+#endif
 
   if (!GST_PAD_CAPS (dec->srcpad) || format_changed) {
     GstCaps *caps;
@@ -323,7 +327,11 @@ gst_wavpack_dec_chain (GstPad * pad, GstBuffer * buf)
         "endianness", G_TYPE_INT, G_BYTE_ORDER,
         "signed", G_TYPE_BOOLEAN, TRUE, NULL);
 
+#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);
 

diff --git a/ext/wavpack/gstwavpackparse.c b/ext/wavpack/gstwavpackparse.c
index 71c4d83..0c34401 100644 (file)
--- a/ext/wavpack/gstwavpackparse.c
+++ b/ext/wavpack/gstwavpackparse.c
@@ -836,8 +836,11 @@ gst_wavpack_parse_create_src_pad (GstWavpackParse * wvparse, GstBuffer * buf,
             "channels", G_TYPE_INT, wvparse->channels,
             "rate", G_TYPE_INT, wvparse->samplerate,
             "framed", G_TYPE_BOOLEAN, TRUE, NULL);
-
+#ifdef WAVPACK_OLD_API
+        channel_mask = wpc->config.channel_mask;
+#else
         channel_mask = WavpackGetChannelMask (wpc);
+#endif
         if (channel_mask == 0)
           channel_mask =
               gst_wavpack_get_default_channel_mask (wvparse->channels);