Commit e2b3dc3e authored by Johan Dahlin's avatar Johan Dahlin

*.h: Revert indentation changes.

Original commit message from CVS:
* *.h: Revert indentation changes.
parent 37363193
2004-03-15 Johan Dahlin <johan@gnome.org>
* *.h: Revert indent changes.
2004-03-14 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/registries/gstxmlregistry.c: (gst_xml_registry_load_plugin):
......
......@@ -11,4 +11,5 @@ typedef struct
char *location;
int channel_id;
} output_channel_t;
}
output_channel_t;
......@@ -9,4 +9,5 @@ typedef struct
char *location;
int channel_id;
} input_channel_t;
}
input_channel_t;
......@@ -53,7 +53,8 @@ typedef struct
GList *path;
GstElement *current;
gulong signal_id;
} GstSpiderConnection;
}
GstSpiderConnection;
#define GST_TYPE_SPIDER \
(gst_spider_get_type())
......
......@@ -31,7 +31,8 @@ G_BEGIN_DECLS typedef enum
AGGREGATOR_LOOP = 1,
AGGREGATOR_LOOP_SELECT,
AGGREGATOR_CHAIN
} GstAggregatorSchedType;
}
GstAggregatorSchedType;
#define GST_TYPE_AGGREGATOR \
(gst_aggregator_get_type())
......
......@@ -46,7 +46,8 @@ G_BEGIN_DECLS
FAKESINK_STATE_ERROR_PLAYING_PAUSED,
FAKESINK_STATE_ERROR_PAUSED_READY,
FAKESINK_STATE_ERROR_READY_NULL,
} GstFakeSinkStateError;
}
GstFakeSinkStateError;
typedef struct _GstFakeSink GstFakeSink;
typedef struct _GstFakeSinkClass GstFakeSinkClass;
......
......@@ -36,20 +36,23 @@ G_BEGIN_DECLS typedef enum
FAKESRC_PATTERN_LOOP,
FAKESRC_PING_PONG_PATTERN,
FAKESRC_GET_ALWAYS_SUCEEDS
} GstFakeSrcOutputType;
}
GstFakeSrcOutputType;
typedef enum
{
FAKESRC_DATA_ALLOCATE = 1,
FAKESRC_DATA_SUBBUFFER,
} GstFakeSrcDataType;
}
GstFakeSrcDataType;
typedef enum
{
FAKESRC_SIZETYPE_NULL = 1,
FAKESRC_SIZETYPE_FIXED,
FAKESRC_SIZETYPE_RANDOM
} GstFakeSrcSizeType;
}
GstFakeSrcSizeType;
typedef enum
{
......@@ -58,7 +61,8 @@ typedef enum
FAKESRC_FILLTYPE_RANDOM,
FAKESRC_FILLTYPE_PATTERN,
FAKESRC_FILLTYPE_PATTERN_CONT
} GstFakeSrcFillType;
}
GstFakeSrcFillType;
#define GST_TYPE_FAKESRC \
(gst_fakesrc_get_type())
......
......@@ -45,7 +45,8 @@ typedef enum
GST_FILESINK_OPEN = GST_ELEMENT_FLAG_LAST,
GST_FILESINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2
} GstFileSinkFlags;
}
GstFileSinkFlags;
struct _GstFileSink
{
......
......@@ -44,7 +44,8 @@ G_BEGIN_DECLS
GST_FILESRC_OPEN = GST_ELEMENT_FLAG_LAST,
GST_FILESRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2
} GstFileSrcFlags;
}
GstFileSrcFlags;
typedef struct _GstFileSrc GstFileSrc;
typedef struct _GstFileSrcClass GstFileSrcClass;
......
......@@ -42,7 +42,8 @@ G_BEGIN_DECLS
GST_MULTIFILESRC_OPEN = GST_ELEMENT_FLAG_LAST,
GST_MULTIFILESRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2
} GstMultiFileSrcFlags;
}
GstMultiFileSrcFlags;
typedef struct _GstMultiFileSrc GstMultiFileSrc;
typedef struct _GstMultiFileSrcClass GstMultiFileSrcClass;
......
......@@ -43,7 +43,8 @@ G_BEGIN_DECLS
GST_PIPEFILTER_OPEN = GST_ELEMENT_FLAG_LAST,
GST_PIPEFILTER_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2
} GstPipeFilterFlags;
}
GstPipeFilterFlags;
typedef struct _GstPipefilter GstPipefilter;
typedef struct _GstPipefilterClass GstPipefilterClass;
......
......@@ -42,7 +42,8 @@ G_BEGIN_DECLS
{
SHAPER_POLICY_TIMESTAMPS = 1,
SHAPER_POLICY_BUFFERSIZE
} GstShaperPolicyType;
}
GstShaperPolicyType;
typedef struct _GstShaper GstShaper;
typedef struct _GstShaperClass GstShaperClass;
......
......@@ -410,7 +410,8 @@ gst_atomic_int_dec_and_test (GstAtomicInt * aint)
typedef struct
{
volatile int counter;
} atomic_t __attribute__ ((aligned (4)));
}
atomic_t __attribute__ ((aligned (4)));
GST_INLINE_FUNC void
gst_atomic_int_init (GstAtomicInt * aint, gint val)
......
......@@ -52,7 +52,8 @@ typedef enum
/* padding */
GST_BIN_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 5
} GstBinFlags;
}
GstBinFlags;
/*typedef struct _GstBin GstBin; */
/*typedef struct _GstBinClass GstBinClass; */
......
......@@ -81,7 +81,8 @@ typedef enum
GST_BUFFER_KEY_UNIT,
GST_BUFFER_DONTKEEP,
GST_BUFFER_FLAG_LAST = GST_DATA_FLAG_LAST + 8
} GstBufferFlag;
}
GstBufferFlag;
struct _GstBuffer
{
......
......@@ -69,14 +69,16 @@ typedef enum
GST_CLOCK_ENTRY_OK,
GST_CLOCK_ENTRY_EARLY,
GST_CLOCK_ENTRY_RESTART
} GstClockEntryStatus;
}
GstClockEntryStatus;
typedef enum
{
/* --- protected --- */
GST_CLOCK_ENTRY_SINGLE,
GST_CLOCK_ENTRY_PERIODIC
} GstClockEntryType;
}
GstClockEntryType;
#define GST_CLOCK_ENTRY(entry) ((GstClockEntry *)(entry))
#define GST_CLOCK_ENTRY_CLOCK(entry) ((entry)->clock)
......@@ -104,7 +106,8 @@ typedef enum
GST_CLOCK_EARLY = 2,
GST_CLOCK_ERROR = 3,
GST_CLOCK_UNSUPPORTED = 4
} GstClockReturn;
}
GstClockReturn;
typedef enum
{
......@@ -114,7 +117,8 @@ typedef enum
GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC = (1 << 4),
GST_CLOCK_FLAG_CAN_SET_RESOLUTION = (1 << 5),
GST_CLOCK_FLAG_CAN_SET_SPEED = (1 << 6)
} GstClockFlags;
}
GstClockFlags;
#define GST_CLOCK_FLAGS(clock) (GST_CLOCK(clock)->flags)
......
......@@ -30,7 +30,8 @@ G_BEGIN_DECLS typedef enum
GST_CPU_FLAG_SSE = (1 << 1),
GST_CPU_FLAG_MMXEXT = (1 << 2),
GST_CPU_FLAG_3DNOW = (1 << 3)
} GstCPUFlags;
}
GstCPUFlags;
void _gst_cpu_initialize (gboolean useopt);
......
......@@ -51,7 +51,8 @@ typedef enum
/* insert more */
GST_DATA_FLAG_LAST = 8
} GstDataFlags;
}
GstDataFlags;
/* refcount */
#define GST_DATA_REFCOUNT(data) ((GST_DATA(data))->refcount)
......
......@@ -129,7 +129,8 @@ typedef enum
/* use some padding for future expansion */
GST_ELEMENT_FLAG_LAST = GST_OBJECT_FLAG_LAST + 16
} GstElementFlags;
}
GstElementFlags;
#define GST_ELEMENT_IS_THREAD_SUGGESTED(obj) (GST_FLAG_IS_SET(obj,GST_ELEMENT_THREAD_SUGGESTED))
#define GST_ELEMENT_IS_EVENT_AWARE(obj) (GST_FLAG_IS_SET(obj,GST_ELEMENT_EVENT_AWARE))
......
......@@ -51,7 +51,8 @@ typedef enum
GST_EVENT_INTERRUPT = 14,
GST_EVENT_NAVIGATION = 15,
GST_EVENT_TAG = 16
} GstEventType;
}
GstEventType;
#define GST_EVENT_TRACE_NAME "GstEvent"
......@@ -78,13 +79,15 @@ typedef enum
/* indicates negative rates are supported */
GST_RATE_FLAG_NEGATIVE = (1 << 1)
} GstEventFlag;
}
GstEventFlag;
typedef struct
{
GstEventType type;
GstEventFlag flags;
} GstEventMask;
}
GstEventMask;
#ifndef GST_DISABLE_DEPRECATED
#ifdef G_HAVE_ISO_VARARGS
......@@ -128,19 +131,22 @@ typedef enum
GST_SEEK_FLAG_KEY_UNIT = (1 << (GST_SEEK_FLAGS_SHIFT + 2)),
GST_SEEK_FLAG_SEGMENT_LOOP = (1 << (GST_SEEK_FLAGS_SHIFT + 3))
} GstSeekType;
}
GstSeekType;
typedef enum
{
GST_SEEK_CERTAIN,
GST_SEEK_FUZZY
} GstSeekAccuracy;
}
GstSeekAccuracy;
typedef struct
{
GstFormat format;
gint64 value;
} GstFormatValue;
}
GstFormatValue;
#define GST_EVENT_SEEK_TYPE(event) (GST_EVENT(event)->event_data.seek.type)
#define GST_EVENT_SEEK_FORMAT(event) (GST_EVENT_SEEK_TYPE(event) & GST_SEEK_FORMAT_MASK)
......@@ -175,27 +181,33 @@ struct _GstEvent
gint64 offset;
gint64 endoffset;
GstSeekAccuracy accuracy;
} seek;
}
seek;
struct
{
GstFormatValue offsets[8];
gint noffsets;
gboolean new_media;
} discont;
}
discont;
struct
{
GstFormat format;
gint64 value;
} size;
}
size;
struct
{
gdouble value;
} rate;
}
rate;
struct
{
GstStructure *structure;
} structure;
} event_data;
}
structure;
}
event_data;
gpointer _gst_reserved[GST_PADDING];
};
......
......@@ -35,7 +35,8 @@ G_BEGIN_DECLS typedef enum
GST_FORMAT_TIME = 3,
GST_FORMAT_BUFFERS = 4,
GST_FORMAT_PERCENT = 5
} GstFormat;
}
GstFormat;
/* a percentage is always relative to 1000000 */
#define GST_FORMAT_PERCENT_MAX G_GINT64_CONSTANT (1000000)
......
......@@ -46,7 +46,8 @@ typedef enum
GST_INDEX_UNKNOWN,
GST_INDEX_CERTAIN,
GST_INDEX_FUZZY
} GstIndexCertainty;
}
GstIndexCertainty;
typedef enum
{
......@@ -54,14 +55,16 @@ typedef enum
GST_INDEX_ENTRY_ASSOCIATION,
GST_INDEX_ENTRY_OBJECT,
GST_INDEX_ENTRY_FORMAT
} GstIndexEntryType;
}
GstIndexEntryType;
typedef enum
{
GST_INDEX_LOOKUP_EXACT,
GST_INDEX_LOOKUP_BEFORE,
GST_INDEX_LOOKUP_AFTER
} GstIndexLookupMethod;
}
GstIndexLookupMethod;
#define GST_INDEX_NASSOCS(entry) ((entry)->data.assoc.nassocs)
#define GST_INDEX_ASSOC_FLAGS(entry) ((entry)->data.assoc.flags)
......@@ -83,7 +86,8 @@ typedef enum
/* new flags should start here */
GST_ASSOCIATION_FLAG_LAST = (1 << 8)
} GstAssocFlags;
}
GstAssocFlags;
#define GST_INDEX_FORMAT_FORMAT(entry) ((entry)->data.format.format)
#define GST_INDEX_FORMAT_KEY(entry) ((entry)->data.format.key)
......@@ -102,25 +106,30 @@ struct _GstIndexEntry
struct
{
gchar *description;
} id;
}
id;
struct
{
gint nassocs;
GstIndexAssociation * assocs;
GstAssocFlags flags;
} assoc;
}
assoc;
struct
{
gchar *key;
GType type;
gpointer object;
} object;
}
object;
struct
{
GstFormat format;
gchar *key;
} format;
} data;
}
format;
}
data;
};
struct _GstIndexGroup
......@@ -145,7 +154,8 @@ typedef enum
GST_INDEX_RESOLVER_CUSTOM,
GST_INDEX_RESOLVER_GTYPE,
GST_INDEX_RESOLVER_PATH
} GstIndexResolverMethod;
}
GstIndexResolverMethod;
typedef gboolean (*GstIndexResolver) (GstIndex * index,
GstObject * writer, gchar ** writer_string, gpointer user_data);
......@@ -155,7 +165,8 @@ typedef enum
GST_INDEX_READABLE,
GST_INDEX_FLAG_LAST = GST_OBJECT_FLAG_LAST + 8
} GstIndexFlags;
}
GstIndexFlags;
#define GST_INDEX_IS_READABLE(obj) (GST_FLAG_IS_SET (obj, GST_INDEX_READABLE))
#define GST_INDEX_IS_WRITABLE(obj) (GST_FLAG_IS_SET (obj, GST_INDEX_WRITABLE))
......
......@@ -48,7 +48,8 @@ G_BEGIN_DECLS
GST_LEVEL_LOG,
/* add more */
GST_LEVEL_COUNT
} GstDebugLevel;
}
GstDebugLevel;
/* we can now override this to be more general in maintainer builds or cvs checkouts */
#ifndef GST_LEVEL_DEFAULT
......@@ -86,7 +87,8 @@ typedef enum
/* other formats */
GST_DEBUG_BOLD = 0x0100,
GST_DEBUG_UNDERLINE = 0x0200
} GstDebugColorFlags;
}
GstDebugColorFlags;
#define GST_DEBUG_FG_MASK (0x000F)
#define GST_DEBUG_BG_MASK (0x00F0)
......
......@@ -55,7 +55,8 @@ typedef struct _GstImplementsInterfaceClass
gboolean (*supported) (GstImplementsInterface * iface, GType iface_type);
gpointer _gst_reserved[GST_PADDING];
} GstImplementsInterfaceClass;
}
GstImplementsInterfaceClass;
#define GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_CAST(obj, type, cast_t) \
((cast_t *) gst_implements_interface_cast ((obj), (type)))
......
......@@ -51,7 +51,8 @@ typedef enum
GST_FLOATING,
GST_OBJECT_FLAG_LAST = 4
} GstObjectFlags;
}
GstObjectFlags;
struct _GstObject
{
......
......@@ -88,7 +88,8 @@ typedef enum
GST_PAD_LINK_DELAYED = 0,
GST_PAD_LINK_OK = 1,
GST_PAD_LINK_DONE = 2
} GstPadLinkReturn;
}
GstPadLinkReturn;
#define GST_PAD_LINK_FAILED(ret) (ret < GST_PAD_LINK_OK)
#define GST_PAD_LINK_SUCCESSFUL(ret) (ret >= GST_PAD_LINK_OK)
......@@ -138,7 +139,8 @@ typedef enum
GST_PAD_UNKNOWN,
GST_PAD_SRC,
GST_PAD_SINK
} GstPadDirection;
}
GstPadDirection;
typedef enum
{
......@@ -146,7 +148,8 @@ typedef enum
GST_PAD_NEGOTIATING,
GST_PAD_FLAG_LAST = GST_OBJECT_FLAG_LAST + 4
} GstPadFlags;
}
GstPadFlags;
struct _GstPad
{
......@@ -308,7 +311,8 @@ typedef enum
GST_PAD_ALWAYS,
GST_PAD_SOMETIMES,
GST_PAD_REQUEST
} GstPadPresence;
}
GstPadPresence;
#define GST_PAD_TEMPLATE_NAME_TEMPLATE(templ) (((GstPadTemplate *)(templ))->name_template)
#define GST_PAD_TEMPLATE_DIRECTION(templ) (((GstPadTemplate *)(templ))->direction)
......@@ -320,7 +324,8 @@ typedef enum
GST_PAD_TEMPLATE_FIXED = GST_OBJECT_FLAG_LAST,
GST_PAD_TEMPLATE_FLAG_LAST = GST_OBJECT_FLAG_LAST + 4
} GstPadTemplateFlags;
}
GstPadTemplateFlags;
#define GST_PAD_TEMPLATE_IS_FIXED(templ) (GST_FLAG_IS_SET(templ, GST_PAD_TEMPLATE_FIXED))
......
......@@ -40,7 +40,8 @@ typedef enum
GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY,
GST_PARSE_ERROR_EMPTY_BIN,
GST_PARSE_ERROR_EMPTY
} GstParseError;
}
GstParseError;
GstElement *gst_parse_launch (const gchar * pipeline_description,
......
......@@ -39,7 +39,8 @@ typedef enum
GST_PLUGIN_ERROR_MODULE,
GST_PLUGIN_ERROR_DEPENDENCIES,
GST_PLUGIN_ERROR_NAME_MISMATCH
} GstPluginError;
}
GstPluginError;
#define GST_PLUGIN(plugin) ((GstPlugin *) (plugin))
......
......@@ -64,7 +64,8 @@ typedef struct
{
const gchar *name;
GType type;
} GstTypeNameData;
}
GstTypeNameData;
/* filter */
typedef gboolean (*GstPluginFeatureFilter) (GstPluginFeature * feature,
......
......@@ -36,7 +36,8 @@ G_BEGIN_DECLS typedef enum
GST_QUERY_START,
GST_QUERY_SEGMENT_END,
GST_QUERY_RATE
} GstQueryType;
}
GstQueryType;
/* rate is relative to 1000000 */
#define GST_QUERY_TYPE_RATE_DEN G_GINT64_CONSTANT (1000000)
......
......@@ -64,7 +64,8 @@ struct _GstQueue
guint buffers; /* no. of buffers */
guint bytes; /* no. of bytes */
guint64 time; /* amount of time */
} cur_level, /* currently in the queue */
}
cur_level, /* currently in the queue */
max_size, /* max. amount of data allowed in the queue */
min_threshold; /* min. amount of data required to wake reader */
......
......@@ -50,7 +50,8 @@ G_BEGIN_DECLS typedef enum
GST_REGISTRY_SAVE_ERROR = (1 << 2),
GST_REGISTRY_PLUGIN_LOAD_ERROR = (1 << 3),
GST_REGISTRY_PLUGIN_SIGNATURE_ERROR = (1 << 4)
} GstRegistryReturn;
}
GstRegistryReturn;
typedef enum
{
......@@ -59,7 +60,8 @@ typedef enum
GST_REGISTRY_EXISTS = (1 << 3),
GST_REGISTRY_REMOTE = (1 << 4),
GST_REGISTRY_DELAYED_LOADING = (1 << 5)
} GstRegistryFlags;
}
GstRegistryFlags;
#define GST_TYPE_REGISTRY (gst_registry_get_type ())
......
......@@ -42,7 +42,8 @@ G_BEGIN_DECLS
/* padding */
GST_SCHEDULER_FLAG_LAST = GST_OBJECT_FLAG_LAST + 4
} GstSchedulerFlags;
}
GstSchedulerFlags;
#define GST_SCHEDULER_PARENT(sched) ((sched)->parent)
#define GST_SCHEDULER_STATE(sched) ((sched)->state)
......@@ -55,7 +56,8 @@ typedef enum
GST_SCHEDULER_STATE_RUNNING,
GST_SCHEDULER_STATE_STOPPED,
GST_SCHEDULER_STATE_ERROR
} GstSchedulerState;
}
GstSchedulerState;
struct _GstScheduler
{
......
......@@ -37,7 +37,8 @@ G_BEGIN_DECLS typedef enum