[gst-cvs] gst-plugins-good: level: calculate the message-intervall when it changes

[<ensonic@ke...>]

Module: gst-plugins-good
Branch: master
Commit: 71044b37b66b309716267d48f6a7ae343558914e
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=71044b37b66b309716267d48f6a7ae343558914e

Author: Stefan Kost <ensonic@...>
Date:   Sun Nov  1 00:29:24 2009 +0200

level: calculate the message-intervall when it changes

---

 gst/level/gstlevel.c |   10 ++++++++--
 gst/level/gstlevel.h |    1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 0d93428..b8b99dc 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -281,6 +281,10 @@ gst_level_set_property (GObject * object, guint prop_id,
       break;
     case PROP_SIGNAL_INTERVAL:
       filter->interval = g_value_get_uint64 (value);
+      if (filter->rate) {
+        filter->interval_frames =
+            GST_CLOCK_TIME_TO_FRAMES (filter->interval, filter->rate);
+      }
       break;
     case PROP_PEAK_TTL:
       filter->decay_peak_ttl =
@@ -483,6 +487,9 @@ gst_level_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
     filter->decay_peak_age[i] = G_GUINT64_CONSTANT (0);
   }
 
+  filter->interval_frames =
+      GST_CLOCK_TIME_TO_FRAMES (filter->interval, filter->rate);
+
   return TRUE;
 }
 
@@ -648,8 +655,7 @@ gst_level_transform_ip (GstBaseTransform * trans, GstBuffer * in)
   filter->num_frames += num_frames;
 
   /* do we need to message ? */
-  if (filter->num_frames >=
-      GST_CLOCK_TIME_TO_FRAMES (filter->interval, filter->rate)) {
+  if (filter->num_frames >= filter->interval_frames) {
     if (filter->message) {
       GstMessage *m;
       GstClockTime duration =
diff --git a/gst/level/gstlevel.h b/gst/level/gstlevel.h
index d8c06a2..32d4c9e 100644
--- a/gst/level/gstlevel.h
+++ b/gst/level/gstlevel.h
@@ -67,6 +67,7 @@ struct _GstLevel {
   gdouble decay_peak_falloff;   /* falloff in dB/sec */
   gint num_frames;              /* frame count (1 sample per channel)
                                  * since last emit */
+  gint interval_frames;         /* after how many frame to sent a message */
   GstClockTime message_ts;      /* starttime for next message */
 
   /* per-channel arrays for intermediate values */

[gst-cvs] gst-plugins-good: level: use more g-style types

[<ensonic@ke...>]

Module: gst-plugins-good
Branch: master
Commit: 519e42449403e471fe314c0c39952cc93514e256
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=519e42449403e471fe314c0c39952cc93514e256

Author: Stefan Kost <ensonic@...>
Date:   Sun Nov  1 00:10:01 2009 +0200

level: use more g-style types

---

 gst/level/gstlevel.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 0a53c45..7fbe9f7 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -427,7 +427,7 @@ gst_level_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
   GstLevel *filter = GST_LEVEL (trans);
   const gchar *mimetype;
   GstStructure *structure;
-  int i;
+  gint i;
 
   structure = gst_caps_get_structure (in, 0);
   filter->rate = structure_get_int (structure, "rate");
@@ -469,11 +469,11 @@ gst_level_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
   g_free (filter->decay_peak);
   g_free (filter->decay_peak_base);
   g_free (filter->decay_peak_age);
-  filter->CS = g_new (double, filter->channels);
-  filter->peak = g_new (double, filter->channels);
-  filter->last_peak = g_new (double, filter->channels);
-  filter->decay_peak = g_new (double, filter->channels);
-  filter->decay_peak_base = g_new (double, filter->channels);
+  filter->CS = g_new (gdouble, filter->channels);
+  filter->peak = g_new (gdouble, filter->channels);
+  filter->last_peak = g_new (gdouble, filter->channels);
+  filter->decay_peak = g_new (gdouble, filter->channels);
+  filter->decay_peak_base = g_new (gdouble, filter->channels);
 
   filter->decay_peak_age = g_new (GstClockTime, filter->channels);
 

[gst-cvs] gst-plugins-good: level: fix decay to be smooth

[<ensonic@ke...>]

Module: gst-plugins-good
Branch: master
Commit: 03d2f4bdec9ad0b558d973c45ee685cbf33c598a
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=03d2f4bdec9ad0b558d973c45ee685cbf33c598a

Author: Stefan Kost <ensonic@...>
Date:   Sun Nov  1 00:29:57 2009 +0200

level: fix decay to be smooth

The length not having any fractional part as it was promoted to gdouble after
dividing two guint64.

---

 gst/level/gstlevel.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index b8b99dc..10fa10a 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -621,7 +621,7 @@ gst_level_transform_ip (GstBaseTransform * trans, GstBuffer * in)
       gdouble falloff;
       gdouble length;           /* length of falloff time in seconds */
 
-      length = (gdouble) (falloff_time / GST_SECOND);
+      length = (gdouble) falloff_time / (gdouble) GST_SECOND;
       falloff_dB = filter->decay_peak_falloff * length;
       falloff = pow (10, falloff_dB / -20.0);
 

[gst-cvs] gst-plugins-good: level: clocktime is a guint64, use right macro to init fields

[<ensonic@ke...>]

Module: gst-plugins-good
Branch: master
Commit: f5b3392fa6c36cfe88a489f7b54ec8e4e9e9c1d4
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=f5b3392fa6c36cfe88a489f7b54ec8e4e9e9c1d4

Author: Stefan Kost <ensonic@...>
Date:   Sun Nov  1 00:14:08 2009 +0200

level: clocktime is a guint64, use right macro to init fields

---

 gst/level/gstlevel.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 7fbe9f7..0d93428 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -480,7 +480,7 @@ gst_level_set_caps (GstBaseTransform * trans, GstCaps * in, GstCaps * out)
   for (i = 0; i < filter->channels; ++i) {
     filter->CS[i] = filter->peak[i] = filter->last_peak[i] =
         filter->decay_peak[i] = filter->decay_peak_base[i] = 0.0;
-    filter->decay_peak_age[i] = G_GINT64_CONSTANT (0);
+    filter->decay_peak_age[i] = G_GUINT64_CONSTANT (0);
   }
 
   return TRUE;

[gst-cvs] gst-plugins-bad: aiff: rename 'aiffparse' plugin to 'aiff'

[<tpm@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: 8a1b22836f3dd8d38ebd369b39d2f202f8d90fe4
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=8a1b22836f3dd8d38ebd369b39d2f202f8d90fe4

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Sat Oct 31 17:20:53 2009 +0000

aiff: rename 'aiffparse' plugin to 'aiff'

---

 configure.ac                                       |    4 ++--
 .../{plugin-aiffparse.xml => plugin-aiff.xml}      |    8 ++++----
 gst-plugins-bad.spec.in                            |    2 +-
 gst/aiff/Makefile.am                               |   15 +++++++++++++++
 gst/{aiffparse => aiff}/aiffparse.c                |    2 +-
 gst/{aiffparse => aiff}/aiffparse.h                |    0 
 gst/aiffparse/Makefile.am                          |   15 ---------------
 po/POTFILES.in                                     |    2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6092881..b05d6ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,7 +254,7 @@ dnl *** plug-ins to include ***
 dnl these are all the gst plug-ins, compilable without additional libs
 AG_GST_CHECK_PLUGIN(aacparse)
 AG_GST_CHECK_PLUGIN(adpcmdec)
-AG_GST_CHECK_PLUGIN(aiffparse)
+AG_GST_CHECK_PLUGIN(aiff)
 AG_GST_CHECK_PLUGIN(amrparse)
 AG_GST_CHECK_PLUGIN(asfmux)
 AG_GST_CHECK_PLUGIN(autoconvert)
@@ -1735,7 +1735,7 @@ gst-plugins-bad.spec
 gst/Makefile
 gst/aacparse/Makefile
 gst/adpcmdec/Makefile
-gst/aiffparse/Makefile
+gst/aiff/Makefile
 gst/amrparse/Makefile
 gst/asfmux/Makefile
 gst/autoconvert/Makefile
diff --git a/docs/plugins/inspect/plugin-aiffparse.xml b/docs/plugins/inspect/plugin-aiff.xml
similarity index 88%
rename from docs/plugins/inspect/plugin-aiffparse.xml
rename to docs/plugins/inspect/plugin-aiff.xml
index a141af6..45c7fa5 100644
--- a/docs/plugins/inspect/plugin-aiffparse.xml
+++ b/docs/plugins/inspect/plugin-aiff.xml
@@ -1,8 +1,8 @@
 <plugin>
-  <name>aiffparse</name>
+  <name>aiff</name>
   <description>Parse an .aiff file into raw audio</description>
-  <filename>../../gst/aiffparse/.libs/libgstaiffparse.so</filename>
-  <basename>libgstaiffparse.so</basename>
+  <filename>../../gst/aiffparse/.libs/libgstaiff.so</filename>
+  <basename>libgstaiff.so</basename>
   <version>0.10.16</version>
   <license>LGPL</license>
   <source>gst-plugins-bad</source>
@@ -31,4 +31,4 @@
       </pads>
     </element>
   </elements>
-</plugin>
\ No newline at end of file
+</plugin>
diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in
index 0679867..56b2ea0 100644
--- a/gst-plugins-bad.spec.in
+++ b/gst-plugins-bad.spec.in
@@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstsubenc.so
 %{_libdir}/gstreamer-%{majorminor}/libgstoss4audio.so
 %{_libdir}/gstreamer-%{majorminor}/libresindvd.so
-%{_libdir}/gstreamer-%{majorminor}/libgstaiffparse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstaiff.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdccp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstpcapparse.so
 %{_libdir}/gstreamer-%{majorminor}/libgstmpegtsmux.so
diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am
new file mode 100644
index 0000000..8f4b3fc
--- /dev/null
+++ b/gst/aiff/Makefile.am
@@ -0,0 +1,15 @@
+plugin_LTLIBRARIES = libgstaiff.la
+
+libgstaiff_la_SOURCES = aiffparse.c
+libgstaiff_la_CFLAGS = \
+	$(GST_BASE_CFLAGS) \
+	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_CFLAGS)
+libgstaiff_la_LIBADD = \
+	$(GST_PLUGINS_BASE_LIBS) \
+	$(GST_BASE_LIBS) \
+	$(LIBM)
+libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstaiff_la_LIBTOOLFLAGS = --tag=disable-static
+
+noinst_HEADERS = aiffparse.h
diff --git a/gst/aiffparse/aiffparse.c b/gst/aiff/aiffparse.c
similarity index 99%
rename from gst/aiffparse/aiffparse.c
rename to gst/aiff/aiffparse.c
index 7581d01..c621078 100644
--- a/gst/aiffparse/aiffparse.c
+++ b/gst/aiff/aiffparse.c
@@ -1605,6 +1605,6 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    "aiffparse",
+    "aiff",
     "Parse an .aiff file into raw audio",
     plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/aiffparse/aiffparse.h b/gst/aiff/aiffparse.h
similarity index 100%
rename from gst/aiffparse/aiffparse.h
rename to gst/aiff/aiffparse.h
diff --git a/gst/aiffparse/Makefile.am b/gst/aiffparse/Makefile.am
deleted file mode 100644
index 23ace5f..0000000
--- a/gst/aiffparse/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-plugin_LTLIBRARIES = libgstaiffparse.la
-
-libgstaiffparse_la_SOURCES = aiffparse.c
-libgstaiffparse_la_CFLAGS = \
-	$(GST_BASE_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) \
-	$(GST_CFLAGS)
-libgstaiffparse_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) \
-	$(GST_BASE_LIBS) \
-	$(LIBM)
-libgstaiffparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaiffparse_la_LIBTOOLFLAGS = --tag=disable-static
-
-noinst_HEADERS = aiffparse.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1cccb4e..696a9e9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@ ext/resindvd/resindvdsrc.c
 ext/resindvd/rsnbasesrc.c
 ext/sndfile/gstsfsink.c
 ext/sndfile/gstsfsrc.c
-gst/aiffparse/aiffparse.c
+gst/aiff/aiffparse.c
 gst/nuvdemux/gstnuvdemux.c
 sys/dvb/gstdvbsrc.c
 sys/oss4/oss4-mixer.c

[gst-cvs] gst-plugins-bad: aiff: add basic AIFF muxer

[<tpm@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: 20f4a1afd9f6e90364d3bf259fc5421ae42d5ab7
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=20f4a1afd9f6e90364d3bf259fc5421ae42d5ab7

Author: Robert Swain <robert.swain@...>
Date:   Sat Oct 17 22:58:03 2009 +0100

aiff: add basic AIFF muxer

Fixes #598763.

---

 gst/aiff/aiffmux.c |  431 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 gst/aiff/aiffmux.h |   88 +++++++++++
 2 files changed, 519 insertions(+), 0 deletions(-)

Diff:   http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/diff/?id=20f4a1afd9f6e90364d3bf259fc5421ae42d5ab7

[gst-cvs] gst-plugins-bad: aiff: add aiff elements to docs

[<tpm@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: decd2acece6a161f1b173c96ab6e91f82fc2c78a
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=decd2acece6a161f1b173c96ab6e91f82fc2c78a

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Sat Oct 31 19:42:50 2009 +0000

aiff: add aiff elements to docs

---

 docs/plugins/Makefile.am                          |    2 +
 docs/plugins/gst-plugins-bad-plugins-docs.sgml    |    3 ++
 docs/plugins/gst-plugins-bad-plugins-sections.txt |   29 +++++++++++++++++++++
 docs/plugins/inspect/plugin-aiff.xml              |   29 ++++++++++++++++++---
 gst/aiff/aiffmux.h                                |   12 ++++++--
 gst/aiff/aiffparse.h                              |    5 ++-
 6 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index a5b2985..61a2ba1 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -122,6 +122,8 @@ EXTRA_HFILES = \
 	$(top_srcdir)/ext/timidity/gstwildmidi.h \
 	$(top_srcdir)/ext/zbar/gstzbar.h \
 	$(top_srcdir)/gst/aacparse/gstaacparse.h \
+	$(top_srcdir)/gst/aiff/aiffparse.h \
+	$(top_srcdir)/gst/aiff/aiffmux.h \
 	$(top_srcdir)/gst/amrparse/gstamrparse.h \
 	$(top_srcdir)/gst/autoconvert/gstautoconvert.h \
 	$(top_srcdir)/gst/camerabin/gstcamerabin.h \
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 0dc6500..47bb3c8 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -18,6 +18,8 @@
   <chapter>
     <title>gst-plugins-bad Elements</title>
     <xi:include href="xml/element-aacparse.xml" />
+    <xi:include href="xml/element-aiffparse.xml" />
+    <xi:include href="xml/element-aiffmux.xml" />
     <xi:include href="xml/element-amrparse.xml" />
     <xi:include href="xml/element-amrwbenc.xml" />
     <xi:include href="xml/element-autoconvert.xml" />
@@ -90,6 +92,7 @@
   <chapter>
     <title>gst-plugins-bad Plugins</title>
     <xi:include href="xml/plugin-aacparse.xml" />
+    <xi:include href="xml/plugin-aiff.xml" />
     <xi:include href="xml/plugin-amrparse.xml" />
     <xi:include href="xml/plugin-autoconvert.xml" />
     <xi:include href="xml/plugin-legacyresample.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index 6b77f15..c695f94 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -13,6 +13,35 @@ gst_aacparse_get_type
 </SECTION>
 
 <SECTION>
+<FILE>element-aiffmux</FILE>
+<TITLE>aiffmux</TITLE>
+GstAiffMux
+<SUBSECTION Standard>
+GST_AIFF_MUX
+GST_AIFF_MUX_CLASS
+GST_IS_AIFF_MUX
+GST_IS_AIFF_MUX_CLASS
+GST_TYPE_AIFF_MUX
+GstAiffMuxClass
+gst_aiff_mux_get_type
+</SECTION>
+
+<SECTION>
+<FILE>element-aiffparse</FILE>
+<TITLE>aiffparse</TITLE>
+GstAiffParse
+<SUBSECTION Standard>
+GST_AIFF_PARSE
+GST_AIFF_PARSE_CLASS
+GST_IS_AIFF_PARSE
+GST_IS_AIFF_PARSE_CLASS
+GST_TYPE_AIFF_PARSE
+GstAiffParseClass
+GstAiffParseState
+gst_aiff_parse_get_type
+</SECTION>
+
+<SECTION>
 <FILE>element-amrparse</FILE>
 <TITLE>amrparse</TITLE>
 GstAmrParse
diff --git a/docs/plugins/inspect/plugin-aiff.xml b/docs/plugins/inspect/plugin-aiff.xml
index 45c7fa5..b83f90d 100644
--- a/docs/plugins/inspect/plugin-aiff.xml
+++ b/docs/plugins/inspect/plugin-aiff.xml
@@ -1,15 +1,36 @@
 <plugin>
   <name>aiff</name>
-  <description>Parse an .aiff file into raw audio</description>
-  <filename>../../gst/aiffparse/.libs/libgstaiff.so</filename>
+  <description>Create and parse Audio Interchange File Format (AIFF) files</description>
+  <filename>../../gst/aiff/.libs/libgstaiff.so</filename>
   <basename>libgstaiff.so</basename>
-  <version>0.10.16</version>
+  <version>0.10.16.1</version>
   <license>LGPL</license>
   <source>gst-plugins-bad</source>
   <package>GStreamer Bad Plug-ins prerelease</package>
   <origin>Unknown package origin</origin>
   <elements>
     <element>
+      <name>aiffmux</name>
+      <longname>AIFF audio muxer</longname>
+      <class>Muxer/Audio</class>
+      <description>Multiplex raw audio into AIFF</description>
+      <author>Robert Swain &lt;robert.swain@...&gt;</author>
+      <pads>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>audio/x-raw-int, width=(int)8, depth=(int)[ 1, 8 ], signed=(boolean)true, endianness=(int)4321, channels=(int)[ 1, 2147483647 ], rate=(int)[ 1, 2147483647 ]; audio/x-raw-int, width=(int)16, depth=(int)[ 9, 16 ], signed=(boolean)true, endianness=(int)4321, channels=(int)[ 1, 2147483647 ], rate=(int)[ 1, 2147483647 ]; audio/x-raw-int, width=(int)24, depth=(int)[ 17, 24 ], signed=(boolean)true, endianness=(int)4321, channels=(int)[ 1, 2147483647 ], rate=(int)[ 1, 2147483647 ]; audio/x-raw-int, width=(int)32, depth=(int)[ 25, 32 ], signed=(boolean)true, endianness=(int)4321, channels=(int)[ 1, 2147483647 ], rate=(int)[ 1, 2147483647 ]</details>
+        </caps>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>audio/x-aiff</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
       <name>aiffparse</name>
       <longname>AIFF audio demuxer</longname>
       <class>Codec/Demuxer/Audio</class>
@@ -31,4 +52,4 @@
       </pads>
     </element>
   </elements>
-</plugin>
+</plugin>
\ No newline at end of file
diff --git a/gst/aiff/aiffmux.h b/gst/aiff/aiffmux.h
index cc64586..73c1d89 100644
--- a/gst/aiff/aiffmux.h
+++ b/gst/aiff/aiffmux.h
@@ -1,5 +1,4 @@
-/*
- * GStreamer
+/* GStreamer AIFF muxer
  * Copyright (C) 2009 Robert Swain <robert.swain@...>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -47,7 +46,7 @@
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
-/* #defines don't like whitespacey bits */
+
 #define GST_TYPE_AIFF_MUX \
   (gst_aiff_mux_get_type())
 #define GST_AIFF_MUX(obj) \
@@ -58,13 +57,20 @@ G_BEGIN_DECLS
   (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_AIFF_MUX))
 #define GST_IS_AIFF_MUX_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AIFF_MUX))
+
 typedef struct _GstAiffMux GstAiffMux;
 typedef struct _GstAiffMuxClass GstAiffMuxClass;
 
+/**
+ * GstAiffMux:
+ *
+ * Opaque data structure.
+ */
 struct _GstAiffMux
 {
   GstElement element;
 
+  /*< private >*/
   GstPad *sinkpad;
   GstPad *srcpad;
 
diff --git a/gst/aiff/aiffparse.h b/gst/aiff/aiffparse.h
index 6a391bb..1ffe212 100644
--- a/gst/aiff/aiffparse.h
+++ b/gst/aiff/aiffparse.h
@@ -55,8 +55,9 @@ typedef struct _GstAiffParseClass GstAiffParseClass;
 struct _GstAiffParse {
   GstElement parent;
 
-  /* pads */
-  GstPad *sinkpad,*srcpad;
+  /*< private >*/
+  GstPad      *sinkpad;
+  GstPad      *srcpad;
 
   GstCaps     *caps;
   GstEvent    *close_segment;

[gst-cvs] gst-plugins-bad: aiff: gratuitious clean-ups: canonicalise function names, structs and defines

[<tpm@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: 57cce4754c408d4da69f376ed05c74439acc058f
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=57cce4754c408d4da69f376ed05c74439acc058f

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Sat Oct 31 19:37:08 2009 +0000

aiff: gratuitious clean-ups: canonicalise function names, structs and defines

---

 gst/aiff/aiff.c      |    2 +-
 gst/aiff/aiffmux.c   |    5 +-
 gst/aiff/aiffparse.c |  260 +++++++++++++++++++++++++-------------------------
 gst/aiff/aiffparse.h |   50 +++++-----
 4 files changed, 158 insertions(+), 159 deletions(-)

Diff:   http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/diff/?id=57cce4754c408d4da69f376ed05c74439acc058f

[gst-cvs] gst-plugins-bad: aiff: remove unused includes and fix flags order in Makefile.am

[<tpm@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: 8246f755cf7ef80cff1c8c54bcccceadabe0fb8f
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=8246f755cf7ef80cff1c8c54bcccceadabe0fb8f

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Sat Oct 31 17:25:15 2009 +0000

aiff: remove unused includes and fix flags order in Makefile.am

Also remove GST_PLUGINS_BASE_LIBS from LIBADD since we don't
need to link against any of the -base libs (we just use a define
from the gstaudio headers).

---

 gst/aiff/Makefile.am |    3 +--
 gst/aiff/aiffparse.c |    2 +-
 gst/aiff/aiffparse.h |    2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am
index 8f4b3fc..923c273 100644
--- a/gst/aiff/Makefile.am
+++ b/gst/aiff/Makefile.am
@@ -2,11 +2,10 @@ plugin_LTLIBRARIES = libgstaiff.la
 
 libgstaiff_la_SOURCES = aiffparse.c
 libgstaiff_la_CFLAGS = \
-	$(GST_BASE_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstaiff_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_BASE_LIBS) \
 	$(LIBM)
 libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/aiff/aiffparse.c b/gst/aiff/aiffparse.c
index c621078..81ce145 100644
--- a/gst/aiff/aiffparse.c
+++ b/gst/aiff/aiffparse.c
@@ -56,7 +56,7 @@
 #include <math.h>
 
 #include "aiffparse.h"
-#include "gst/audio/audio.h"
+#include <gst/audio/audio.h>
 #include <gst/gst-i18n-plugin.h>
 
 GST_DEBUG_CATEGORY_STATIC (aiffparse_debug);
diff --git a/gst/aiff/aiffparse.h b/gst/aiff/aiffparse.h
index daca59c..9cb7453 100644
--- a/gst/aiff/aiffparse.h
+++ b/gst/aiff/aiffparse.h
@@ -23,8 +23,6 @@
 
 
 #include <gst/gst.h>
-#include "gst/riff/riff-ids.h"
-#include "gst/riff/riff-read.h"
 #include <gst/base/gstadapter.h>
 
 G_BEGIN_DECLS

[gst-cvs] gst-plugins-bad: aiff: enable new aiff muxer

[<tpm@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: d65d2888449ca0810842151b96093159c20166de
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=d65d2888449ca0810842151b96093159c20166de

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Sat Oct 31 17:50:54 2009 +0000

aiff: enable new aiff muxer

Fixes #598763 even more.

---

 gst/aiff/Makefile.am |    4 +-
 gst/aiff/aiff.c      |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++
 gst/aiff/aiffmux.c   |   25 ++-----------------
 gst/aiff/aiffparse.c |   24 +------------------
 gst/aiff/aiffparse.h |    2 +-
 5 files changed, 70 insertions(+), 48 deletions(-)

diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am
index 923c273..5a693d4 100644
--- a/gst/aiff/Makefile.am
+++ b/gst/aiff/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgstaiff.la
 
-libgstaiff_la_SOURCES = aiffparse.c
+libgstaiff_la_SOURCES = aiff.c aiffmux.c aiffparse.c
 libgstaiff_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
@@ -11,4 +11,4 @@ libgstaiff_la_LIBADD = \
 libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaiff_la_LIBTOOLFLAGS = --tag=disable-static
 
-noinst_HEADERS = aiffparse.h
+noinst_HEADERS = aiffmux.h aiffparse.h
diff --git a/gst/aiff/aiff.c b/gst/aiff/aiff.c
new file mode 100644
index 0000000..f74639b
--- /dev/null
+++ b/gst/aiff/aiff.c
@@ -0,0 +1,63 @@
+/* -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2 -*- */
+/* GStreamer AIFF plugin initialisation
+ * Copyright (C) <2008> Pioneers of the Inevitable <songbird@...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst-i18n-plugin.h>
+
+#include "aiffparse.h"
+#include "aiffmux.h"
+
+GST_DEBUG_CATEGORY_STATIC (aiff_debug);
+#define GST_CAT_DEFAULT (aiff_debug)
+
+GST_DEBUG_CATEGORY_EXTERN (aiffparse_debug);
+GST_DEBUG_CATEGORY_EXTERN (aiffmux_debug);
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  gboolean ret;
+
+  GST_DEBUG_CATEGORY_INIT (aiffparse_debug, "aiffparse", 0, "AIFF parser");
+  GST_DEBUG_CATEGORY_INIT (aiffmux_debug, "aiffmux", 0, "AIFF muxer");
+
+#ifdef ENABLE_NLS
+  GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
+      LOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+#endif
+
+  ret = gst_element_register (plugin, "aiffparse", GST_RANK_PRIMARY,
+      TYPE_AIFFPARSE);
+  ret &= gst_element_register (plugin, "aiffmux", GST_RANK_NONE,
+      GST_TYPE_AIFF_MUX);
+
+  return ret;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "aiff",
+    "Create and parse Audio Interchange File Format (AIFF) files",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/aiff/aiffmux.c b/gst/aiff/aiffmux.c
index 4597488..95e1cd6 100644
--- a/gst/aiff/aiffmux.c
+++ b/gst/aiff/aiffmux.c
@@ -1,5 +1,4 @@
-/*
- * GStreamer
+/* GStreamer AIFF muxer
  * Copyright (C) 2009 Robert Swain <robert.swain@...>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -59,8 +58,8 @@
 
 #include "aiffmux.h"
 
-GST_DEBUG_CATEGORY_STATIC (gst_aiff_mux_debug);
-#define GST_CAT_DEFAULT gst_aiff_mux_debug
+GST_DEBUG_CATEGORY (aiffmux_debug);
+#define GST_CAT_DEFAULT aiffmux_debug
 
 static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -411,21 +410,3 @@ gst_aiff_mux_init (GstAiffMux * aiffmux, GstAiffMuxClass * gclass)
       gst_static_pad_template_get_caps (&src_factory));
   gst_element_add_pad (GST_ELEMENT (aiffmux), aiffmux->srcpad);
 }
-
-#if 0
-static gboolean
-aiff_mux_init (GstPlugin * aiffmux)
-{
-  GST_DEBUG_CATEGORY_INIT (gst_aiff_mux_debug, "aiffmux", 0,
-      "AIFF muxer element");
-
-  return gst_element_register (aiffmux, "aiffmux", GST_RANK_NONE,
-      GST_TYPE_AIFF_MUX);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "aiffmux",
-    "Multiplex raw audio into AIFF",
-    aiff_mux_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
-#endif
diff --git a/gst/aiff/aiffparse.c b/gst/aiff/aiffparse.c
index 81ce145..3e0db89 100644
--- a/gst/aiff/aiffparse.c
+++ b/gst/aiff/aiffparse.c
@@ -59,7 +59,7 @@
 #include <gst/audio/audio.h>
 #include <gst/gst-i18n-plugin.h>
 
-GST_DEBUG_CATEGORY_STATIC (aiffparse_debug);
+GST_DEBUG_CATEGORY (aiffparse_debug);
 #define GST_CAT_DEFAULT (aiffparse_debug)
 
 static void gst_aiffparse_dispose (GObject * object);
@@ -1586,25 +1586,3 @@ gst_aiffparse_change_state (GstElement * element, GstStateChange transition)
   }
   return ret;
 }
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  GST_DEBUG_CATEGORY_INIT (aiffparse_debug, "aiffparse", 0, "AIFF parser");
-
-#ifdef ENABLE_NLS
-  GST_DEBUG ("binding text domain %s to locale dir %s", GETTEXT_PACKAGE,
-      LOCALEDIR);
-  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#endif
-
-  return gst_element_register (plugin, "aiffparse", GST_RANK_PRIMARY,
-      TYPE_AIFFPARSE);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "aiff",
-    "Parse an .aiff file into raw audio",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/aiff/aiffparse.h b/gst/aiff/aiffparse.h
index 9cb7453..2d4c9ae 100644
--- a/gst/aiff/aiffparse.h
+++ b/gst/aiff/aiffparse.h
@@ -117,7 +117,7 @@ struct _AIFFParseClass {
   GstElementClass parent_class;
 };
 
-GType aiffparse_get_type(void);
+GType gst_aiffparse_get_type(void);
 
 G_END_DECLS
 

[gst-cvs] gstreamer: parser: Make sure that signal user data is freed by setting a GClosureNotify

[<slomo@ke...>]

Module: gstreamer
Branch: master
Commit: 28493b04ec9a064356c49af048c9b924c94cdfde
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=28493b04ec9a064356c49af048c9b924c94cdfde

Author: Sebastian Dröge <sebastian.droege@...>
Date:   Sat Oct 31 16:56:17 2009 +0100

parser: Make sure that signal user data is freed by setting a GClosureNotify

...instead of using a second mechanism and storing the user data
inside the GObjects qdata.

---

 gst/parse/grammar.y |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index d26d87c..a6703bf 100644
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -303,9 +303,6 @@ static void gst_parse_new_child(GstChildProxy *child_proxy, GObject *object,
        }
     }
     g_signal_handler_disconnect (child_proxy, set->signal_id);
-    g_free(set->name);
-    g_free(set->value_str);
-    g_slice_free(DelayedSet, set);
     if (!got_value)
       goto error;
     g_object_set_property (G_OBJECT (target), pspec->name, &v);
@@ -324,6 +321,12 @@ error:
   goto out;
 }
 
+static void
+gst_parse_free_delayed_set (DelayedSet *set) {
+  g_free(set->name);
+  g_free(set->value_str);
+  g_slice_free(DelayedSet, set);
+}
 
 static void
 gst_parse_element_set (gchar *value, GstElement *element, graph_t *graph)
@@ -386,7 +389,9 @@ gst_parse_element_set (gchar *value, GstElement *element, graph_t *graph)
       data->parent = element;
       data->name = g_strdup(value);
       data->value_str = g_strdup(pos);
-      data->signal_id = g_signal_connect(element, "child-added", G_CALLBACK (gst_parse_new_child), data);
+      data->signal_id = g_signal_connect_data(element, "child-added",
+          G_CALLBACK (gst_parse_new_child), data, (GClosureNotify)
+          gst_parse_free_delayed_set, (GConnectFlags) 0);
     }
     else {
       SET_ERROR (graph->error, GST_PARSE_ERROR_NO_SUCH_PROPERTY, \
@@ -434,15 +439,12 @@ gst_parse_free_delayed_link (DelayedLink *link)
 static void
 gst_parse_found_pad (GstElement *src, GstPad *pad, gpointer data)
 {
-  DelayedLink *link = g_object_get_qdata (G_OBJECT (src),
-      g_quark_from_static_string ("GstParseDelayedLink"));
+  DelayedLink *link = data;
 
   GST_CAT_INFO (GST_CAT_PIPELINE, "trying delayed linking %s:%s to %s:%s", 
                 GST_STR_NULL (GST_ELEMENT_NAME (src)), GST_STR_NULL (link->src_pad),
                 GST_STR_NULL (GST_ELEMENT_NAME (link->sink)), GST_STR_NULL (link->sink_pad));
 
-  g_return_if_fail (link != NULL);
-
   if (gst_element_link_pads_filtered (src, link->src_pad, link->sink,
       link->sink_pad, link->caps)) {
     /* do this here, we don't want to get any problems later on when
@@ -451,8 +453,6 @@ gst_parse_found_pad (GstElement *src, GstPad *pad, gpointer data)
                	   GST_STR_NULL (GST_ELEMENT_NAME (src)), GST_STR_NULL (link->src_pad),
                	   GST_STR_NULL (GST_ELEMENT_NAME (link->sink)), GST_STR_NULL (link->sink_pad));
     g_signal_handler_disconnect (src, link->signal_id);
-    g_object_set_qdata (G_OBJECT (src),
-        g_quark_from_static_string ("GstParseDelayedLink"), NULL);
   }
 }
 /* both padnames and the caps may be NULL */
@@ -485,11 +485,9 @@ gst_parse_perform_delayed_link (GstElement *src, const gchar *src_pad,
       } else {
       	data->caps = NULL;
       }
-      g_object_set_qdata_full (G_OBJECT (src),
-          g_quark_from_static_string ("GstParseDelayedLink"), data,
-	  (GDestroyNotify)gst_parse_free_delayed_link);
-      data->signal_id = g_signal_connect (src, "pad-added",
-          G_CALLBACK (gst_parse_found_pad), NULL);
+      data->signal_id = g_signal_connect_data (src, "pad-added",
+          G_CALLBACK (gst_parse_found_pad), data,
+          (GClosureNotify) gst_parse_free_delayed_link, (GConnectFlags) 0);
       return TRUE;
     }
   }

[gst-cvs] gstreamer: parser: Always get DelayedLink information from the objects qdata

[<slomo@ke...>]

Module: gstreamer
Branch: master
Commit: 5b5718cd20a4748a96f3173ed0f137ca4c23fc80
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=5b5718cd20a4748a96f3173ed0f137ca4c23fc80

Author: Sebastian Dröge <sebastian.droege@...>
Date:   Sat Oct 31 16:43:26 2009 +0100

parser: Always get DelayedLink information from the objects qdata

This makes sure that it is always valid.

---

 gst/parse/grammar.y |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index 06345ce..60115ec 100644
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -434,12 +434,15 @@ gst_parse_free_delayed_link (DelayedLink *link)
 static void
 gst_parse_found_pad (GstElement *src, GstPad *pad, gpointer data)
 {
-  DelayedLink *link = (DelayedLink *) data;
-  
+  DelayedLink *link = g_object_get_qdata (G_OBJECT (src),
+      g_quark_from_static_string ("GstParseDelayedLink"));
+
   GST_CAT_INFO (GST_CAT_PIPELINE, "trying delayed linking %s:%s to %s:%s", 
                 GST_STR_NULL (GST_ELEMENT_NAME (src)), GST_STR_NULL (link->src_pad),
                 GST_STR_NULL (GST_ELEMENT_NAME (link->sink)), GST_STR_NULL (link->sink_pad));
 
+  g_return_if_fail (link != NULL);
+
   if (gst_element_link_pads_filtered (src, link->src_pad, link->sink,
       link->sink_pad, link->caps)) {
     /* do this here, we don't want to get any problems later on when
@@ -482,11 +485,11 @@ gst_parse_perform_delayed_link (GstElement *src, const gchar *src_pad,
       } else {
       	data->caps = NULL;
       }
-      data->signal_id = g_signal_connect (src, "pad-added",
-          G_CALLBACK (gst_parse_found_pad), data);
       g_object_set_qdata_full (G_OBJECT (src),
           g_quark_from_static_string ("GstParseDelayedLink"), data,
 	  (GDestroyNotify)gst_parse_free_delayed_link);
+      data->signal_id = g_signal_connect (src, "pad-added",
+          G_CALLBACK (gst_parse_found_pad), NULL);
       return TRUE;
     }
   }

[gst-cvs] gstreamer: parser: Use GSlice for allocating the structs

[<slomo@ke...>]

Module: gstreamer
Branch: master
Commit: 02d044e291a55c5c8f2809e58cad5d1479ebea26
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=02d044e291a55c5c8f2809e58cad5d1479ebea26

Author: Sebastian Dröge <sebastian.droege@...>
Date:   Sat Oct 31 16:49:03 2009 +0100

parser: Use GSlice for allocating the structs

---

 gst/parse/grammar.y |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index 60115ec..d26d87c 100644
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -64,7 +64,7 @@ link_t *__gst_parse_link_new ()
 {
   link_t *ret;
   __links++;
-  ret = g_new0 (link_t, 1);
+  ret = g_slice_new0 (link_t);
   /* g_print ("ALLOCATED LINK  (%3u): %p\n", __links, ret); */
   return ret;
 }
@@ -73,7 +73,7 @@ __gst_parse_link_free (link_t *data)
 {
   if (data) {
     /* g_print ("FREEING LINK    (%3u): %p\n", __links - 1, data); */
-    g_free (data);
+    g_slice_free (link_t, data);
     g_return_if_fail (__links > 0);
     __links--;
   }
@@ -83,7 +83,7 @@ __gst_parse_chain_new ()
 {
   chain_t *ret;
   __chains++;
-  ret = g_new0 (chain_t, 1);
+  ret = g_slice_new0 (chain_t);
   /* g_print ("ALLOCATED CHAIN (%3u): %p\n", __chains, ret); */
   return ret;
 }
@@ -91,7 +91,7 @@ void
 __gst_parse_chain_free (chain_t *data)
 {
   /* g_print ("FREEING CHAIN   (%3u): %p\n", __chains - 1, data); */
-  g_free (data);
+  g_slice_free (chain_t, data);
   g_return_if_fail (__chains > 0);
   __chains--;
 }
@@ -305,7 +305,7 @@ static void gst_parse_new_child(GstChildProxy *child_proxy, GObject *object,
     g_signal_handler_disconnect (child_proxy, set->signal_id);
     g_free(set->name);
     g_free(set->value_str);
-    g_free(set);
+    g_slice_free(DelayedSet, set);
     if (!got_value)
       goto error;
     g_object_set_property (G_OBJECT (target), pspec->name, &v);
@@ -381,7 +381,7 @@ gst_parse_element_set (gchar *value, GstElement *element, graph_t *graph)
   } else { 
     /* do a delayed set */
     if (GST_IS_CHILD_PROXY (element)) {
-      DelayedSet *data = g_new (DelayedSet, 1);
+      DelayedSet *data = g_slice_new0 (DelayedSet);
       
       data->parent = element;
       data->name = g_strdup(value);
@@ -428,7 +428,7 @@ gst_parse_free_delayed_link (DelayedLink *link)
   g_free (link->src_pad);
   g_free (link->sink_pad);
   if (link->caps) gst_caps_unref (link->caps);
-  g_free (link);
+  g_slice_free (DelayedLink, link);
 }
 
 static void
@@ -469,7 +469,7 @@ gst_parse_perform_delayed_link (GstElement *src, const gchar *src_pad,
     if ((GST_PAD_TEMPLATE_DIRECTION (templ) == GST_PAD_SRC) &&
         (GST_PAD_TEMPLATE_PRESENCE(templ) == GST_PAD_SOMETIMES))
     {
-      DelayedLink *data = g_new (DelayedLink, 1); 
+      DelayedLink *data = g_slice_new (DelayedLink); 
       
       /* TODO: maybe we should check if src_pad matches this template's names */
 

[gst-cvs] www: Add robots. txt to make search engines skip dir with old broken win32 packages

[<tpm@ke...>]

Module: www
Branch: master
Commit: 74d56f8cf6b95a44cc3c3d81e11af1a5cf3f6d74
URL:    http://cgit.freedesktop.org/gstreamer/www/commit/?id=74d56f8cf6b95a44cc3c3d81e11af1a5cf3f6d74

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Sat Oct 31 14:53:11 2009 +0000

Add robots.txt to make search engines skip dir with old broken win32 packages

We don't really want these to show up when people search for
'gstreamer windows'.

---

 src/copy/robots.txt    |    4 ++++
 src/htdocs/Makefile.am |    4 +++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/copy/robots.txt b/src/copy/robots.txt
new file mode 100644
index 0000000..b1c11ec
--- /dev/null
+++ b/src/copy/robots.txt
@@ -0,0 +1,4 @@
+# these win32 packages are old and broken and unsupported, we
+# don't want them to show up when people search for 'gstreamer windows'
+User-agent: *
+Disallow: /pkg/windows/
diff --git a/src/htdocs/Makefile.am b/src/htdocs/Makefile.am
index 83a8669..1acf2ee 100644
--- a/src/htdocs/Makefile.am
+++ b/src/htdocs/Makefile.am
@@ -22,7 +22,9 @@ media pkg src:
 data:
 	ln -sf ../data .
 
+robots.txt: $(top_srcdir)/copy/robots.txt
+	cp $(top_srcdir)/copy/robots.txt $@
 
-all-local: media pkg src data
+all-local: media pkg src data robots.txt
 
 include $(top_srcdir)/html.make

[gst-cvs] gst-plugins-base: po: queue2 has moved to core

[<bilboed@ke...>]

Module: gst-plugins-base
Branch: master
Commit: f9772089d03e664550489ee2c9d849a6ecc5301c
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=f9772089d03e664550489ee2c9d849a6ecc5301c

Author: Edward Hervey <bilboed@...>
Date:   Sat Oct 31 09:47:54 2009 +0100

po: queue2 has moved to core

---

 po/POTFILES.in |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e125590..d8aa8cc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,7 +10,6 @@ gst/playback/gstdecodebin2.c
 gst/playback/gstplaybasebin.c
 gst/playback/gstplaybin.c
 gst/playback/gstplaysink.c
-gst/playback/gstqueue2.c
 gst/playback/gsturidecodebin.c
 gst/tcp/gsttcp.c
 gst/tcp/gsttcpclientsink.c

[gst-cvs] gstreamer: po: queue2 has moved to core

[<bilboed@ke...>]

Module: gstreamer
Branch: master
Commit: a6cbe26164c61358dfc768a4e984be58c43ef9c4
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=a6cbe26164c61358dfc768a4e984be58c43ef9c4

Author: Edward Hervey <bilboed@...>
Date:   Sat Oct 31 09:48:19 2009 +0100

po: queue2 has moved to core

---

 po/POTFILES.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 81fdad6..72c9c75 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -18,6 +18,7 @@ plugins/elements/gstfilesink.c
 plugins/elements/gstfilesrc.c
 plugins/elements/gstidentity.c
 plugins/elements/gstqueue.c
+plugins/elements/gstqueue2.c
 plugins/elements/gsttypefindelement.c
 tools/gst-inspect.c
 tools/gst-launch.c