From 7afac6e23a9827dbbc7dab1e49c0a4c59c7c5950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Thu, 27 Nov 2008 19:13:59 +0000
Subject: [PATCH] Remove audioresample files.

Original commit message from CVS:
* gst/audioresample/Makefile.am:
* gst/audioresample/buffer.c:
* gst/audioresample/buffer.h:
* gst/audioresample/debug.c:
* gst/audioresample/debug.h:
* gst/audioresample/functable.c:
* gst/audioresample/functable.h:
* gst/audioresample/gstaudioresample.c:
* gst/audioresample/gstaudioresample.h:
* gst/audioresample/resample.c:
* gst/audioresample/resample.h:
* gst/audioresample/resample_chunk.c:
* gst/audioresample/resample_functable.c:
* gst/audioresample/resample_ref.c:
* tests/check/elements/audioresample.c:
Remove audioresample files.
---
 ChangeLog                            | 19 +++++++++++++++++++
 gst/audioresample/Makefile.am        |  2 --
 gst/audioresample/gstaudioresample.c | 27 ++++-----------------------
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 78a3ddda785..e65b9891c44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2008-11-27  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* gst/audioresample/Makefile.am:
+	* gst/audioresample/buffer.c:
+	* gst/audioresample/buffer.h:
+	* gst/audioresample/debug.c:
+	* gst/audioresample/debug.h:
+	* gst/audioresample/functable.c:
+	* gst/audioresample/functable.h:
+	* gst/audioresample/gstaudioresample.c:
+	* gst/audioresample/gstaudioresample.h:
+	* gst/audioresample/resample.c:
+	* gst/audioresample/resample.h:
+	* gst/audioresample/resample_chunk.c:
+	* gst/audioresample/resample_functable.c:
+	* gst/audioresample/resample_ref.c:
+	* tests/check/elements/audioresample.c:
+	Remove audioresample files.
+
 2008-11-27  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* docs/plugins/inspect/plugin-audioresample.xml:
diff --git a/gst/audioresample/Makefile.am b/gst/audioresample/Makefile.am
index cacde0f4221..f9c4c52c225 100644
--- a/gst/audioresample/Makefile.am
+++ b/gst/audioresample/Makefile.am
@@ -19,5 +19,3 @@ libgstaudioresample_la_SOURCES = gstaudioresample.c $(resample_SOURCES)
 libgstaudioresample_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
 libgstaudioresample_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
 libgstaudioresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaudioresample_la_LIBTOOLFLAGS = --tag=disable-static
-
diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c
index 1826849bcb4..9aa9bf771fe 100644
--- a/gst/audioresample/gstaudioresample.c
+++ b/gst/audioresample/gstaudioresample.c
@@ -112,8 +112,6 @@ static gboolean audioresample_get_unit_size (GstBaseTransform * base,
     GstCaps * caps, guint * size);
 static GstCaps *audioresample_transform_caps (GstBaseTransform * base,
     GstPadDirection direction, GstCaps * caps);
-static void audioresample_fixate_caps (GstBaseTransform * base,
-    GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
 static gboolean audioresample_transform_size (GstBaseTransform * trans,
     GstPadDirection direction, GstCaps * incaps, guint insize,
     GstCaps * outcaps, guint * outsize);
@@ -174,8 +172,6 @@ gst_audioresample_class_init (GstAudioresampleClass * klass)
       GST_DEBUG_FUNCPTR (audioresample_get_unit_size);
   GST_BASE_TRANSFORM_CLASS (klass)->transform_caps =
       GST_DEBUG_FUNCPTR (audioresample_transform_caps);
-  GST_BASE_TRANSFORM_CLASS (klass)->fixate_caps =
-      GST_DEBUG_FUNCPTR (audioresample_fixate_caps);
   GST_BASE_TRANSFORM_CLASS (klass)->set_caps =
       GST_DEBUG_FUNCPTR (audioresample_set_caps);
   GST_BASE_TRANSFORM_CLASS (klass)->transform =
@@ -276,22 +272,6 @@ audioresample_transform_caps (GstBaseTransform * base,
   return res;
 }
 
-/* Fixate rate to the allowed rate that has the smallest difference */
-static void
-audioresample_fixate_caps (GstBaseTransform * base,
-    GstPadDirection direction, GstCaps * caps, GstCaps * othercaps)
-{
-  GstStructure *s;
-  gint rate;
-
-  s = gst_caps_get_structure (caps, 0);
-  if (!gst_structure_get_int (s, "rate", &rate))
-    return;
-
-  s = gst_caps_get_structure (othercaps, 0);
-  gst_structure_fixate_field_nearest_int (s, "rate", rate);
-}
-
 static gboolean
 resample_set_state_from_caps (ResampleState * state, GstCaps * incaps,
     GstCaps * outcaps, gint * channels, gint * inrate, gint * outrate)
@@ -484,8 +464,7 @@ audioresample_event (GstBaseTransform * base, GstEvent * event)
     case GST_EVENT_FLUSH_START:
       break;
     case GST_EVENT_FLUSH_STOP:
-      if (audioresample->resample)
-        resample_input_flush (audioresample->resample);
+      resample_input_flush (audioresample->resample);
       audioresample->ts_offset = -1;
       audioresample->next_ts = -1;
       audioresample->offset = -1;
@@ -504,7 +483,9 @@ audioresample_event (GstBaseTransform * base, GstEvent * event)
     default:
       break;
   }
-  return parent_class->event (base, event);
+  parent_class->event (base, event);
+
+  return TRUE;
 }
 
 static GstFlowReturn