From 39fd8a2dbd436cbabe5e336d1145b62c2a885ed5 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Mon, 15 Mar 2004 16:32:54 +0000 Subject: *.h: Revert indenting Original commit message from CVS: * *.h: Revert indenting --- gst-libs/gst/media-info/media-info-priv.h | 108 ++++++++++++++++-------------- gst-libs/gst/media-info/media-info.h | 61 ++++++++++------- 2 files changed, 92 insertions(+), 77 deletions(-) (limited to 'gst-libs/gst/media-info') diff --git a/gst-libs/gst/media-info/media-info-priv.h b/gst-libs/gst/media-info/media-info-priv.h index 8f0f453f..81ee24ab 100644 --- a/gst-libs/gst/media-info/media-info-priv.h +++ b/gst-libs/gst/media-info/media-info-priv.h @@ -72,65 +72,69 @@ struct GstMediaInfoPriv gint metadata_iters; GstTagList *streaminfo; - GstElement *pipeline; /* will be != NULL during collection */ - gchar *pipeline_desc; /* will be != NULL during collection */ - GstElement *fakesink; /* so we can get caps from the - decoder sink pad */ - gchar *source_name; /* type of element used as source */ + GstElement *pipeline; /* will be != NULL during collection */ + gchar *pipeline_desc; /* will be != NULL during collection */ + GstElement *fakesink; /* so we can get caps from the + decoder sink pad */ + gchar *source_name; /* type of element used as source */ GstElement *source; - GstPad *source_pad; /* pad for querying encoded caps */ + GstPad *source_pad; /* pad for querying encoded caps */ GstElement *decoder; - GstPad *decoder_pad; /* pad for querying decoded caps */ - GstElement *decontainer; /* element to typefind in containers */ + GstPad *decoder_pad; /* pad for querying decoded caps */ + GstElement *decontainer; /* element to typefind in containers */ - GstMediaInfoState state; /* current state of state machine */ - gchar *location; /* location set on the info object */ - guint16 flags; /* flags supplied for detection */ - GstMediaInfoTrack *current_track; /* track pointer under inspection */ - glong current_track_num; /* current track under inspection */ + GstMediaInfoState state; /* current state of state machine */ + gchar *location; /* location set on the info object */ + guint16 flags; /* flags supplied for detection */ + GstMediaInfoTrack *current_track; /* track pointer under inspection */ + glong current_track_num; /* current track under inspection */ - GstMediaInfoStream *stream; /* total stream properties */ - char *cache; /* location of cache */ + GstMediaInfoStream *stream; /* total stream properties */ + char *cache; /* location of cache */ - GError *error; /* error for creation problems */ + GError *error; /* error for creation problems */ }; /* declarations */ -GstMediaInfoStream *gmi_stream_new (void); -void gmi_stream_free (GstMediaInfoStream * stream); - -GstMediaInfoTrack *gmi_track_new (void); - -void gmip_reset (GstMediaInfoPriv * priv); -gboolean gmip_init (GstMediaInfoPriv * priv, GError ** error); - -void gmi_clear_decoder (GstMediaInfo * info); - -gboolean gmi_seek_to_track (GstMediaInfo * info, long track); - -gboolean gmi_set_mime (GstMediaInfo * info, const char *mime); - -void deep_notify_callback (GObject * object, - GstObject * origin, GParamSpec * pspec, GstMediaInfoPriv * priv); -void found_tag_callback (GObject * pipeline, GstElement * source, - GstTagList * tags, GstMediaInfoPriv * priv); -void error_callback (GObject * element, GstElement * source, GError * error, - gchar * debug, GstMediaInfoPriv * priv); - -gboolean gmip_find_type_pre (GstMediaInfoPriv * priv, GError ** error); -gboolean gmip_find_type_post (GstMediaInfoPriv * priv); -gboolean gmip_find_type (GstMediaInfoPriv * priv, GError ** error); -gboolean gmip_find_stream_pre (GstMediaInfoPriv * priv); -gboolean gmip_find_stream_post (GstMediaInfoPriv * priv); -gboolean gmip_find_stream (GstMediaInfoPriv * priv); -gboolean gmip_find_track_metadata_pre (GstMediaInfoPriv * priv); -gboolean gmip_find_track_metadata_post (GstMediaInfoPriv * priv); -gboolean gmip_find_track_metadata (GstMediaInfoPriv * priv); -gboolean gmip_find_track_streaminfo_pre (GstMediaInfoPriv * priv); -gboolean gmip_find_track_streaminfo_post (GstMediaInfoPriv * priv); -gboolean gmip_find_track_streaminfo (GstMediaInfoPriv * priv); -gboolean gmip_find_track_format_pre (GstMediaInfoPriv * priv); -gboolean gmip_find_track_format_post (GstMediaInfoPriv * priv); -gboolean gmip_find_track_format (GstMediaInfoPriv * priv); +GstMediaInfoStream * + gmi_stream_new (void); +void gmi_stream_free (GstMediaInfoStream *stream); + +GstMediaInfoTrack * + gmi_track_new (void); + +void gmip_reset (GstMediaInfoPriv *priv); +gboolean gmip_init (GstMediaInfoPriv *priv, GError **error); + +void gmi_clear_decoder (GstMediaInfo *info); + +gboolean gmi_seek_to_track (GstMediaInfo *info, + long track); + +gboolean gmi_set_mime (GstMediaInfo *info, + const char *mime); + +void deep_notify_callback (GObject *object, + GstObject *origin, + GParamSpec *pspec, + GstMediaInfoPriv *priv); +void found_tag_callback (GObject *pipeline, GstElement *source, GstTagList *tags, GstMediaInfoPriv *priv); +void error_callback (GObject *element, GstElement *source, GError *error, gchar *debug, GstMediaInfoPriv *priv); + +gboolean gmip_find_type_pre (GstMediaInfoPriv *priv, GError **error); +gboolean gmip_find_type_post (GstMediaInfoPriv *priv); +gboolean gmip_find_type (GstMediaInfoPriv *priv, GError **error); +gboolean gmip_find_stream_pre (GstMediaInfoPriv *priv); +gboolean gmip_find_stream_post (GstMediaInfoPriv *priv); +gboolean gmip_find_stream (GstMediaInfoPriv *priv); +gboolean gmip_find_track_metadata_pre (GstMediaInfoPriv *priv); +gboolean gmip_find_track_metadata_post (GstMediaInfoPriv *priv); +gboolean gmip_find_track_metadata (GstMediaInfoPriv *priv); +gboolean gmip_find_track_streaminfo_pre (GstMediaInfoPriv *priv); +gboolean gmip_find_track_streaminfo_post (GstMediaInfoPriv *priv); +gboolean gmip_find_track_streaminfo (GstMediaInfoPriv *priv); +gboolean gmip_find_track_format_pre (GstMediaInfoPriv *priv); +gboolean gmip_find_track_format_post (GstMediaInfoPriv *priv); +gboolean gmip_find_track_format (GstMediaInfoPriv *priv); #endif /* __GST_MEDIA_INFO_PRIV_H__ */ diff --git a/gst-libs/gst/media-info/media-info.h b/gst-libs/gst/media-info/media-info.h index bbbcce2b..c134999d 100644 --- a/gst-libs/gst/media-info/media-info.h +++ b/gst-libs/gst/media-info/media-info.h @@ -23,9 +23,11 @@ #include -G_BEGIN_DECLS typedef struct GstMediaInfoPriv GstMediaInfoPriv; -typedef struct _GstMediaInfo GstMediaInfo; -typedef struct _GstMediaInfoClass GstMediaInfoClass; +G_BEGIN_DECLS + +typedef struct GstMediaInfoPriv GstMediaInfoPriv; +typedef struct _GstMediaInfo GstMediaInfo; +typedef struct _GstMediaInfoClass GstMediaInfoClass; struct _GstMediaInfo { @@ -41,9 +43,8 @@ struct _GstMediaInfoClass GObjectClass parent_class; /* signals */ - void (*media_info_signal) (GstMediaInfo * gst_media_info); - void (*error_signal) (GstMediaInfo * gst_media_info, GError * error, - const gchar * debug); + void (*media_info_signal) (GstMediaInfo *gst_media_info); + void (*error_signal) (GstMediaInfo *gst_media_info, GError *error, const gchar *debug); gpointer _gst_reserved[GST_PADDING]; }; @@ -99,25 +100,34 @@ typedef struct #define GST_MEDIA_INFO_FORMAT 1 << 5 #define GST_MEDIA_INFO_ALL ((1 << 6) - 1) -GQuark gst_media_info_error_quark (void); - -void gst_media_info_init (void); -GType gst_media_info_get_type (void); - -GstMediaInfo *gst_media_info_new (GError ** error); - -gboolean gst_media_info_set_source (GstMediaInfo * info, - const char *source, GError ** error); -void gst_media_info_read_with_idler (GstMediaInfo * media_info, - const char *location, guint16 GST_MEDIA_INFO_FLAGS, GError ** error); -gboolean gst_media_info_read_idler (GstMediaInfo * media_info, - GstMediaInfoStream ** streamp, GError ** error); -GstMediaInfoStream *gst_media_info_read (GstMediaInfo * media_info, - const char *location, guint16 GST_MEDIA_INFO_FLAGS, GError ** error); -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); - +GQuark gst_media_info_error_quark (void); + +void gst_media_info_init (void); +GType gst_media_info_get_type (void); + +GstMediaInfo * gst_media_info_new (GError **error); + +gboolean gst_media_info_set_source (GstMediaInfo *info, + const char *source, + GError **error); +void gst_media_info_read_with_idler (GstMediaInfo *media_info, + const char *location, + guint16 GST_MEDIA_INFO_FLAGS, + GError **error); +gboolean gst_media_info_read_idler (GstMediaInfo *media_info, + GstMediaInfoStream **streamp, + GError **error); +GstMediaInfoStream * + gst_media_info_read (GstMediaInfo *media_info, + const char *location, + guint16 GST_MEDIA_INFO_FLAGS, + GError **error); +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, @@ -126,4 +136,5 @@ gboolean gst_media_info_write (GstMediaInfo *media_info, */ G_END_DECLS + #endif /* __GST_MEDIA_INFO_H__ */ -- cgit v1.2.1