From 2acf79a45e757e92e2208095f204652aa1c2a8a4 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Wed, 18 May 2005 10:32:31 +0000
Subject: Update to 1.2 API (303117).

Original commit message from CVS:
Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
* configure.ac:
* ext/musepack/gstmusepackdec.h:
* ext/musepack/gstmusepackreader.c:
* ext/musepack/gstmusepackreader.h:
Update to 1.2 API (303117).
---
 ChangeLog                        | 19 +++++++++++++++++++
 configure.ac                     |  4 ++--
 ext/musepack/gstmusepackdec.h    |  2 +-
 ext/musepack/gstmusepackreader.c |  4 ++--
 ext/musepack/gstmusepackreader.h |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 982cd6fd..50078557 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-05-18  Benoit Amiaux  <benoit.amiaux@laposte.net>
+
+	Reviewed by:  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* configure.ac:
+	* ext/musepack/gstmusepackdec.h:
+	* ext/musepack/gstmusepackreader.c:
+	* ext/musepack/gstmusepackreader.h:
+	  Update to 1.2 API (303117).
+
 2005-05-18  Arwed v. Merkatz  <v.merkatz@gmx.net>>
 
 	* ext/nas/nassink.c: (gst_nassink_getcaps),
@@ -8,6 +18,15 @@
 	  connections to nas server, set element error and fail the state
 	  change if connecting to server fails
 
+2005-05-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* configure.ac:
+	* ext/musepack/gstmusepackdec.h:
+	* ext/musepack/gstmusepackreader.c:
+	* ext/musepack/gstmusepackreader.h:
+	* gst-libs/gst/Makefile.am:
+	* gst/typefind/gsttypefindfunctions.c: (plugin_init):
+
 2005-05-18  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/mpeg1videoparse/gstmp1videoparse.c:
diff --git a/configure.ac b/configure.ac
index eabda12f..ba2b02f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1489,9 +1489,9 @@ dnl *** musepack ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_MUSEPACK, true)
 GST_CHECK_FEATURE(MUSEPACK, [musepackdec], musepack, [
   AC_LANG_CPLUSPLUS
-  AC_CHECK_HEADER([musepack/musepack.h], [
+  AC_CHECK_HEADER([mpcdec/mpcdec.h], [
     HAVE_MUSEPACK="yes"
-    MUSEPACK_LIBS="-lmusepack"
+    MUSEPACK_LIBS="-lmpcdec"
     AC_SUBST(MUSEPACK_LIBS)
     ], [HAVE_MUSEPACK="no"])
   AC_LANG_C
diff --git a/ext/musepack/gstmusepackdec.h b/ext/musepack/gstmusepackdec.h
index a4493c4a..b75f87ec 100644
--- a/ext/musepack/gstmusepackdec.h
+++ b/ext/musepack/gstmusepackdec.h
@@ -22,7 +22,7 @@
 
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
-#include <musepack/musepack.h>
+#include <mpcdec/mpcdec.h>
 #include "gstmusepackreader.h"
 
 G_BEGIN_DECLS
diff --git a/ext/musepack/gstmusepackreader.c b/ext/musepack/gstmusepackreader.c
index 230d7a3c..c69233f9 100644
--- a/ext/musepack/gstmusepackreader.c
+++ b/ext/musepack/gstmusepackreader.c
@@ -89,7 +89,7 @@ gst_musepack_reader_read (void *this, void *ptr, mpc_int32_t size)
   return read;
 }
 
-static BOOL
+static mpc_bool_t
 gst_musepack_reader_seek (void *this, mpc_int32_t offset)
 {
   GstByteStream *bs = this;
@@ -126,7 +126,7 @@ gst_musepack_reader_get_size (void *this)
   return gst_bytestream_length (bs);
 }
 
-static BOOL
+static mpc_bool_t
 gst_musepack_reader_canseek (void *this)
 {
   return TRUE;
diff --git a/ext/musepack/gstmusepackreader.h b/ext/musepack/gstmusepackreader.h
index 2aa2edd2..d00153e8 100644
--- a/ext/musepack/gstmusepackreader.h
+++ b/ext/musepack/gstmusepackreader.h
@@ -20,7 +20,7 @@
 #ifndef __GST_MUSEPACK_READER_H__
 #define __GST_MUSEPACK_READER_H__
 
-#include <musepack/musepack.h>
+#include <mpcdec/mpcdec.h>
 #include <gst/bytestream/bytestream.h>
 
 void gst_musepack_init_reader (mpc_reader * r, GstByteStream * bs);
-- 
cgit v1.2.1