summaryrefslogtreecommitdiffstats
path: root/gst-libs/gst/media-info/media-info.h
diff options
context:
space:
mode:
authorIain Holmes <iain@prettypeople.org>2003-09-23 22:49:35 +0000
committerIain Holmes <iain@prettypeople.org>2003-09-23 22:49:35 +0000
commit3e701ebef03b2a6bf8484f8b1e8b84f1a0d2452b (patch)
tree47a98999b99807d5cf1fd398936f1770a6eba445 /gst-libs/gst/media-info/media-info.h
parent50633ff1dc006d7916249fb329fa9ca9634de3c6 (diff)
downloadgst-plugins-bad-3e701ebef03b2a6bf8484f8b1e8b84f1a0d2452b.tar.gz
gst-plugins-bad-3e701ebef03b2a6bf8484f8b1e8b84f1a0d2452b.tar.bz2
gst-plugins-bad-3e701ebef03b2a6bf8484f8b1e8b84f1a0d2452b.zip
Sync'ed files up to nautilus-media/media-info versions, and fixed them for errors and deprecated functions
Original commit message from CVS: Sync'ed files up to nautilus-media/media-info versions, and fixed them for errors and deprecated functions
Diffstat (limited to 'gst-libs/gst/media-info/media-info.h')
-rw-r--r--gst-libs/gst/media-info/media-info.h40
1 files changed, 23 insertions, 17 deletions
diff --git a/gst-libs/gst/media-info/media-info.h b/gst-libs/gst/media-info/media-info.h
index 9cfe5401..942fbf63 100644
--- a/gst-libs/gst/media-info/media-info.h
+++ b/gst-libs/gst/media-info/media-info.h
@@ -37,7 +37,7 @@ typedef struct
GObjectClass parent_class;
/* signals */
- void (*media_info_signal) (GstMediaInfo *gst_media_info);
+ void (*media_info_signal) (GstMediaInfo *gst_media_info);
} GstMediaInfoClass;
@@ -57,7 +57,7 @@ typedef struct
GList *tracks;
} GstMediaInfoStream;
-/* structure for "logical" stream or track,
+/* structure for "logical" stream or track,
* or one of a set of sequentially muxed streams */
typedef struct
{
@@ -76,7 +76,7 @@ typedef struct
GstCaps *caps; /* properties of the muxed concurrent stream */
} GstMediaInfoConcurrent;
-#define GST_MEDIA_INFO_ERROR gst_media_info_error_quark ()
+#define GST_MEDIA_INFO_ERROR gst_media_info_error_quark ()
#define GST_MEDIA_INFO_TYPE (gst_media_info_get_type ())
#define GST_MEDIA_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_MEDIA_INFO_TYPE, GstMediaInfo))
@@ -92,24 +92,30 @@ typedef struct
#define GST_MEDIA_INFO_FORMAT 1 << 5
#define GST_MEDIA_INFO_ALL ((1 << 6) - 1)
-GType gst_media_info_get_type (void);
-
-GstMediaInfo * gst_media_info_new (const char *source_element);
-GstMediaInfoStream *
- gst_media_info_read (GstMediaInfo *media_info,
- const char *location,
- guint16 GST_MEDIA_INFO_FLAGS);
-gboolean gst_media_info_read_many (GstMediaInfo *media_info,
- GList *locations,
- guint16 GST_MEDIA_INFO_FLAGS,
- GError **error);
-GstCaps * gst_media_info_get_next (GstMediaInfo *media_info,
- GError **error);
+GType gst_media_info_get_type (void);
+
+GstMediaInfo * gst_media_info_new (const char *source_element);
+
+void gst_media_info_read_with_idler (GstMediaInfo *media_info,
+ const char *location,
+ guint16 GST_MEDIA_INFO_FLAGS);
+gboolean gst_media_info_read_idler (GstMediaInfo *media_info,
+ GstMediaInfoStream **streamp);
+GstMediaInfoStream *
+ gst_media_info_read (GstMediaInfo *media_info,
+ const char *location,
+ guint16 GST_MEDIA_INFO_FLAGS);
+gboolean gst_media_info_read_many (GstMediaInfo *media_info,
+ GList *locations,
+ guint16 GST_MEDIA_INFO_FLAGS,
+ GError **error);
+GstCaps * gst_media_info_get_next (GstMediaInfo *media_info,
+ GError **error);
/*
* FIXME: reset ?
gboolean gst_media_info_write (GstMediaInfo *media_info,
const char *location,
GstCaps *media_info);
*/
-
+
#endif /* __GST_MEDIA_INFO_H__ */