summaryrefslogtreecommitdiffstats
path: root/gst/id3demux/gstid3demux.h
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-10-06 16:13:14 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-10-06 16:13:14 +0000
commit3e413d6b6efbefaf432da283a4f438d239af6857 (patch)
treeed1e2dd807184894bd37ced2f8b5c93c908b1954 /gst/id3demux/gstid3demux.h
parent7480461b726043f904c4ea46c3323e75147c1972 (diff)
gst/id3demux/: Port ID3 tag demuxer over to the new GstTagDemux in -base (now would be a good time to test re-importi...
Original commit message from CVS: * gst/id3demux/gstid3demux.c: * gst/id3demux/gstid3demux.h: * gst/id3demux/id3tags.c: * gst/id3demux/id3tags.h: * gst/id3demux/id3v2frames.c: Port ID3 tag demuxer over to the new GstTagDemux in -base (now would be a good time to test re-importing your music collection).
Diffstat (limited to 'gst/id3demux/gstid3demux.h')
-rw-r--r--gst/id3demux/gstid3demux.h38
1 files changed, 7 insertions, 31 deletions
diff --git a/gst/id3demux/gstid3demux.h b/gst/id3demux/gstid3demux.h
index 7f9e18fd..a875502b 100644
--- a/gst/id3demux/gstid3demux.h
+++ b/gst/id3demux/gstid3demux.h
@@ -1,4 +1,5 @@
-/* Copyright 2005 Jan Schmidt <thaytan@mad.scientist.com>
+/* GStreamer ID3 tag demuxer
+ * Copyright (C) 2005 Jan Schmidt <thaytan@mad.scientist.com>
* Copyright (C) 2003-2004 Benjamin Otte <otte@gnome.org>
*
* This library is free software; you can redistribute it and/or
@@ -20,7 +21,7 @@
#ifndef __GST_ID3DEMUX_H__
#define __GST_ID3DEMUX_H__
-#include <gst/gst.h>
+#include <gst/tag/gsttagdemux.h>
G_BEGIN_DECLS
@@ -38,42 +39,16 @@ G_BEGIN_DECLS
typedef struct _GstID3Demux GstID3Demux;
typedef struct _GstID3DemuxClass GstID3DemuxClass;
-typedef enum {
- GST_ID3DEMUX_READID3V2,
- GST_ID3DEMUX_TYPEFINDING,
- GST_ID3DEMUX_STREAMING
-} GstID3DemuxState;
-
struct _GstID3Demux
{
- GstElement element;
-
- GstPad *sinkpad, *srcpad;
-
- /* Number of bytes to remove from the start of file (ID3v2) */
- guint strip_start;
- /* Number of bytes to remove from the end of file (ID3v1) */
- guint strip_end;
-
- gint64 upstream_size;
+ GstTagDemux tagdemux;
- GstID3DemuxState state;
- GstBuffer *collect;
- GstCaps *src_caps;
-
- gboolean prefer_v1;
- GstTagList *event_tags;
- GstTagList *parsed_tags;
- gboolean send_tag_event;
-
- GstSegment segment;
- gboolean need_newseg;
- gboolean newseg_update;
+ gboolean prefer_v1; /* prefer ID3v1 tags over ID3v2 tags? */
};
struct _GstID3DemuxClass
{
- GstElementClass parent_class;
+ GstTagDemuxClass parent_class;
};
GType gst_id3demux_get_type (void);
@@ -81,3 +56,4 @@ GType gst_id3demux_get_type (void);
G_END_DECLS
#endif /* __GST_ID3DEMUX_H__ */
+