summaryrefslogtreecommitdiffstats
path: root/gst/flx
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2004-03-15 16:32:54 +0000
committerJohan Dahlin <johan@gnome.org>2004-03-15 16:32:54 +0000
commit5acffea623eaa95469a8fb77260c85240c6c0a41 (patch)
tree5d1eb5b3c6cbe7ff7888cfe0b2f972f7e509e99d /gst/flx
parentf878cc16402dcc70f31861bb120f435f3157c518 (diff)
*.h: Revert indenting
Original commit message from CVS: * *.h: Revert indenting
Diffstat (limited to 'gst/flx')
-rw-r--r--gst/flx/flx_color.h28
-rw-r--r--gst/flx/flx_fmt.h197
-rw-r--r--gst/flx/gstflxdec.h60
3 files changed, 139 insertions, 146 deletions
diff --git a/gst/flx/flx_color.h b/gst/flx/flx_color.h
index 2ad852fa..d423ab87 100644
--- a/gst/flx/flx_color.h
+++ b/gst/flx/flx_color.h
@@ -17,8 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-typedef enum
-{
+typedef enum {
FLX_COLORSPACE_RGB8,
FLX_COLORSPACE_RGB32,
} FlxColorSpaceType;
@@ -26,20 +25,19 @@ typedef enum
typedef struct _FlxColorSpaceConverter FlxColorSpaceConverter;
-struct _FlxColorSpaceConverter
-{
- guint width;
- guint height;
- guchar palvec[768];
+struct _FlxColorSpaceConverter {
+ guint width;
+ guint height;
+ guchar palvec[768];
};
-void flx_colorspace_converter_destroy (FlxColorSpaceConverter * flxpal);
-void flx_colorspace_convert (FlxColorSpaceConverter * flxpal, guchar * src,
- guchar * dest);
-FlxColorSpaceConverter *flx_colorspace_converter_new (gint width, gint height);
+void flx_colorspace_converter_destroy(FlxColorSpaceConverter *flxpal);
+void flx_colorspace_convert(FlxColorSpaceConverter *flxpal, guchar *src, guchar *dest);
+FlxColorSpaceConverter * flx_colorspace_converter_new(gint width, gint height);
+
+void flx_set_palette_vector(FlxColorSpaceConverter *flxpal, guint start, guint num,
+ guchar *newpal, gint scale);
+void flx_set_color(FlxColorSpaceConverter *flxpal, guint colr, guint red, guint green,
+ guint blue, gint scale);
-void flx_set_palette_vector (FlxColorSpaceConverter * flxpal, guint start,
- guint num, guchar * newpal, gint scale);
-void flx_set_color (FlxColorSpaceConverter * flxpal, guint colr, guint red,
- guint green, guint blue, gint scale);
diff --git a/gst/flx/flx_fmt.h b/gst/flx/flx_fmt.h
index 1457551a..ac2062ed 100644
--- a/gst/flx/flx_fmt.h
+++ b/gst/flx/flx_fmt.h
@@ -24,114 +24,113 @@
#include <gst/gst.h>
#ifdef __cplusplus
-extern "C"
+extern "C" {
+#endif /* __cplusplus */
+
+enum Flx_TypeChunk
+{
+ /* frame chunks */
+ FLX_PREFIX_TYPE = 0xf100,
+ FLX_SCRIPT_CHUNK = 0xf1e0,
+ FLX_FRAME_TYPE = 0xf1fa,
+ FLX_SEGMENT_TABLE = 0xf1fb,
+ FLX_HUFFMAN_TABLE = 0xf1fc,
+
+ /* sub chunks */
+ FLX_CEL_DATA = 3,
+ FLX_COLOR256 = 4,
+ FLX_SS2 = 7,
+ FLX_COLOR64 = 11,
+ FLX_LC = 12,
+ FLX_BLACK = 13,
+ FLX_BRUN = 15,
+ FLX_COPY = 16,
+ FLX_MINI = 18,
+ FLX_DTA_RUN = 25,
+ FLX_DTA_COPY = 26,
+ FLX_DTA_LC = 27,
+ FLX_LABEL = 31,
+ FLX_BMP_MASK = 32,
+ FLX_MLEV_MASK = 33,
+ FLX_SEGMENT = 34,
+ FLX_KEY_IMAGE = 35,
+ FLX_KEY_PAL = 36,
+ FLX_REGION = 37,
+ FLX_WAVE = 38,
+ FLX_USERSTRING = 39,
+ FLX_RGN_MASK = 40,
+
+};
+
+enum Flx_MagicHdr
{
-#endif /* __cplusplus */
-
- enum Flx_TypeChunk
- {
- /* frame chunks */
- FLX_PREFIX_TYPE = 0xf100,
- FLX_SCRIPT_CHUNK = 0xf1e0,
- FLX_FRAME_TYPE = 0xf1fa,
- FLX_SEGMENT_TABLE = 0xf1fb,
- FLX_HUFFMAN_TABLE = 0xf1fc,
-
- /* sub chunks */
- FLX_CEL_DATA = 3,
- FLX_COLOR256 = 4,
- FLX_SS2 = 7,
- FLX_COLOR64 = 11,
- FLX_LC = 12,
- FLX_BLACK = 13,
- FLX_BRUN = 15,
- FLX_COPY = 16,
- FLX_MINI = 18,
- FLX_DTA_RUN = 25,
- FLX_DTA_COPY = 26,
- FLX_DTA_LC = 27,
- FLX_LABEL = 31,
- FLX_BMP_MASK = 32,
- FLX_MLEV_MASK = 33,
- FLX_SEGMENT = 34,
- FLX_KEY_IMAGE = 35,
- FLX_KEY_PAL = 36,
- FLX_REGION = 37,
- FLX_WAVE = 38,
- FLX_USERSTRING = 39,
- FLX_RGN_MASK = 40,
-
- };
-
- enum Flx_MagicHdr
- {
- FLX_MAGICHDR_FLI = 0xaf11,
- FLX_MAGICHDR_FLC = 0xaf12,
- FLX_MAGICHDR_FLX = 0xaf44,
- FLX_MAGICHDR_HUFFBWT = 0xaf30,
- };
-
-
-
- typedef struct _FlxHeader
- {
- guint32 size;
- guint16 type;
- guint16 frames;
- guint16 width, height, depth, flags;
- guint32 speed;
- guint16 reserved1;
- /* FLC */
- guint32 created, creator, updated, updater;
- guint16 aspect_dx, aspect_dy;
- /* EGI */
- guint16 ext_flags, keyframes, totalframes;
- guint32 req_memory;
- guint16 max_regions, transp_num;
- guchar reserved2[24];
- /* FLC */
- guint32 oframe1, oframe2;
- guchar reserved3[40];
- } FlxHeader;
+ FLX_MAGICHDR_FLI = 0xaf11,
+ FLX_MAGICHDR_FLC = 0xaf12,
+ FLX_MAGICHDR_FLX = 0xaf44,
+ FLX_MAGICHDR_HUFFBWT = 0xaf30,
+};
+
+
+
+typedef struct _FlxHeader
+{
+ guint32 size;
+ guint16 type;
+ guint16 frames;
+ guint16 width,height,depth,flags;
+ guint32 speed;
+ guint16 reserved1;
+ /* FLC */
+ guint32 created,creator,updated,updater;
+ guint16 aspect_dx, aspect_dy;
+ /* EGI */
+ guint16 ext_flags,keyframes,totalframes;
+ guint32 req_memory;
+ guint16 max_regions,transp_num;
+ guchar reserved2[24];
+ /* FLC */
+ guint32 oframe1,oframe2;
+ guchar reserved3[40];
+} FlxHeader;
#define FlxHeaderSize 128
- typedef struct _FlxFrameChunk
- {
- guint32 size;
- guint16 id;
- } FlxFrameChunk;
+typedef struct _FlxFrameChunk
+{
+ guint32 size;
+ guint16 id;
+} FlxFrameChunk;
#define FlxFrameChunkSize 6
- typedef struct _FlxPrefixChunk
- {
- guint16 chunks;
- guchar reserved[8];
- } FlxPrefixChunk;
-
- typedef struct _FlxSegmentTable
- {
- guint16 segments;
- } FlxSegmentTable;
-
- typedef struct _FlxHuffmanTable
- {
- guint16 codelength;
- guint16 numcodes;
- guchar reserved[6];
- } FlxHuffmanTable;
-
- typedef struct _FlxFrameType
- {
- guint16 chunks;
- guint16 delay;
- guchar reserved[6];
- } FlxFrameType;
+typedef struct _FlxPrefixChunk
+{
+ guint16 chunks;
+ guchar reserved[8];
+} FlxPrefixChunk;
+
+typedef struct _FlxSegmentTable
+{
+ guint16 segments;
+} FlxSegmentTable;
+
+typedef struct _FlxHuffmanTable
+{
+ guint16 codelength;
+ guint16 numcodes;
+ guchar reserved[6];
+} FlxHuffmanTable;
+
+typedef struct _FlxFrameType
+{
+ guint16 chunks;
+ guint16 delay;
+ guchar reserved[6];
+} FlxFrameType;
#define FlxFrameTypeSize 10
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_FLX_FMT_H__ */
+#endif /* __GST_FLX_FMT_H__ */
diff --git a/gst/flx/gstflxdec.h b/gst/flx/gstflxdec.h
index c5ce60ec..c7d6f386 100644
--- a/gst/flx/gstflxdec.h
+++ b/gst/flx/gstflxdec.h
@@ -27,46 +27,42 @@
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
- typedef enum
- {
- GST_FLXDEC_READ_HEADER,
- GST_FLXDEC_PLAYING,
- } GstFlxDecState;
+extern "C" {
+#endif /* __cplusplus */
+typedef enum {
+ GST_FLXDEC_READ_HEADER,
+ GST_FLXDEC_PLAYING,
+} GstFlxDecState;
+
/* Definition of structure storing data for this element. */
- typedef struct _GstFlxDec GstFlxDec;
+typedef struct _GstFlxDec GstFlxDec;
- struct _GstFlxDec
- {
- GstElement element;
+struct _GstFlxDec {
+ GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
- gboolean active, new_meta;
+ gboolean active, new_meta;
- GstBuffer *delta, *frame;
- GstByteStream *bs;
- gulong size;
- GstFlxDecState state;
- glong frame_time;
- gint64 next_time;
+ GstBuffer *delta, *frame;
+ GstByteStream *bs;
+ gulong size;
+ GstFlxDecState state;
+ glong frame_time;
+ gint64 next_time;
- FlxColorSpaceConverter *converter;
+ FlxColorSpaceConverter *converter;
- FlxHeader hdr;
- };
+ FlxHeader hdr;
+};
/* Standard definition defining a class for this element. */
- typedef struct _GstFlxDecClass GstFlxDecClass;
- struct _GstFlxDecClass
- {
- GstElementClass parent_class;
- };
+typedef struct _GstFlxDecClass GstFlxDecClass;
+struct _GstFlxDecClass {
+ GstElementClass parent_class;
+};
/* Standard macros for defining types for this element. */
#define GST_TYPE_FLXDEC \
@@ -81,12 +77,12 @@ extern "C"
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FLXDEC))
/* Standard function returning type information. */
- GType gst_flxdec_get_type (void);
+GType gst_flxdec_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_FLX_DECODER_H__ */
+#endif /* __GST_FLX_DECODER_H__ */