summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-01-23 14:03:16 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-01-23 14:03:16 +0000
commita24a294182c2ad77c6948842b396f11d3c7593cc (patch)
treeeb14b08caf3c489fd27e724269be394694c52935
parent3a4e300acfa0ca3eb1c9999cd30d436d11f0e199 (diff)
downloadgst-plugins-bad-a24a294182c2ad77c6948842b396f11d3c7593cc.tar.gz
gst-plugins-bad-a24a294182c2ad77c6948842b396f11d3c7593cc.tar.bz2
gst-plugins-bad-a24a294182c2ad77c6948842b396f11d3c7593cc.zip
gst-libs/gst/riff/riff-read.*: Remove stuff fromold metadata system.
Original commit message from CVS: 2004-01-23 Ronald Bultje <rbultje@ronald.bitfreak.net> * gst-libs/gst/riff/riff-read.c: (gst_riff_read_class_init), (gst_riff_read_init), (gst_riff_read_change_state): * gst-libs/gst/riff/riff-read.h: Remove stuff fromold metadata system.
-rw-r--r--ChangeLog7
-rw-r--r--gst-libs/gst/riff/riff-read.c31
-rw-r--r--gst-libs/gst/riff/riff-read.h3
3 files changed, 7 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index c2c446ca..a077bc6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-01-23 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ * gst-libs/gst/riff/riff-read.c: (gst_riff_read_class_init),
+ (gst_riff_read_init), (gst_riff_read_change_state):
+ * gst-libs/gst/riff/riff-read.h:
+ Remove stuff fromold metadata system.
+
+2004-01-23 Ronald Bultje <rbultje@ronald.bitfreak.net>
+
* ext/ogg/gstoggdemux.c:
Fix wrong file comment.
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index 96e79998..1ebeb28b 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -36,10 +36,6 @@ enum {
static void gst_riff_read_class_init (GstRiffReadClass *klass);
static void gst_riff_read_init (GstRiffRead *riff);
-static void gst_riff_read_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
static GstElementStateReturn
gst_riff_read_change_state (GstElement *element);
@@ -75,17 +71,10 @@ gst_riff_read_get_type (void)
static void
gst_riff_read_class_init (GstRiffReadClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
- g_object_class_install_property (gobject_class, ARG_METADATA,
- g_param_spec_boxed ("metadata", "Metadata", "Metadata",
- GST_TYPE_CAPS, G_PARAM_READABLE));
-
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
- gobject_class->get_property = gst_riff_read_get_property;
-
gstelement_class->change_state = gst_riff_read_change_state;
}
@@ -95,25 +84,6 @@ gst_riff_read_init (GstRiffRead *riff)
riff->sinkpad = NULL;
riff->bs = NULL;
riff->level = NULL;
- riff->metadata = NULL;
-}
-
-static void
-gst_riff_read_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- GstRiffRead *riff = GST_RIFF_READ (object);
-
- switch (prop_id) {
- case ARG_METADATA:
- g_value_set_boxed (value, riff->metadata);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
}
static GstElementStateReturn
@@ -128,7 +98,6 @@ gst_riff_read_change_state (GstElement *element)
riff->bs = gst_bytestream_new (riff->sinkpad);
break;
case GST_STATE_PAUSED_TO_READY:
- gst_caps_replace (&riff->metadata, NULL);
gst_bytestream_destroy (riff->bs);
while (riff->level) {
GstRiffLevel *level = riff->level->data;
diff --git a/gst-libs/gst/riff/riff-read.h b/gst-libs/gst/riff/riff-read.h
index a0f92e3e..9c663cca 100644
--- a/gst-libs/gst/riff/riff-read.h
+++ b/gst-libs/gst/riff/riff-read.h
@@ -53,9 +53,6 @@ typedef struct _GstRiffRead {
GstByteStream *bs;
GList *level;
-
- /* metadata */
- GstCaps *metadata;
} GstRiffRead;
typedef struct _GstRiffReadClass {