From aa0795d6c241cc742b0cb6ec2eb77a222503cce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Wed, 11 Nov 2009 10:58:29 +0100
Subject: [PATCH] celt: Port to 0.7 API

Fixes bug #600724.
---
 ext/celt/gstceltdec.c | 15 +++++++++++++++
 ext/celt/gstceltenc.c | 16 ++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/ext/celt/gstceltdec.c b/ext/celt/gstceltdec.c
index b700935f01..8db4466c0e 100644
--- a/ext/celt/gstceltdec.c
+++ b/ext/celt/gstceltdec.c
@@ -497,14 +497,24 @@ celt_dec_chain_parse_header (GstCeltDec * dec, GstBuffer * buf)
   if (memcmp (dec->header.codec_id, "CELT    ", 8) != 0)
     goto invalid_header;
 
+#ifdef HAVE_CELT_0_7
+  dec->mode =
+      celt_mode_create (dec->header.sample_rate,
+      dec->header.frame_size, &error);
+#else
   dec->mode =
       celt_mode_create (dec->header.sample_rate, dec->header.nb_channels,
       dec->header.frame_size, &error);
+#endif
   if (!dec->mode)
     goto mode_init_failed;
 
   /* initialize the decoder */
+#ifdef HAVE_CELT_0_7
+  dec->state = celt_decoder_create (dec->mode, dec->header.nb_channels, &error);
+#else
   dec->state = celt_decoder_create (dec->mode);
+#endif
   if (!dec->state)
     goto init_failed;
 
@@ -545,8 +555,13 @@ mode_init_failed:
   }
 init_failed:
   {
+#ifdef HAVE_CELT_0_7
+    GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
+        (NULL), ("couldn't initialize decoder: %d", error));
+#else
     GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
         (NULL), ("couldn't initialize decoder"));
+#endif
     return GST_FLOW_ERROR;
   }
 nego_failed:
diff --git a/ext/celt/gstceltenc.c b/ext/celt/gstceltenc.c
index 62934cdcc2..f160b97ec7 100644
--- a/ext/celt/gstceltenc.c
+++ b/ext/celt/gstceltenc.c
@@ -591,17 +591,29 @@ gst_celt_enc_setup (GstCeltEnc * enc)
 
   enc->setup = FALSE;
 
+#ifdef HAVE_CELT_0_7
+  enc->mode = celt_mode_create (enc->rate, enc->frame_size, &error);
+#else
   enc->mode =
       celt_mode_create (enc->rate, enc->channels, enc->frame_size, &error);
+#endif
   if (!enc->mode)
     goto mode_initialization_failed;
 
   celt_mode_info (enc->mode, CELT_GET_FRAME_SIZE, &enc->frame_size);
 
+#ifdef HAVE_CELT_0_7
+  celt_header_init (&enc->header, enc->mode, enc->channels);
+#else
   celt_header_init (&enc->header, enc->mode);
+#endif
   enc->header.nb_channels = enc->channels;
 
+#ifdef HAVE_CELT_0_7
+  enc->state = celt_encoder_create (enc->mode, enc->channels, &error);
+#else
   enc->state = celt_encoder_create (enc->mode);
+#endif
   if (!enc->state)
     goto encoder_creation_failed;
 
@@ -624,7 +636,11 @@ mode_initialization_failed:
   return FALSE;
 
 encoder_creation_failed:
+#ifdef HAVE_CELT_0_7
+  GST_ERROR_OBJECT (enc, "Encoder creation failed: %d", error);
+#else
   GST_ERROR_OBJECT (enc, "Encoder creation failed");
+#endif
   return FALSE;
 }