From de4a9596e9d179a258ec11e5a4f48d63b0180403 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Mon, 22 Aug 2005 11:20:18 +0000
Subject: Port flacdec (seeking is still slow'ish).

Original commit message from CVS:
* configure.ac:
* ext/Makefile.am:
* ext/flac/Makefile.am:
* ext/flac/gstflac.c: (plugin_init):
* ext/flac/gstflacdec.c: (flacdec_get_type), (gst_flacdec_init),
(gst_flacdec_update_metadata), (gst_flacdec_seek),
(gst_flacdec_tell), (gst_flacdec_length), (gst_flacdec_read),
(gst_flacdec_write), (gst_flacdec_loop),
(gst_flacdec_get_src_query_types), (gst_flacdec_src_query),
(gst_flacdec_src_event), (gst_flacdec_sink_activate),
(gst_flacdec_sink_activate_pull), (gst_flacdec_change_state):
* ext/flac/gstflacdec.h:
Port flacdec (seeking is still slow'ish).
---
 ChangeLog       | 16 ++++++++++++++++
 configure.ac    | 15 +++++++++++++++
 ext/Makefile.am |  9 +++++----
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9462e57d..c77cc7c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2005-08-22  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* configure.ac:
+	* ext/Makefile.am:
+	* ext/flac/Makefile.am:
+	* ext/flac/gstflac.c: (plugin_init):
+	* ext/flac/gstflacdec.c: (flacdec_get_type), (gst_flacdec_init),
+	(gst_flacdec_update_metadata), (gst_flacdec_seek),
+	(gst_flacdec_tell), (gst_flacdec_length), (gst_flacdec_read),
+	(gst_flacdec_write), (gst_flacdec_loop),
+	(gst_flacdec_get_src_query_types), (gst_flacdec_src_query),
+	(gst_flacdec_src_event), (gst_flacdec_sink_activate),
+	(gst_flacdec_sink_activate_pull), (gst_flacdec_change_state):
+	* ext/flac/gstflacdec.h:
+	  Port flacdec (seeking is still slow'ish).
+
 2005-08-22  Owen Fraser-Green  <owen@discobabe.net>
 
 	* gst/realmedia/rmdemux.c: 
diff --git a/configure.ac b/configure.ac
index 39efc328..cbf2b272 100644
--- a/configure.ac
+++ b/configure.ac
@@ -411,6 +411,20 @@ return 0;
   AC_SUBST(FAAD_LIBS)
 ])
 
+dnl *** FLAC ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_FLAC, true)
+GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [
+  GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__seekable_stream_encoder_new, -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -lm")
+  dnl API change in FLAC 1.1.1, so require that...
+  if test x$HAVE_FLAC = xyes; then
+    AC_CHECK_DECL(FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR,
+                  HAVE_FLAC="yes", HAVE_FLAC="no", [
+#include <FLAC/seekable_stream_encoder.h>
+                  ])
+  fi
+  AC_SUBST(FLAC_LIBS)
+])
+
 dnl *** lame ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true)
 GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [
@@ -653,6 +667,7 @@ sys/oss/Makefile
 ext/Makefile
 ext/aalib/Makefile
 ext/dv/Makefile
+ext/flac/Makefile
 ext/gconf/Makefile
 ext/lame/Makefile
 ext/libcaca/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 4fb0317a..7f1ea76a 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -118,11 +118,11 @@ endif
 ## FESTIVAL_DIR=
 ## endif
 
-# if USE_FLAC
-# FLAC_DIR=flac
-# else
+if USE_FLAC
+FLAC_DIR=flac
+else
 FLAC_DIR=
-# endif
+endif
 
 if USE_GCONF
 GCONF_DIR=gconf
@@ -451,6 +451,7 @@ DIST_SUBDIRS=\
 	dv \
 	amrnb \
 	faad \
+	flac \
 	mpeg2dec \
 	jpeg \
 	libpng \
-- 
cgit v1.2.1