summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
Diffstat (limited to 'gst')
-rw-r--r--gst/cdxaparse/gstcdxaparse.h53
-rw-r--r--gst/colorspace/gstcolorspace.h31
-rw-r--r--gst/colorspace/yuv2rgb.h33
-rw-r--r--gst/deinterlace/gstdeinterlace.h13
-rw-r--r--gst/festival/gstfestival.h52
-rw-r--r--gst/filter/iir.h11
-rw-r--r--gst/flx/flx_color.h28
-rw-r--r--gst/flx/flx_fmt.h197
-rw-r--r--gst/flx/gstflxdec.h60
-rw-r--r--gst/modplug/gstmodplug.h111
-rw-r--r--gst/modplug/libmodplug/it_defs.h194
-rw-r--r--gst/modplug/libmodplug/modplug.h97
-rw-r--r--gst/modplug/libmodplug/sndfile.h1022
-rw-r--r--gst/modplug/libmodplug/stdafx.h44
-rw-r--r--gst/mpeg1sys/buffer.h194
-rw-r--r--gst/mpeg1sys/gstmpeg1systemencode.h93
-rw-r--r--gst/mpeg1sys/main.h111
-rw-r--r--gst/mpeg1videoparse/gstmp1videoparse.h47
-rw-r--r--gst/mpeg2sub/gstmpeg2subt.h49
-rw-r--r--gst/mpegaudioparse/gstmpegaudioparse.h41
-rw-r--r--gst/overlay/gstoverlay.h36
-rw-r--r--gst/passthrough/gstpassthrough.h16
-rw-r--r--gst/playondemand/gstplayondemand.h60
-rw-r--r--gst/qtdemux/qtdemux.h57
-rw-r--r--gst/rtjpeg/RTjpeg.h50
-rw-r--r--gst/rtjpeg/gstrtjpegdec.h37
-rw-r--r--gst/rtjpeg/gstrtjpegenc.h37
-rw-r--r--gst/smooth/gstsmooth.h45
-rw-r--r--gst/smoothwave/gstsmoothwave.h39
-rw-r--r--gst/smpte/gstmask.h50
-rw-r--r--gst/smpte/gstsmpte.h32
-rw-r--r--gst/smpte/paint.h31
-rw-r--r--gst/spectrum/gstspectrum.h33
-rw-r--r--gst/speed/gstspeed.h14
-rw-r--r--gst/stereo/gststereo.h35
-rw-r--r--gst/switch/gstswitch.h18
-rw-r--r--gst/vbidec/gstvbidec.h2
-rw-r--r--gst/vbidec/vbidata.h20
-rw-r--r--gst/vbidec/vbiscreen.h40
-rw-r--r--gst/videodrop/gstvideodrop.h14
-rw-r--r--gst/virtualdub/gstvirtualdub.h12
-rw-r--r--gst/y4m/gsty4mencode.h37
42 files changed, 1514 insertions, 1682 deletions
diff --git a/gst/cdxaparse/gstcdxaparse.h b/gst/cdxaparse/gstcdxaparse.h
index ef1475b2..32af5527 100644
--- a/gst/cdxaparse/gstcdxaparse.h
+++ b/gst/cdxaparse/gstcdxaparse.h
@@ -26,9 +26,8 @@
#include <gst/bytestream/bytestream.h>
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_CDXA_PARSE \
(gst_cdxa_parse_get_type())
@@ -44,40 +43,38 @@ extern "C"
#define CDXA_SECTOR_SIZE 2352
#define CDXA_DATA_SIZE 2324
- typedef enum
- {
- CDXA_PARSE_HEADER,
- CDXA_PARSE_DATA,
- } GstCDXAParseState;
+typedef enum
+{
+ CDXA_PARSE_HEADER,
+ CDXA_PARSE_DATA,
+} GstCDXAParseState;
- typedef struct _GstCDXAParse GstCDXAParse;
- typedef struct _GstCDXAParseClass GstCDXAParseClass;
+typedef struct _GstCDXAParse GstCDXAParse;
+typedef struct _GstCDXAParseClass GstCDXAParseClass;
- struct _GstCDXAParse
- {
- GstElement element;
+struct _GstCDXAParse {
+ GstElement element;
- /* pads */
- GstPad *sinkpad, *srcpad;
+ /* pads */
+ GstPad *sinkpad, *srcpad;
- GstByteStream *bs;
+ GstByteStream *bs;
- GstCDXAParseState state;
+ GstCDXAParseState state;
- guint32 riff_size;
- guint32 data_size;
- guint32 sectors;
- };
+ guint32 riff_size;
+ guint32 data_size;
+ guint32 sectors;
+};
- struct _GstCDXAParseClass
- {
- GstElementClass parent_class;
- };
+struct _GstCDXAParseClass {
+ GstElementClass parent_class;
+};
- GType gst_cdxa_parse_get_type (void);
+GType gst_cdxa_parse_get_type (void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_CDXA_PARSE_H__ */
+#endif /* __GST_CDXA_PARSE_H__ */
diff --git a/gst/colorspace/gstcolorspace.h b/gst/colorspace/gstcolorspace.h
index f777b41b..22e2f7ec 100644
--- a/gst/colorspace/gstcolorspace.h
+++ b/gst/colorspace/gstcolorspace.h
@@ -23,6 +23,7 @@
#include <gst/gst.h>
G_BEGIN_DECLS
+
#define GST_TYPE_COLORSPACE \
(gst_colorspace_get_type())
#define GST_COLORSPACE(obj) \
@@ -33,11 +34,11 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_COLORSPACE))
#define GST_IS_COLORSPACE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COLORSPACE))
+
typedef struct _GstColorspace GstColorspace;
typedef struct _GstColorspaceClass GstColorspaceClass;
-typedef enum
-{
+typedef enum {
GST_COLORSPACE_NONE,
GST_COLORSPACE_HERMES,
GST_COLORSPACE_YUV_RGB,
@@ -47,11 +48,10 @@ typedef enum
GST_COLORSPACE_420_SWAP,
} GstColorSpaceConverterType;
-struct _GstColorspace
-{
+struct _GstColorspace {
GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
int converter_index;
@@ -60,7 +60,7 @@ struct _GstColorspace
int src_size;
int sink_size;
-
+
int src_stride;
int sink_stride;
@@ -68,21 +68,18 @@ struct _GstColorspace
gdouble fps;
};
-struct _GstColorspaceClass
-{
+struct _GstColorspaceClass {
GstElementClass parent_class;
};
-GType gst_colorspace_get_type (void);
+GType gst_colorspace_get_type(void);
-typedef struct _GstColorspaceFormat
-{
+typedef struct _GstColorspaceFormat {
GstStaticCaps caps;
} GstColorspaceFormat;
-typedef enum
-{
+typedef enum {
GST_COLORSPACE_I420,
GST_COLORSPACE_YV12,
GST_COLORSPACE_RGB32,
@@ -90,13 +87,13 @@ typedef enum
GST_COLORSPACE_RGB16,
} GstColorSpaceFormatType;
-typedef struct _GstColorspaceConverter
-{
+typedef struct _GstColorspaceConverter {
GstColorSpaceFormatType from;
GstColorSpaceFormatType to;
- void (*convert) (GstColorspace * colorspace, unsigned char *dest,
- unsigned char *src);
+ void (*convert) (GstColorspace *colorspace, unsigned char *dest, unsigned char *src);
} GstColorspaceConverter;
G_END_DECLS
+
#endif
+
diff --git a/gst/colorspace/yuv2rgb.h b/gst/colorspace/yuv2rgb.h
index ec987dfc..be173bca 100644
--- a/gst/colorspace/yuv2rgb.h
+++ b/gst/colorspace/yuv2rgb.h
@@ -26,11 +26,11 @@
#include <gstcolorspace.h>
G_BEGIN_DECLS
+
#if 0
typedef struct _GstColorspaceYUVTables GstColorspaceYUVTables;
-struct _GstColorspaceYUVTables
-{
+struct _GstColorspaceYUVTables {
int gammaCorrectFlag;
double gammaCorrect;
int chromaCorrectFlag;
@@ -50,11 +50,9 @@ struct _GstColorspaceYUVTables
typedef struct _GstColorspaceConverter GstColorspaceConverter;
-typedef void (*GstColorspaceConvertFunction) (GstColorspaceConverter * space,
- guchar * src, guchar * dest);
+typedef void (*GstColorspaceConvertFunction) (GstColorspaceConverter *space, guchar *src, guchar *dest);
-struct _GstColorspaceConverter
-{
+struct _GstColorspaceConverter {
guint width;
guint height;
guint insize;
@@ -65,34 +63,35 @@ struct _GstColorspaceConverter
};
#endif
-void gst_colorspace_table_init (GstColorspace * space);
+void gst_colorspace_table_init (GstColorspace *space);
-void gst_colorspace_I420_to_rgb32 (GstColorspace * space,
+void gst_colorspace_I420_to_rgb32(GstColorspace *space,
unsigned char *src, unsigned char *dest);
-void gst_colorspace_I420_to_rgb24 (GstColorspace * space,
+void gst_colorspace_I420_to_rgb24(GstColorspace *space,
unsigned char *src, unsigned char *dest);
-void gst_colorspace_I420_to_rgb16 (GstColorspace * space,
+void gst_colorspace_I420_to_rgb16(GstColorspace *space,
unsigned char *src, unsigned char *dest);
-void gst_colorspace_YV12_to_rgb32 (GstColorspace * space,
+void gst_colorspace_YV12_to_rgb32(GstColorspace *space,
unsigned char *src, unsigned char *dest);
-void gst_colorspace_YV12_to_rgb24 (GstColorspace * space,
+void gst_colorspace_YV12_to_rgb24(GstColorspace *space,
unsigned char *src, unsigned char *dest);
-void gst_colorspace_YV12_to_rgb16 (GstColorspace * space,
+void gst_colorspace_YV12_to_rgb16(GstColorspace *space,
unsigned char *src, unsigned char *dest);
#if 0
-GstColorspaceYUVTables *gst_colorspace_init_yuv (long depth,
+GstColorspaceYUVTables * gst_colorspace_init_yuv(long depth,
long red_mask, long green_mask, long blue_mask);
#endif
#if 0
-GstColorspaceConverter *gst_colorspace_yuv2rgb_get_converter (const GstCaps *
- from, const GstCaps * to);
+GstColorspaceConverter* gst_colorspace_yuv2rgb_get_converter (const GstCaps *from, const GstCaps *to);
#define gst_colorspace_convert(converter, src, dest) \
(converter)->convert((converter), (src), (dest))
-void gst_colorspace_converter_destroy (GstColorspaceConverter * space);
+void gst_colorspace_converter_destroy (GstColorspaceConverter *space);
#endif
G_END_DECLS
+
#endif
+
diff --git a/gst/deinterlace/gstdeinterlace.h b/gst/deinterlace/gstdeinterlace.h
index 13f3d66f..27207319 100644
--- a/gst/deinterlace/gstdeinterlace.h
+++ b/gst/deinterlace/gstdeinterlace.h
@@ -26,6 +26,7 @@
/* #include <gst/meta/audioraw.h> */
G_BEGIN_DECLS
+
#define GST_TYPE_DEINTERLACE \
(gst_deinterlace_get_type())
#define GST_DEINTERLACE(obj) \
@@ -36,11 +37,11 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_DEINTERLACE))
#define GST_IS_DEINTERLACE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DEINTERLACE))
+
typedef struct _GstDeInterlace GstDeInterlace;
typedef struct _GstDeInterlaceClass GstDeInterlaceClass;
-struct _GstDeInterlace
-{
+struct _GstDeInterlace {
GstElement element;
GstPad *sinkpad, *srcpad;
@@ -49,8 +50,8 @@ struct _GstDeInterlace
gboolean show_deinterlaced_area_only;
gboolean blend;
- gint threshold_blend; /* here we start blending */
- gint threshold; /* here we start interpolating TODO FIXME */
+ gint threshold_blend; /* here we start blending */
+ gint threshold; /* here we start interpolating TODO FIXME */
gint edge_detect;
gint picsize;
@@ -58,10 +59,10 @@ struct _GstDeInterlace
};
-struct _GstDeInterlaceClass
-{
+struct _GstDeInterlaceClass {
GstElementClass parent_class;
};
G_END_DECLS
+
#endif /* __GST_DEINTERLACE_H__ */
diff --git a/gst/festival/gstfestival.h b/gst/festival/gstfestival.h
index 6c649e17..ab463106 100644
--- a/gst/festival/gstfestival.h
+++ b/gst/festival/gstfestival.h
@@ -64,24 +64,23 @@
#include <gst/gst.h>
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define FESTIVAL_DEFAULT_SERVER_HOST "localhost"
#define FESTIVAL_DEFAULT_SERVER_PORT 1314
#define FESTIVAL_DEFAULT_TEXT_MODE "fundamental"
- typedef struct FT_Info
- {
+typedef struct FT_Info
+{
int encoding;
char *server_host;
int server_port;
char *text_mode;
-
+
int server_fd;
- } FT_Info;
+} FT_Info;
#define GST_TYPE_FESTIVAL \
(gst_festival_get_type())
@@ -94,35 +93,32 @@ extern "C"
#define GST_IS_FESTIVAL_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FESTIVAL))
- typedef enum
- {
- GST_FESTIVAL_OPEN = GST_ELEMENT_FLAG_LAST,
+typedef enum {
+ GST_FESTIVAL_OPEN = GST_ELEMENT_FLAG_LAST,
- GST_FESTIVAL_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
- } GstFestivalFlags;
+ GST_FESTIVAL_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
+} GstFestivalFlags;
- typedef struct _GstFestival GstFestival;
- typedef struct _GstFestivalClass GstFestivalClass;
+typedef struct _GstFestival GstFestival;
+typedef struct _GstFestivalClass GstFestivalClass;
- struct _GstFestival
- {
- GstElement element;
+struct _GstFestival {
+ GstElement element;
- /* pads */
- GstPad *sinkpad, *srcpad;
+ /* pads */
+ GstPad *sinkpad,*srcpad;
- FT_Info *info;
- };
+ FT_Info *info;
+};
- struct _GstFestivalClass
- {
- GstElementClass parent_class;
- };
+struct _GstFestivalClass {
+ GstElementClass parent_class;
+};
- GType gst_festival_get_type (void);
+GType gst_festival_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_FESTIVAL_H__ */
+#endif /* __GST_FESTIVAL_H__ */
diff --git a/gst/filter/iir.h b/gst/filter/iir.h
index 1cea5663..241cc1d2 100644
--- a/gst/filter/iir.h
+++ b/gst/filter/iir.h
@@ -19,8 +19,7 @@
#ifndef _V_IIR_H_
#define _V_IIR_H_
-typedef struct
-{
+typedef struct {
int stages;
double *coeff_A;
double *coeff_B;
@@ -30,9 +29,9 @@ typedef struct
double gain;
} IIR_state;
-void IIR_init (IIR_state * s, int stages, double gain, double *A, double *B);
-void IIR_clear (IIR_state * s);
-double IIR_filter (IIR_state * s, double in);
-double IIR_filter_ChebBand (IIR_state * s, double in);
+void IIR_init(IIR_state *s,int stages,double gain, double *A, double *B);
+void IIR_clear(IIR_state *s);
+double IIR_filter(IIR_state *s,double in);
+double IIR_filter_ChebBand(IIR_state *s,double in);
#endif
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__ */
diff --git a/gst/modplug/gstmodplug.h b/gst/modplug/gstmodplug.h
index f32c9a9a..c4a98b86 100644
--- a/gst/modplug/gstmodplug.h
+++ b/gst/modplug/gstmodplug.h
@@ -22,16 +22,15 @@
#define __GST_MODPLUG_H__
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#include <gst/gst.h>
#include <gst/bytestream/bytestream.h>
-
+
#define GST_TYPE_MODPLUG \
(gst_modplug_get_type())
-
+
#define GST_MODPLUG(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MODPLUG,GstModPlug))
#define GST_MODPLUG_CLASS(klass) \
@@ -40,59 +39,57 @@ extern "C"
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MODPLUG))
#define GST_IS_MODPLUG_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MODPLUG))
-
- struct _GstModPlug
- {
- GstElement element;
- GstPad *sinkpad, *srcpad;
- guint8 *buffer_in;
- GstByteStream *bs;
-
- const gchar *songname;
- gboolean reverb;
- gint reverb_depth;
- gint reverb_delay;
- gboolean megabass;
- gint megabass_amount;
- gint megabass_range;
- gboolean surround;
- gint surround_depth;
- gint surround_delay;
- gboolean noise_reduction;
- gboolean _16bit;
- gboolean oversamp;
- gint channel;
- gint frequency;
-
- guchar *audiobuffer;
- gint32 length;
- guint state;
- guint bitsPerSample;
- gboolean need_discont;
- gboolean eos;
- gint64 seek_at;
- guint64 song_size;
- guint64 timestamp;
-
- CSoundFile *mSoundFile;
- gboolean opened; /* set to TRUE when mSoundFile is created */
- };
-
- struct _GstModPlugClass
- {
- GstElementClass parent_class;
- };
-
- typedef struct _GstModPlug GstModPlug;
- typedef struct _GstModPlugClass GstModPlugClass;
-
- GstPad *srcpad;
- int need_sync;
-
- GType gst_modplug_get_type (void);
+
+struct _GstModPlug {
+ GstElement element;
+ GstPad *sinkpad, *srcpad;
+ guint8 *buffer_in;
+ GstByteStream *bs;
+
+ const gchar *songname;
+ gboolean reverb;
+ gint reverb_depth;
+ gint reverb_delay;
+ gboolean megabass;
+ gint megabass_amount;
+ gint megabass_range;
+ gboolean surround;
+ gint surround_depth;
+ gint surround_delay;
+ gboolean noise_reduction;
+ gboolean _16bit;
+ gboolean oversamp;
+ gint channel;
+ gint frequency;
+
+ guchar *audiobuffer;
+ gint32 length;
+ guint state;
+ guint bitsPerSample;
+ gboolean need_discont;
+ gboolean eos;
+ gint64 seek_at;
+ guint64 song_size;
+ guint64 timestamp;
+
+ CSoundFile *mSoundFile;
+ gboolean opened; /* set to TRUE when mSoundFile is created */
+};
+
+struct _GstModPlugClass {
+ GstElementClass parent_class;
+};
+
+typedef struct _GstModPlug GstModPlug;
+typedef struct _GstModPlugClass GstModPlugClass;
+
+GstPad *srcpad;
+int need_sync;
+
+GType gst_modplug_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_MODPLUG_H__ */
+#endif /* __GST_MODPLUG_H__ */
diff --git a/gst/modplug/libmodplug/it_defs.h b/gst/modplug/libmodplug/it_defs.h
index 48ff0b15..732ce45c 100644
--- a/gst/modplug/libmodplug/it_defs.h
+++ b/gst/modplug/libmodplug/it_defs.h
@@ -5,125 +5,125 @@
typedef struct tagITFILEHEADER
{
- DWORD id; /* 0x4D504D49 */
- CHAR songname[26];
- WORD reserved1; /* 0x1004 */
- WORD ordnum;
- WORD insnum;
- WORD smpnum;
- WORD patnum;
- WORD cwtv;
- WORD cmwt;
- WORD flags;
- WORD special;
- BYTE globalvol;
- BYTE mv;
- BYTE speed;
- BYTE tempo;
- BYTE sep;
- BYTE zero;
- WORD msglength;
- DWORD msgoffset;
- DWORD reserved2;
- BYTE chnpan[64];
- BYTE chnvol[64];
+ DWORD id; /* 0x4D504D49 */
+ CHAR songname[26];
+ WORD reserved1; /* 0x1004 */
+ WORD ordnum;
+ WORD insnum;
+ WORD smpnum;
+ WORD patnum;
+ WORD cwtv;
+ WORD cmwt;
+ WORD flags;
+ WORD special;
+ BYTE globalvol;
+ BYTE mv;
+ BYTE speed;
+ BYTE tempo;
+ BYTE sep;
+ BYTE zero;
+ WORD msglength;
+ DWORD msgoffset;
+ DWORD reserved2;
+ BYTE chnpan[64];
+ BYTE chnvol[64];
} ITFILEHEADER;
typedef struct tagITENVELOPE
{
- BYTE flags;
- BYTE num;
- BYTE lpb;
- BYTE lpe;
- BYTE slb;
- BYTE sle;
- BYTE data[25 * 3];
- BYTE reserved;
+ BYTE flags;
+ BYTE num;
+ BYTE lpb;
+ BYTE lpe;
+ BYTE slb;
+ BYTE sle;
+ BYTE data[25*3];
+ BYTE reserved;
} ITENVELOPE;
/* Old Impulse Instrument Format (cmwt < 0x200) */
typedef struct tagITOLDINSTRUMENT
{
- DWORD id; /* IMPI = 0x49504D49 */
- CHAR filename[12]; /* DOS file name */
- BYTE zero;
- BYTE flags;
- BYTE vls;
- BYTE vle;
- BYTE sls;
- BYTE sle;
- WORD reserved1;
- WORD fadeout;
- BYTE nna;
- BYTE dnc;
- WORD trkvers;
- BYTE nos;
- BYTE reserved2;
- CHAR name[26];
- WORD reserved3[3];
- BYTE keyboard[240];
- BYTE volenv[200];
- BYTE nodes[50];
+ DWORD id; /* IMPI = 0x49504D49 */
+ CHAR filename[12]; /* DOS file name */
+ BYTE zero;
+ BYTE flags;
+ BYTE vls;
+ BYTE vle;
+ BYTE sls;
+ BYTE sle;
+ WORD reserved1;
+ WORD fadeout;
+ BYTE nna;
+ BYTE dnc;
+ WORD trkvers;
+ BYTE nos;
+ BYTE reserved2;
+ CHAR name[26];
+ WORD reserved3[3];
+ BYTE keyboard[240];
+ BYTE volenv[200];
+ BYTE nodes[50];
} ITOLDINSTRUMENT;
/* Impulse Instrument Format */
typedef struct tagITINSTRUMENT
{
- DWORD id;
- CHAR filename[12];
- BYTE zero;
- BYTE nna;
- BYTE dct;
- BYTE dca;
- WORD fadeout;
- signed char pps;
- BYTE ppc;
- BYTE gbv;
- BYTE dfp;
- BYTE rv;
- BYTE rp;
- WORD trkvers;
- BYTE nos;
- BYTE reserved1;
- CHAR name[26];
- BYTE ifc;
- BYTE ifr;
- BYTE mch;
- BYTE mpr;
- WORD mbank;
- BYTE keyboard[240];
- ITENVELOPE volenv;
- ITENVELOPE panenv;
- ITENVELOPE pitchenv;
- BYTE dummy[4]; /* was 7, but IT v2.17 saves 554 bytes */
+ DWORD id;
+ CHAR filename[12];
+ BYTE zero;
+ BYTE nna;
+ BYTE dct;
+ BYTE dca;
+ WORD fadeout;
+ signed char pps;
+ BYTE ppc;
+ BYTE gbv;
+ BYTE dfp;
+ BYTE rv;
+ BYTE rp;
+ WORD trkvers;
+ BYTE nos;
+ BYTE reserved1;
+ CHAR name[26];
+ BYTE ifc;
+ BYTE ifr;
+ BYTE mch;
+ BYTE mpr;
+ WORD mbank;
+ BYTE keyboard[240];
+ ITENVELOPE volenv;
+ ITENVELOPE panenv;
+ ITENVELOPE pitchenv;
+ BYTE dummy[4]; /* was 7, but IT v2.17 saves 554 bytes */
} ITINSTRUMENT;
/* IT Sample Format */
typedef struct ITSAMPLESTRUCT
{
- DWORD id; /* 0x53504D49 */
- CHAR filename[12];
- BYTE zero;
- BYTE gvl;
- BYTE flags;
- BYTE vol;
- CHAR name[26];
- BYTE cvt;
- BYTE dfp;
- DWORD length;
- DWORD loopbegin;
- DWORD loopend;
- DWORD C5Speed;
- DWORD susloopbegin;
- DWORD susloopend;
- DWORD samplepointer;
- BYTE vis;
- BYTE vid;
- BYTE vir;
- BYTE vit;
+ DWORD id; /* 0x53504D49 */
+ CHAR filename[12];
+ BYTE zero;
+ BYTE gvl;
+ BYTE flags;
+ BYTE vol;
+ CHAR name[26];
+ BYTE cvt;
+ BYTE dfp;
+ DWORD length;
+ DWORD loopbegin;
+ DWORD loopend;
+ DWORD C5Speed;
+ DWORD susloopbegin;
+ DWORD susloopend;
+ DWORD samplepointer;
+ BYTE vis;
+ BYTE vid;
+ BYTE vir;
+ BYTE vit;
} ITSAMPLESTRUCT;
#pragma pack()
diff --git a/gst/modplug/libmodplug/modplug.h b/gst/modplug/libmodplug/modplug.h
index 877060d0..fd8ec02f 100644
--- a/gst/modplug/libmodplug/modplug.h
+++ b/gst/modplug/libmodplug/modplug.h
@@ -8,31 +8,30 @@
#define MODPLUG_H__INCLUDED
#ifdef __cplusplus
-extern "C"
-{
+extern "C" {
#endif
- struct _ModPlugFile;
- typedef struct _ModPlugFile ModPlugFile;
+struct _ModPlugFile;
+typedef struct _ModPlugFile ModPlugFile;
/* Load a mod file. [data] should point to a block of memory containing the complete
* file, and [size] should be the size of that block.
* Return the loaded mod file on success, or NULL on failure. */
- ModPlugFile *ModPlug_Load (const void *data, int size);
+ModPlugFile* ModPlug_Load(const void* data, int size);
/* Unload a mod file. */
- void ModPlug_Unload (ModPlugFile * file);
+void ModPlug_Unload(ModPlugFile* file);
/* Read sample data into the buffer. Returns the number of bytes read. If the end
* of the mod has been reached, zero is returned. */
- int ModPlug_Read (ModPlugFile * file, void *buffer, int size);
+int ModPlug_Read(ModPlugFile* file, void* buffer, int size);
/* Get the name of the mod. The returned buffer is stored within the ModPlugFile
* structure and will remain valid until you unload the file. */
- const char *ModPlug_GetName (ModPlugFile * file);
+const char* ModPlug_GetName(ModPlugFile* file);
/* Get the length of the mod, in milliseconds. Note that this result is not always
* accurate, especially in the case of mods with loops. */
- int ModPlug_GetLength (ModPlugFile * file);
+int ModPlug_GetLength(ModPlugFile* file);
/* Seek to a particular position in the song. Note that seeking and MODs don't mix very
* well. Some mods will be missing instruments for a short time after a seek, as ModPlug
@@ -40,54 +39,54 @@ extern "C"
* playing at that time. (Doing so would be difficult and not very reliable.) Also,
* note that seeking is not very exact in some mods -- especially those for which
* ModPlug_GetLength() does not report the full length. */
- void ModPlug_Seek (ModPlugFile * file, int millisecond);
-
- enum _ModPlug_Flags
- {
- MODPLUG_ENABLE_OVERSAMPLING = 1 << 0, /* Enable oversampling (*highly* recommended) */
- MODPLUG_ENABLE_NOISE_REDUCTION = 1 << 1, /* Enable noise reduction */
- MODPLUG_ENABLE_REVERB = 1 << 2, /* Enable reverb */
- MODPLUG_ENABLE_MEGABASS = 1 << 3, /* Enable megabass */
- MODPLUG_ENABLE_SURROUND = 1 << 4 /* Enable surround sound. */
- };
-
- enum _ModPlug_ResamplingMode
- {
- MODPLUG_RESAMPLE_NEAREST = 0, /* No interpolation (very fast, extremely bad sound quality) */
- MODPLUG_RESAMPLE_LINEAR = 1, /* Linear interpolation (fast, good quality) */
- MODPLUG_RESAMPLE_SPLINE = 2, /* Cubic spline interpolation (high quality) */
- MODPLUG_RESAMPLE_FIR = 3 /* 8-tap fir filter (extremely high quality) */
- };
-
- typedef struct _ModPlug_Settings
- {
- int mFlags; /* One or more of the MODPLUG_ENABLE_* flags above, bitwise-OR'ed */
+void ModPlug_Seek(ModPlugFile* file, int millisecond);
- /* Note that ModPlug always decodes sound at 44100kHz, 32 bit, stereo and then
- * down-mixes to the settings you choose. */
- int mChannels; /* Number of channels - 1 for mono or 2 for stereo */
- int mBits; /* Bits per sample - 8, 16, or 32 */
- int mFrequency; /* Sampling rate - 11025, 22050, or 44100 */
- int mResamplingMode; /* One of MODPLUG_RESAMPLE_*, above */
+enum _ModPlug_Flags
+{
+ MODPLUG_ENABLE_OVERSAMPLING = 1 << 0, /* Enable oversampling (*highly* recommended) */
+ MODPLUG_ENABLE_NOISE_REDUCTION = 1 << 1, /* Enable noise reduction */
+ MODPLUG_ENABLE_REVERB = 1 << 2, /* Enable reverb */
+ MODPLUG_ENABLE_MEGABASS = 1 << 3, /* Enable megabass */
+ MODPLUG_ENABLE_SURROUND = 1 << 4 /* Enable surround sound. */
+};
+
+enum _ModPlug_ResamplingMode
+{
+ MODPLUG_RESAMPLE_NEAREST = 0, /* No interpolation (very fast, extremely bad sound quality) */
+ MODPLUG_RESAMPLE_LINEAR = 1, /* Linear interpolation (fast, good quality) */
+ MODPLUG_RESAMPLE_SPLINE = 2, /* Cubic spline interpolation (high quality) */
+ MODPLUG_RESAMPLE_FIR = 3 /* 8-tap fir filter (extremely high quality) */
+};
- int mReverbDepth; /* Reverb level 0(quiet)-100(loud) */
- int mReverbDelay; /* Reverb delay in ms, usually 40-200ms */
- int mBassAmount; /* XBass level 0(quiet)-100(loud) */
- int mBassRange; /* XBass cutoff in Hz 10-100 */
- int mSurroundDepth; /* Surround level 0(quiet)-100(heavy) */
- int mSurroundDelay; /* Surround delay in ms, usually 5-40ms */
- int mLoopCount; /* Number of times to loop. Zero prevents looping.
- -1 loops forever. */
- } ModPlug_Settings;
+typedef struct _ModPlug_Settings
+{
+ int mFlags; /* One or more of the MODPLUG_ENABLE_* flags above, bitwise-OR'ed */
+
+ /* Note that ModPlug always decodes sound at 44100kHz, 32 bit, stereo and then
+ * down-mixes to the settings you choose. */
+ int mChannels; /* Number of channels - 1 for mono or 2 for stereo */
+ int mBits; /* Bits per sample - 8, 16, or 32 */
+ int mFrequency; /* Sampling rate - 11025, 22050, or 44100 */
+ int mResamplingMode; /* One of MODPLUG_RESAMPLE_*, above */
+
+ int mReverbDepth; /* Reverb level 0(quiet)-100(loud) */
+ int mReverbDelay; /* Reverb delay in ms, usually 40-200ms */
+ int mBassAmount; /* XBass level 0(quiet)-100(loud) */
+ int mBassRange; /* XBass cutoff in Hz 10-100 */
+ int mSurroundDepth; /* Surround level 0(quiet)-100(heavy) */
+ int mSurroundDelay; /* Surround delay in ms, usually 5-40ms */
+ int mLoopCount; /* Number of times to loop. Zero prevents looping.
+ -1 loops forever. */
+} ModPlug_Settings;
/* Get and set the mod decoder settings. All options, except for channels, bits-per-sample,
* sampling rate, and loop count, will take effect immediately. Those options which don't
* take effect immediately will take effect the next time you load a mod. */
- void ModPlug_GetSettings (ModPlug_Settings * settings);
- void ModPlug_SetSettings (const ModPlug_Settings * settings);
+void ModPlug_GetSettings(ModPlug_Settings* settings);
+void ModPlug_SetSettings(const ModPlug_Settings* settings);
#ifdef __cplusplus
-} /* extern "C" */
+} /* extern "C" */
#endif
#endif
diff --git a/gst/modplug/libmodplug/sndfile.h b/gst/modplug/libmodplug/sndfile.h
index ebfd4afd..0fe6f459 100644
--- a/gst/modplug/libmodplug/sndfile.h
+++ b/gst/modplug/libmodplug/sndfile.h
@@ -9,7 +9,7 @@
#define __SNDFILE_H
#ifndef LPCBYTE
-typedef const BYTE *LPCBYTE;
+typedef const BYTE * LPCBYTE;
#endif
#define MOD_AMIGAC2 0x1AB
@@ -60,7 +60,7 @@ typedef const BYTE *LPCBYTE;
#define MOD_TYPE_AMF0 0x200000
#define MOD_TYPE_PSM 0x400000
#define MOD_TYPE_J2B 0x800000
-#define MOD_TYPE_UMX 0x80000000 /* Fake type */
+#define MOD_TYPE_UMX 0x80000000 /* Fake type */
#define MAX_MODTYPE 23
@@ -202,9 +202,9 @@ typedef const BYTE *LPCBYTE;
#define RS_STIPCM16U (RS_PCM16U|0x40|RSF_STEREO) /* stereo 16-bit unsigned */
#define RS_STIPCM16M (RS_PCM16M|0x40|RSF_STEREO) /* stereo 16-bit signed big endian */
/* 24-bit signed */
-#define RS_PCM24S (RS_PCM16S|0x80) /* mono 24-bit signed */
+#define RS_PCM24S (RS_PCM16S|0x80) /* mono 24-bit signed */
#define RS_STIPCM24S (RS_PCM16S|0x80|RSF_STEREO) /* stereo 24-bit signed */
-#define RS_PCM32S (RS_PCM16S|0xC0) /* mono 24-bit signed */
+#define RS_PCM32S (RS_PCM16S|0xC0) /* mono 24-bit signed */
#define RS_STIPCM32S (RS_PCM16S|0xC0|RSF_STEREO) /* stereo 24-bit signed */
/* NNA types */
@@ -269,178 +269,176 @@ typedef const BYTE *LPCBYTE;
/* Reverb Types (GM2 Presets) */
-enum
-{
- REVERBTYPE_SMALLROOM,
- REVERBTYPE_MEDIUMROOM,
- REVERBTYPE_LARGEROOM,
- REVERBTYPE_SMALLHALL,
- REVERBTYPE_MEDIUMHALL,
- REVERBTYPE_LARGEHALL,
- NUM_REVERBTYPES
+enum {
+ REVERBTYPE_SMALLROOM,
+ REVERBTYPE_MEDIUMROOM,
+ REVERBTYPE_LARGEROOM,
+ REVERBTYPE_SMALLHALL,
+ REVERBTYPE_MEDIUMHALL,
+ REVERBTYPE_LARGEHALL,
+ NUM_REVERBTYPES
};
-enum
-{
- SRCMODE_NEAREST,
- SRCMODE_LINEAR,
- SRCMODE_SPLINE,
- SRCMODE_POLYPHASE,
- NUM_SRC_MODES
+enum {
+ SRCMODE_NEAREST,
+ SRCMODE_LINEAR,
+ SRCMODE_SPLINE,
+ SRCMODE_POLYPHASE,
+ NUM_SRC_MODES
};
/* Sample Struct */
typedef struct _MODINSTRUMENT
{
- UINT nLength, nLoopStart, nLoopEnd;
- UINT nSustainStart, nSustainEnd;
- signed char *pSample;
- UINT nC4Speed;
- WORD nPan;
- WORD nVolume;
- WORD nGlobalVol;
- WORD uFlags;
- signed char RelativeTone;
- signed char nFineTune;
- BYTE nVibType;
- BYTE nVibSweep;
- BYTE nVibDepth;
- BYTE nVibRate;
- CHAR name[22];
+ UINT nLength,nLoopStart,nLoopEnd;
+ UINT nSustainStart, nSustainEnd;
+ signed char *pSample;
+ UINT nC4Speed;
+ WORD nPan;
+ WORD nVolume;
+ WORD nGlobalVol;
+ WORD uFlags;
+ signed char RelativeTone;
+ signed char nFineTune;
+ BYTE nVibType;
+ BYTE nVibSweep;
+ BYTE nVibDepth;
+ BYTE nVibRate;
+ CHAR name[22];
} MODINSTRUMENT;
/* Instrument Struct */
typedef struct _INSTRUMENTHEADER
{
- UINT nFadeOut;
- DWORD dwFlags;
- WORD nGlobalVol;
- WORD nPan;
- WORD VolPoints[MAX_ENVPOINTS];
- WORD PanPoints[MAX_ENVPOINTS];
- WORD PitchPoints[MAX_ENVPOINTS];
- BYTE VolEnv[MAX_ENVPOINTS];
- BYTE PanEnv[MAX_ENVPOINTS];
- BYTE PitchEnv[MAX_ENVPOINTS];
- BYTE Keyboard[128];
- BYTE NoteMap[128];
-
- BYTE nVolEnv;
- BYTE nPanEnv;
- BYTE nPitchEnv;
- BYTE nVolLoopStart;
- BYTE nVolLoopEnd;
- BYTE nVolSustainBegin;
- BYTE nVolSustainEnd;
- BYTE nPanLoopStart;
- BYTE nPanLoopEnd;
- BYTE nPanSustainBegin;
- BYTE nPanSustainEnd;
- BYTE nPitchLoopStart;
- BYTE nPitchLoopEnd;
- BYTE nPitchSustainBegin;
- BYTE nPitchSustainEnd;
- BYTE nNNA;
- BYTE nDCT;
- BYTE nDNA;
- BYTE nPanSwing;
- BYTE nVolSwing;
- BYTE nIFC;
- BYTE nIFR;
- WORD wMidiBank;
- BYTE nMidiProgram;
- BYTE nMidiChannel;
- BYTE nMidiDrumKey;
- signed char nPPS;
- unsigned char nPPC;
- CHAR name[32];
- CHAR filename[12];
+ UINT nFadeOut;
+ DWORD dwFlags;
+ WORD nGlobalVol;
+ WORD nPan;
+ WORD VolPoints[MAX_ENVPOINTS];
+ WORD PanPoints[MAX_ENVPOINTS];
+ WORD PitchPoints[MAX_ENVPOINTS];
+ BYTE VolEnv[MAX_ENVPOINTS];
+ BYTE PanEnv[MAX_ENVPOINTS];
+ BYTE PitchEnv[MAX_ENVPOINTS];
+ BYTE Keyboard[128];
+ BYTE NoteMap[128];
+
+ BYTE nVolEnv;
+ BYTE nPanEnv;
+ BYTE nPitchEnv;
+ BYTE nVolLoopStart;
+ BYTE nVolLoopEnd;
+ BYTE nVolSustainBegin;
+ BYTE nVolSustainEnd;
+ BYTE nPanLoopStart;
+ BYTE nPanLoopEnd;
+ BYTE nPanSustainBegin;
+ BYTE nPanSustainEnd;
+ BYTE nPitchLoopStart;
+ BYTE nPitchLoopEnd;
+ BYTE nPitchSustainBegin;
+ BYTE nPitchSustainEnd;
+ BYTE nNNA;
+ BYTE nDCT;
+ BYTE nDNA;
+ BYTE nPanSwing;
+ BYTE nVolSwing;
+ BYTE nIFC;
+ BYTE nIFR;
+ WORD wMidiBank;
+ BYTE nMidiProgram;
+ BYTE nMidiChannel;
+ BYTE nMidiDrumKey;
+ signed char nPPS;
+ unsigned char nPPC;
+ CHAR name[32];
+ CHAR filename[12];
} INSTRUMENTHEADER;
/* Channel Struct */
typedef struct _MODCHANNEL
{
- /* First 32-bytes: Most used mixing information: don't change it */
- signed char *pCurrentSample;
- DWORD nPos;
- DWORD nPosLo; /* actually 16-bit */
- LONG nInc; /* 16.16 */
- LONG nRightVol;
- LONG nLeftVol;
- LONG nRightRamp;
- LONG nLeftRamp;
- /* 2nd cache line */
- DWORD nLength;
- DWORD dwFlags;
- DWORD nLoopStart;
- DWORD nLoopEnd;
- LONG nRampRightVol;
- LONG nRampLeftVol;
- LONG nFilter_Y1, nFilter_Y2, nFilter_Y3, nFilter_Y4;
- LONG nFilter_A0, nFilter_B0, nFilter_B1;
- LONG nROfs, nLOfs;
- LONG nRampLength;
- /* Information not used in the mixer */
- signed char *pSample;
- LONG nNewRightVol, nNewLeftVol;
- LONG nRealVolume, nRealPan;
- LONG nVolume, nPan, nFadeOutVol;
- LONG nPeriod, nC4Speed, nPortamentoDest;
- INSTRUMENTHEADER *pHeader;
- MODINSTRUMENT *pInstrument;
- DWORD nVolEnvPosition, nPanEnvPosition, nPitchEnvPosition;
- DWORD nMasterChn, nVUMeter;
- LONG nGlobalVol, nInsVol;
- LONG nFineTune, nTranspose;
- LONG nPortamentoSlide, nAutoVibDepth;
- UINT nAutoVibPos, nVibratoPos, nTremoloPos, nPanbrelloPos;
- /* 16-bit members */
- signed short nVolSwing, nPanSwing;
- /* 8-bit members */
- BYTE nNote, nNNA;
- BYTE nNewNote, nNewIns, nCommand, nArpeggio;
- BYTE nOldVolumeSlide, nOldFineVolUpDown;
- BYTE nOldPortaUpDown, nOldFinePortaUpDown;
- BYTE nOldPanSlide, nOldChnVolSlide;
- BYTE nVibratoType, nVibratoSpeed, nVibratoDepth;
- BYTE nTremoloType, nTremoloSpeed, nTremoloDepth;
- BYTE nPanbrelloType, nPanbrelloSpeed, nPanbrelloDepth;
- BYTE nOldCmdEx, nOldVolParam, nOldTempo;
- BYTE nOldOffset, nOldHiOffset;
- BYTE nCutOff, nResonance;
- BYTE nRetrigCount, nRetrigParam;
- BYTE nTremorCount, nTremorParam;
- BYTE nPatternLoop, nPatternLoopCount;
- BYTE nRowNote, nRowInstr;
- BYTE nRowVolCmd, nRowVolume;
- BYTE nRowCommand, nRowParam;
- BYTE nLeftVU, nRightVU;
- BYTE nActiveMacro, nPadding;
+ /* First 32-bytes: Most used mixing information: don't change it */
+ signed char * pCurrentSample;
+ DWORD nPos;
+ DWORD nPosLo; /* actually 16-bit */
+ LONG nInc; /* 16.16 */
+ LONG nRightVol;
+ LONG nLeftVol;
+ LONG nRightRamp;
+ LONG nLeftRamp;
+ /* 2nd cache line */
+ DWORD nLength;
+ DWORD dwFlags;
+ DWORD nLoopStart;
+ DWORD nLoopEnd;
+ LONG nRampRightVol;
+ LONG nRampLeftVol;
+ LONG nFilter_Y1, nFilter_Y2, nFilter_Y3, nFilter_Y4;
+ LONG nFilter_A0, nFilter_B0, nFilter_B1;
+ LONG nROfs, nLOfs;
+ LONG nRampLength;
+ /* Information not used in the mixer */
+ signed char * pSample;
+ LONG nNewRightVol, nNewLeftVol;
+ LONG nRealVolume, nRealPan;
+ LONG nVolume, nPan, nFadeOutVol;
+ LONG nPeriod, nC4Speed, nPortamentoDest;
+ INSTRUMENTHEADER *pHeader;
+ MODINSTRUMENT *pInstrument;
+ DWORD nVolEnvPosition, nPanEnvPosition, nPitchEnvPosition;
+ DWORD nMasterChn, nVUMeter;
+ LONG nGlobalVol, nInsVol;
+ LONG nFineTune, nTranspose;
+ LONG nPortamentoSlide, nAutoVibDepth;
+ UINT nAutoVibPos, nVibratoPos, nTremoloPos, nPanbrelloPos;
+ /* 16-bit members */
+ signed short nVolSwing, nPanSwing;
+ /* 8-bit members */
+ BYTE nNote, nNNA;
+ BYTE nNewNote, nNewIns, nCommand, nArpeggio;
+ BYTE nOldVolumeSlide, nOldFineVolUpDown;
+ BYTE nOldPortaUpDown, nOldFinePortaUpDown;
+ BYTE nOldPanSlide, nOldChnVolSlide;
+ BYTE nVibratoType, nVibratoSpeed, nVibratoDepth;
+ BYTE nTremoloType, nTremoloSpeed, nTremoloDepth;
+ BYTE nPanbrelloType, nPanbrelloSpeed, nPanbrelloDepth;
+ BYTE nOldCmdEx, nOldVolParam, nOldTempo;
+ BYTE nOldOffset, nOldHiOffset;
+ BYTE nCutOff, nResonance;
+ BYTE nRetrigCount, nRetrigParam;
+ BYTE nTremorCount, nTremorParam;
+ BYTE nPatternLoop, nPatternLoopCount;
+ BYTE nRowNote, nRowInstr;
+ BYTE nRowVolCmd, nRowVolume;
+ BYTE nRowCommand, nRowParam;
+ BYTE nLeftVU, nRightVU;
+ BYTE nActiveMacro, nPadding;
} MODCHANNEL;
typedef struct _MODCHANNELSETTINGS
{
- UINT nPan;
- UINT nVolume;
- DWORD dwFlags;
- UINT nMixPlugin;
- char szName[MAX_CHANNELNAME]; /* changed from CHAR */
+ UINT nPan;
+ UINT nVolume;
+ DWORD dwFlags;
+ UINT nMixPlugin;
+ char szName[MAX_CHANNELNAME]; /* changed from CHAR */
} MODCHANNELSETTINGS;
typedef struct _MODCOMMAND
{
- BYTE note;
- BYTE instr;
- BYTE volcmd;
- BYTE command;
- BYTE vol;
- BYTE param;
+ BYTE note;
+ BYTE instr;
+ BYTE volcmd;
+ BYTE command;
+ BYTE vol;
+ BYTE param;
} MODCOMMAND, *LPMODCOMMAND;
/*////////////////////////////////////////////////////////////////// */
@@ -450,15 +448,14 @@ typedef struct _MODCOMMAND
class IMixPlugin
{
public:
- virtual int AddRef () = 0;
- virtual int Release () = 0;
- virtual void SaveAllParameters () = 0;
- virtual void RestoreAllParameters () = 0;
- virtual void Process (float *pOutL, float *pOutR, unsigned long nSamples) = 0;
- virtual void Init (unsigned long nFreq, int bReset) = 0;
- virtual void MidiSend (DWORD dwMidiCode) = 0;
- virtual void MidiCommand (UINT nMidiCh, UINT nMidiProg, UINT note, UINT vol) =
- 0;
+ virtual int AddRef() = 0;
+ virtual int Release() = 0;
+ virtual void SaveAllParameters() = 0;
+ virtual void RestoreAllParameters() = 0;
+ virtual void Process(float *pOutL, float *pOutR, unsigned long nSamples) = 0;
+ virtual void Init(unsigned long nFreq, int bReset) = 0;
+ virtual void MidiSend(DWORD dwMidiCode) = 0;
+ virtual void MidiCommand(UINT nMidiCh, UINT nMidiProg, UINT note, UINT vol) = 0;
};
@@ -468,60 +465,59 @@ public:
typedef struct _SNDMIXPLUGINSTATE
{
- DWORD dwFlags; /* MIXPLUG_XXXX */
- LONG nVolDecayL, nVolDecayR; /* Buffer click removal */
- int *pMixBuffer; /* Stereo effect send buffer */
- float *pOutBufferL; /* Temp storage for int -> float conversion */
- float *pOutBufferR;
+ DWORD dwFlags; /* MIXPLUG_XXXX */
+ LONG nVolDecayL, nVolDecayR; /* Buffer click removal */
+ int *pMixBuffer; /* Stereo effect send buffer */
+ float *pOutBufferL; /* Temp storage for int -> float conversion */
+ float *pOutBufferR;
} SNDMIXPLUGINSTATE, *PSNDMIXPLUGINSTATE;
typedef struct _SNDMIXPLUGININFO
{
- DWORD dwPluginId1;
- DWORD dwPluginId2;
- DWORD dwInputRouting; /* MIXPLUG_INPUTF_XXXX */
- DWORD dwOutputRouting; /* 0=mix 0x80+=fx */
- DWORD dwReserved[4]; /* Reserved for routing info */
- CHAR szName[32];
- CHAR szLibraryName[64]; /* original DLL name */
-} SNDMIXPLUGININFO, *PSNDMIXPLUGININFO; /* Size should be 128 */
+ DWORD dwPluginId1;
+ DWORD dwPluginId2;
+ DWORD dwInputRouting; /* MIXPLUG_INPUTF_XXXX */
+ DWORD dwOutputRouting; /* 0=mix 0x80+=fx */
+ DWORD dwReserved[4]; /* Reserved for routing info */
+ CHAR szName[32];
+ CHAR szLibraryName[64]; /* original DLL name */
+} SNDMIXPLUGININFO, *PSNDMIXPLUGININFO; /* Size should be 128 */
typedef struct _SNDMIXPLUGIN
{
- IMixPlugin *pMixPlugin;
- PSNDMIXPLUGINSTATE pMixState;
- ULONG nPluginDataSize;
- PVOID pPluginData;
- SNDMIXPLUGININFO Info;
+ IMixPlugin *pMixPlugin;
+ PSNDMIXPLUGINSTATE pMixState;
+ ULONG nPluginDataSize;
+ PVOID pPluginData;
+ SNDMIXPLUGININFO Info;
} SNDMIXPLUGIN, *PSNDMIXPLUGIN;
-typedef BOOL (*PMIXPLUGINCREATEPROC) (PSNDMIXPLUGIN);
+typedef BOOL (*PMIXPLUGINCREATEPROC)(PSNDMIXPLUGIN);
/*////////////////////////////////////////////////////////////////// */
-enum
-{
- MIDIOUT_START = 0,
- MIDIOUT_STOP,
- MIDIOUT_TICK,
- MIDIOUT_NOTEON,
- MIDIOUT_NOTEOFF,
- MIDIOUT_VOLUME,
- MIDIOUT_PAN,
- MIDIOUT_BANKSEL,
- MIDIOUT_PROGRAM
+enum {
+ MIDIOUT_START=0,
+ MIDIOUT_STOP,
+ MIDIOUT_TICK,
+ MIDIOUT_NOTEON,
+ MIDIOUT_NOTEOFF,
+ MIDIOUT_VOLUME,
+ MIDIOUT_PAN,
+ MIDIOUT_BANKSEL,
+ MIDIOUT_PROGRAM
};
typedef struct MODMIDICFG
{
- char szMidiGlb[9 * 32]; /* changed from CHAR */
- char szMidiSFXExt[16 * 32]; /* changed from CHAR */
- char szMidiZXXExt[128 * 32]; /* changed from CHAR */
+ char szMidiGlb[9*32]; /* changed from CHAR */
+ char szMidiSFXExt[16*32]; /* changed from CHAR */
+ char szMidiZXXExt[128*32]; /* changed from CHAR */
} MODMIDICFG, *LPMODMIDICFG;
-typedef VOID (*LPSNDMIXHOOKPROC) (int *, unsigned long, unsigned long); /* buffer, samples, channels */
+typedef VOID (* LPSNDMIXHOOKPROC)(int *, unsigned long, unsigned long); /* buffer, samples, channels */
@@ -529,343 +525,251 @@ typedef VOID (*LPSNDMIXHOOKPROC) (int *, unsigned long, unsigned long); /* buffe
class CSoundFile
/*============== */
{
-public: /* Static Members */
- static UINT m_nXBassDepth, m_nXBassRange;
- static UINT m_nReverbDepth, m_nReverbDelay, gnReverbType;
- static UINT m_nProLogicDepth, m_nProLogicDelay;
- static UINT m_nStereoSeparation;
- static UINT m_nMaxMixChannels;
- static LONG m_nStreamVolume;
- static DWORD gdwSysInfo, gdwSoundSetup, gdwMixingFreq, gnBitsPerSample,
- gnChannels;
- static UINT gnAGC, gnVolumeRampSamples, gnVUMeter, gnCPUUsage;
- static LPSNDMIXHOOKPROC gpSndMixHook;
- static PMIXPLUGINCREATEPROC gpMixPluginCreateProc;
-
-public: /* for Editing */
- MODCHANNEL Chn[MAX_CHANNELS]; /* Channels */
- UINT ChnMix[MAX_CHANNELS]; /* Channels to be mixed */
- MODINSTRUMENT Ins[MAX_SAMPLES]; /* Instruments */
- INSTRUMENTHEADER *Headers[MAX_INSTRUMENTS]; /* Instrument Headers */
- MODCHANNELSETTINGS ChnSettings[MAX_BASECHANNELS]; /* Channels settings */
- MODCOMMAND *Patterns[MAX_PATTERNS]; /* Patterns */
- WORD PatternSize[MAX_PATTERNS]; /* Patterns Lengths */
- BYTE Order[MAX_ORDERS]; /* Pattern Orders */
- MODMIDICFG m_MidiCfg; /* Midi macro config table */
- SNDMIXPLUGIN m_MixPlugins[MAX_MIXPLUGINS]; /* Mix plugins */
- UINT m_nDefaultSpeed, m_nDefaultTempo, m_nDefaultGlobalVolume;
- DWORD m_dwSongFlags; /* Song flags SONG_XXXX */
- UINT m_nChannels, m_nMixChannels, m_nMixStat, m_nBufferCount;
- UINT m_nType, m_nSamples, m_nInstruments;
- UINT m_nTickCount, m_nTotalCount, m_nPatternDelay, m_nFrameDelay;
- UINT m_nMusicSpeed, m_nMusicTempo;
- UINT m_nNextRow, m_nRow;
- UINT m_nPattern, m_nCurrentPattern, m_nNextPattern, m_nRestartPos;
- UINT m_nMasterVolume, m_nGlobalVolume, m_nSongPreAmp;
- UINT m_nFreqFactor, m_nTempoFactor, m_nOldGlbVolSlide;
- LONG m_nMinPeriod, m_nMaxPeriod, m_nRepeatCount, m_nInitialRepeatCount;
- DWORD m_nGlobalFadeSamples, m_nGlobalFadeMaxSamples;
- UINT m_nMaxOrderPosition;
- UINT m_nPatternNames;
- LPSTR m_lpszSongComments, m_lpszPatternNames;
- char m_szNames[MAX_INSTRUMENTS][32]; /* changed from CHAR */
- CHAR CompressionTable[16];
+public: /* Static Members */
+ static UINT m_nXBassDepth, m_nXBassRange;
+ static UINT m_nReverbDepth, m_nReverbDelay, gnReverbType;
+ static UINT m_nProLogicDepth, m_nProLogicDelay;
+ static UINT m_nStereoSeparation;
+ static UINT m_nMaxMixChannels;
+ static LONG m_nStreamVolume;
+ static DWORD gdwSysInfo, gdwSoundSetup, gdwMixingFreq, gnBitsPerSample, gnChannels;
+ static UINT gnAGC, gnVolumeRampSamples, gnVUMeter, gnCPUUsage;
+ static LPSNDMIXHOOKPROC gpSndMixHook;
+ static PMIXPLUGINCREATEPROC gpMixPluginCreateProc;
+
+public: /* for Editing */
+ MODCHANNEL Chn[MAX_CHANNELS]; /* Channels */
+ UINT ChnMix[MAX_CHANNELS]; /* Channels to be mixed */
+ MODINSTRUMENT Ins[MAX_SAMPLES]; /* Instruments */
+ INSTRUMENTHEADER *Headers[MAX_INSTRUMENTS]; /* Instrument Headers */
+ MODCHANNELSETTINGS ChnSettings[MAX_BASECHANNELS]; /* Channels settings */
+ MODCOMMAND *Patterns[MAX_PATTERNS]; /* Patterns */
+ WORD PatternSize[MAX_PATTERNS]; /* Patterns Lengths */
+ BYTE Order[MAX_ORDERS]; /* Pattern Orders */
+ MODMIDICFG m_MidiCfg; /* Midi macro config table */
+ SNDMIXPLUGIN m_MixPlugins[MAX_MIXPLUGINS]; /* Mix plugins */
+ UINT m_nDefaultSpeed, m_nDefaultTempo, m_nDefaultGlobalVolume;
+ DWORD m_dwSongFlags; /* Song flags SONG_XXXX */
+ UINT m_nChannels, m_nMixChannels, m_nMixStat, m_nBufferCount;
+ UINT m_nType, m_nSamples, m_nInstruments;
+ UINT m_nTickCount, m_nTotalCount, m_nPatternDelay, m_nFrameDelay;
+ UINT m_nMusicSpeed, m_nMusicTempo;
+ UINT m_nNextRow, m_nRow;
+ UINT m_nPattern,m_nCurrentPattern,m_nNextPattern,m_nRestartPos;
+ UINT m_nMasterVolume, m_nGlobalVolume, m_nSongPreAmp;
+ UINT m_nFreqFactor, m_nTempoFactor, m_nOldGlbVolSlide;
+ LONG m_nMinPeriod, m_nMaxPeriod, m_nRepeatCount, m_nInitialRepeatCount;
+ DWORD m_nGlobalFadeSamples, m_nGlobalFadeMaxSamples;
+ UINT m_nMaxOrderPosition;
+ UINT m_nPatternNames;
+ LPSTR m_lpszSongComments, m_lpszPatternNames;
+ char m_szNames[MAX_INSTRUMENTS][32]; /* changed from CHAR */
+ CHAR CompressionTable[16];
public:
- CSoundFile ();
- ~CSoundFile ();
+ CSoundFile();
+ ~CSoundFile();
public:
- BOOL Create (LPCBYTE lpStream, DWORD dwMemLength = 0);
- BOOL Destroy ();
- UINT GetType () const
- {
- return m_nType;
- }
- UINT GetNumChannels () const;
- UINT GetLogicalChannels () const
- {
- return m_nChannels;
- }
- BOOL SetMasterVolume (UINT vol, BOOL bAdjustAGC = FALSE);
- UINT GetMasterVolume () const
- {
- return m_nMasterVolume;
- }
- UINT GetNumPatterns () const;
- UINT GetNumInstruments () const;
- UINT GetNumSamples () const
- {
- return m_nSamples;
- }
- UINT GetCurrentPos () const;
- UINT GetCurrentPattern () const
- {
- return m_nPattern;
- }
- UINT GetCurrentOrder () const
- {
- return m_nCurrentPattern;
- }
- UINT GetSongComments (LPSTR s, UINT cbsize, UINT linesize = 32);
- UINT GetRawSongComments (LPSTR s, UINT cbsize, UINT linesize = 32);
- UINT GetMaxPosition () const;
- void SetCurrentPos (UINT nPos);
- void SetCurrentOrder (UINT nOrder);
- void GetTitle (LPSTR s) const
- {
- lstrcpyn (s, m_szNames[0], 32);
- }
- LPCSTR GetTitle () const
- {
- return m_szNames[0];
- }
- UINT GetSampleName (UINT nSample, LPSTR s = NULL) const;
- UINT GetInstrumentName (UINT nInstr, LPSTR s = NULL) const;
- UINT GetMusicSpeed () const
- {
- return m_nMusicSpeed;
- }
- UINT GetMusicTempo () const
- {
- return m_nMusicTempo;
- }
- DWORD GetLength (BOOL bAdjust, BOOL bTotal = FALSE);
- DWORD GetSongTime ()
- {
- return GetLength (FALSE, TRUE);
- }
- void SetRepeatCount (int n)
- {
- m_nRepeatCount = n;
- m_nInitialRepeatCount = n;
- }
- int GetRepeatCount () const
- {
- return m_nRepeatCount;
- }
- BOOL IsPaused () const
- {
- return (m_dwSongFlags & SONG_PAUSED) ? TRUE : FALSE;
- }
- void LoopPattern (int nPat, int nRow = 0);
- void CheckCPUUsage (UINT nCPU);
- BOOL SetPatternName (UINT nPat, LPCSTR lpszName);
- BOOL GetPatternName (UINT nPat, LPSTR lpszName, UINT cbSize =
- MAX_PATTERNNAME) const;
- /* Module Loaders */
- BOOL ReadXM (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadS3M (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadMod (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadMed (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadMTM (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadSTM (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadIT (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL Read669 (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadUlt (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadWav (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadDSM (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadFAR (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadAMS (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadAMS2 (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadMDL (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadOKT (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadDMF (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadPTM (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadDBM (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadAMF (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadMT2 (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadPSM (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadJ2B (LPCBYTE lpStream, DWORD dwMemLength);
- BOOL ReadUMX (LPCBYTE lpStream, DWORD dwMemLength);
-
- /* Save Functions */
+ BOOL Create(LPCBYTE lpStream, DWORD dwMemLength=0);
+ BOOL Destroy();
+ UINT GetType() const { return m_nType; }
+ UINT GetNumChannels() const;
+ UINT GetLogicalChannels() const { return m_nChannels; }
+ BOOL SetMasterVolume(UINT vol, BOOL bAdjustAGC=FALSE);
+ UINT GetMasterVolume() const { return m_nMasterVolume; }
+ UINT GetNumPatterns() const;
+ UINT GetNumInstruments() const;
+ UINT GetNumSamples() const { return m_nSamples; }
+ UINT GetCurrentPos() const;
+ UINT GetCurrentPattern() const { return m_nPattern; }
+ UINT GetCurrentOrder() const { return m_nCurrentPattern; }
+ UINT GetSongComments(LPSTR s, UINT cbsize, UINT linesize=32);
+ UINT GetRawSongComments(LPSTR s, UINT cbsize, UINT linesize=32);
+ UINT GetMaxPosition() const;
+ void SetCurrentPos(UINT nPos);
+ void SetCurrentOrder(UINT nOrder);
+ void GetTitle(LPSTR s) const { lstrcpyn(s,m_szNames[0],32); }
+ LPCSTR GetTitle() const { return m_szNames[0]; }
+ UINT GetSampleName(UINT nSample,LPSTR s=NULL) const;
+ UINT GetInstrumentName(UINT nInstr,LPSTR s=NULL) const;
+ UINT GetMusicSpeed() const { return m_nMusicSpeed; }
+ UINT GetMusicTempo() const { return m_nMusicTempo; }
+ DWORD GetLength(BOOL bAdjust, BOOL bTotal=FALSE);
+ DWORD GetSongTime() { return GetLength(FALSE, TRUE); }
+ void SetRepeatCount(int n) { m_nRepeatCount = n; m_nInitialRepeatCount = n; }
+ int GetRepeatCount() const { return m_nRepeatCount; }
+ BOOL IsPaused() const { return (m_dwSongFlags & SONG_PAUSED) ? TRUE : FALSE; }
+ void LoopPattern(int nPat, int nRow=0);
+ void CheckCPUUsage(UINT nCPU);
+ BOOL SetPatternName(UINT nPat, LPCSTR lpszName);
+ BOOL GetPatternName(UINT nPat, LPSTR lpszName, UINT cbSize=MAX_PATTERNNAME) const;
+ /* Module Loaders */
+ BOOL ReadXM(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadS3M(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadMod(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadMed(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadMTM(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadSTM(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadIT(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL Read669(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadUlt(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadWav(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadDSM(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadFAR(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadAMS(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadAMS2(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadMDL(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadOKT(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadDMF(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadPTM(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadDBM(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadAMF(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadMT2(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadPSM(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadJ2B(LPCBYTE lpStream, DWORD dwMemLength);
+ BOOL ReadUMX(LPCBYTE lpStream, DWORD dwMemLength);
+ /* Save Functions */
#ifndef MODPLUG_NO_FILESAVE
- UINT WriteSample (FILE * f, MODINSTRUMENT * pins, UINT nFlags, UINT nMaxLen =
- 0);
- BOOL SaveXM (LPCSTR lpszFileName, UINT nPacking = 0);
- BOOL SaveS3M (LPCSTR lpszFileName, UINT nPacking = 0);
- BOOL SaveMod (LPCSTR lpszFileName, UINT nPacking = 0);
- BOOL SaveIT (LPCSTR lpszFileName, UINT nPacking = 0);
+ UINT WriteSample(FILE *f, MODINSTRUMENT *pins, UINT nFlags, UINT nMaxLen=0);
+ BOOL SaveXM(LPCSTR lpszFileName, UINT nPacking=0);
+ BOOL SaveS3M(LPCSTR lpszFileName, UINT nPacking=0);
+ BOOL SaveMod(LPCSTR lpszFileName, UINT nPacking=0);
+ BOOL SaveIT(LPCSTR lpszFileName, UINT nPacking=0);
#endif /* MODPLUG_NO_FILESAVE */
- /* MOD Convert function */
- UINT GetBestSaveFormat () const;
- UINT GetSaveFormats () const;
- void ConvertModCommand (MODCOMMAND *) const;
- void S3MConvert (MODCOMMAND * m, BOOL bIT) const;
- void S3MSaveConvert (UINT * pcmd, UINT * pprm, BOOL bIT) const;
- WORD ModSaveCommand (const MODCOMMAND * m, BOOL bXM) const;
+ /* MOD Convert function */
+ UINT GetBestSaveFormat() const;
+ UINT GetSaveFormats() const;
+ void ConvertModCommand(MODCOMMAND *) const;
+ void S3MConvert(MODCOMMAND *m, BOOL bIT) const;
+ void S3MSaveConvert(UINT *pcmd, UINT *pprm, BOOL bIT) const;
+ WORD ModSaveCommand(const MODCOMMAND *m, BOOL bXM) const;
public:
- /* Real-time sound functions */
- VOID ResetChannels ();
-
- UINT Read (LPVOID lpBuffer, UINT cbBuffer);
- UINT CreateStereoMix (int count);
- BOOL FadeSong (UINT msec);
- BOOL GlobalFadeSong (UINT msec);
- UINT GetTotalTickCount () const
- {
- return m_nTotalCount;
- }
- VOID ResetTotalTickCount ()
- {
- m_nTotalCount = 0;
- }
+ /* Real-time sound functions */
+ VOID ResetChannels();
-public:
- /* Mixer Config */
- static BOOL InitPlayer (BOOL bReset = FALSE);
- static BOOL SetWaveConfig (UINT nRate, UINT nBits, UINT nChannels, BOOL bMMX =
- FALSE);
- static BOOL SetResamplingMode (UINT nMode); /* SRCMODE_XXXX */
- static BOOL IsStereo ()
- {
- return (gnChannels > 1) ? TRUE : FALSE;
- }
- static DWORD GetSampleRate ()
- {
- return gdwMixingFreq;
- }
- static DWORD GetBitsPerSample ()
- {
- return gnBitsPerSample;
- }
- static DWORD InitSysInfo ();
- static DWORD GetSysInfo ()
- {
- return gdwSysInfo;
- }
- /* AGC */
- static BOOL GetAGC ()
- {
- return (gdwSoundSetup & SNDMIX_AGC) ? TRUE : FALSE;
- }
- static void SetAGC (BOOL b);
- static void ResetAGC ();
- static void ProcessAGC (int count);
-
- /*GCCFIX -- added these functions back in! */
- static BOOL SetWaveConfigEx (BOOL bSurround, BOOL bNoOverSampling,
- BOOL bReverb, BOOL hqido, BOOL bMegaBass, BOOL bNR, BOOL bEQ);
- /* DSP Effects */
- static void InitializeDSP (BOOL bReset);
- static void ProcessStereoDSP (int count);
- static void ProcessMonoDSP (int count);
-
- /* [Reverb level 0(quiet)-100(loud)], [delay in ms, usually 40-200ms] */
- static BOOL SetReverbParameters (UINT nDepth, UINT nDelay);
-
- /* [XBass level 0(quiet)-100(loud)], [cutoff in Hz 10-100] */
- static BOOL SetXBassParameters (UINT nDepth, UINT nRange);
-
- /* [Surround level 0(quiet)-100(heavy)] [delay in ms, usually 5-40ms] */
- static BOOL SetSurroundParameters (UINT nDepth, UINT nDelay);
+ UINT Read(LPVOID lpBuffer, UINT cbBuffer);
+ UINT CreateStereoMix(int count);
+ BOOL FadeSong(UINT msec);
+ BOOL GlobalFadeSong(UINT msec);
+ UINT GetTotalTickCount() const { return m_nTotalCount; }
+ VOID ResetTotalTickCount() { m_nTotalCount = 0; }
public:
- BOOL ReadNote ();
- BOOL ProcessRow ();
- BOOL ProcessEffects ();
- UINT GetNNAChannel (UINT nChn) const;
- void CheckNNA (UINT nChn, UINT instr, int note, BOOL bForceCut);
- void NoteChange (UINT nChn, int note, BOOL bPorta = FALSE, BOOL bResetEnv =
- TRUE);
- void InstrumentChange (MODCHANNEL * pChn, UINT instr, BOOL bPorta =
- FALSE, BOOL bUpdVol = TRUE, BOOL bResetEnv = TRUE);
- /* Channel Effects */
- void PortamentoUp (MODCHANNEL * pChn, UINT param);
- void PortamentoDown (MODCHANNEL * pChn, UINT param);
- void FinePortamentoUp (MODCHANNEL * pChn, UINT param);
- void FinePortamentoDown (MODCHANNEL * pChn, UINT param);
- void ExtraFinePortamentoUp (MODCHANNEL * pChn, UINT param);
- void ExtraFinePortamentoDown (MODCHANNEL * pChn, UINT param);
- void TonePortamento (MODCHANNEL * pChn, UINT param);
- void Vibrato (MODCHANNEL * pChn, UINT param);
- void FineVibrato (MODCHANNEL * pChn, UINT param);
- void VolumeSlide (MODCHANNEL * pChn, UINT param);
- void PanningSlide (MODCHANNEL * pChn, UINT param);
- void ChannelVolSlide (MODCHANNEL * pChn, UINT param);
- void FineVolumeUp (MODCHANNEL * pChn, UINT param);
- void FineVolumeDown (MODCHANNEL * pChn, UINT param);
- void Tremolo (MODCHANNEL * pChn, UINT param);
- void Panbrello (MODCHANNEL * pChn, UINT param);
- void RetrigNote (UINT nChn, UINT param);
- void NoteCut (UINT nChn, UINT nTick);
- void KeyOff (UINT nChn);
- int PatternLoop (MODCHANNEL *, UINT param);
- void ExtendedMODCommands (UINT nChn, UINT param);
- void ExtendedS3MCommands (UINT nChn, UINT param);
- void ExtendedChannelEffect (MODCHANNEL *, UINT param);
- void ProcessMidiMacro (UINT nChn, LPCSTR pszMidiMacro, UINT param = 0);
- void SetupChannelFilter (MODCHANNEL * pChn, BOOL bReset, int flt_modifier =
- 256) const;
- /* Low-Level effect processing */
- void DoFreqSlide (MODCHANNEL * pChn, LONG nFreqSlide);
-
- /* Global Effects */
- void SetTempo (UINT param);
- void SetSpeed (UINT param);
- void GlobalVolSlide (UINT param);
- DWORD IsSongFinished (UINT nOrder, UINT nRow) const;
- BOOL IsValidBackwardJump (UINT nStartOrder, UINT nStartRow, UINT nJumpOrder,
- UINT nJumpRow) const;
- /* Read/Write sample functions */
- signed char GetDeltaValue (signed char prev, UINT n) const
- {
- return (signed char) (prev + CompressionTable[n & 0x0F]);
- }
- UINT PackSample (int &sample, int next);
- BOOL CanPackSample (LPSTR pSample, UINT nLen, UINT nPacking, BYTE * result =
- NULL);
- UINT ReadSample (MODINSTRUMENT * pIns, UINT nFlags, LPCSTR pMemFile,
- DWORD dwMemLength);
- BOOL DestroySample (UINT nSample);
- BOOL DestroyInstrument (UINT nInstr);
- BOOL IsSampleUsed (UINT nSample);
- BOOL IsInstrumentUsed (UINT nInstr);
- BOOL RemoveInstrumentSamples (UINT nInstr);
- UINT DetectUnusedSamples (BOOL *);
- BOOL RemoveSelectedSamples (BOOL *);
- void AdjustSampleLoop (MODINSTRUMENT * pIns);
-
- /* I/O from another sound file */
- BOOL ReadInstrumentFromSong (UINT nInstr, CSoundFile *, UINT nSrcInstrument);
- BOOL ReadSampleFromSong (UINT nSample, CSoundFile *, UINT nSrcSample);
-
- /* Period/Note functions */
- UINT GetNoteFromPeriod (UINT period) const;
- UINT GetPeriodFromNote (UINT note, int nFineTune, UINT nC4Speed) const;
- UINT GetFreqFromPeriod (UINT period, UINT nC4Speed, int nPeriodFrac =
- 0) const;
- /* Misc functions */
- MODINSTRUMENT *GetSample (UINT n)
- {
- return Ins + n;
- }
- void ResetMidiCfg ();
- UINT MapMidiInstrument (DWORD dwProgram, UINT nChannel, UINT nNote);
- BOOL ITInstrToMPT (const void *p, INSTRUMENTHEADER * penv, UINT trkvers);
- UINT SaveMixPlugins (FILE * f = NULL, BOOL bUpdate = TRUE);
- UINT LoadMixPlugins (const void *pData, UINT nLen);
-
+ /* Mixer Config */
+ static BOOL InitPlayer(BOOL bReset=FALSE);
+ static BOOL SetWaveConfig(UINT nRate,UINT nBits,UINT nChannels,BOOL bMMX=FALSE);
+ static BOOL SetResamplingMode(UINT nMode); /* SRCMODE_XXXX */
+ static BOOL IsStereo() { return (gnChannels > 1) ? TRUE : FALSE; }
+ static DWORD GetSampleRate() { return gdwMixingFreq; }
+ static DWORD GetBitsPerSample() { return gnBitsPerSample; }
+ static DWORD InitSysInfo();
+ static DWORD GetSysInfo() { return gdwSysInfo; }
+ /* AGC */
+ static BOOL GetAGC() { return (gdwSoundSetup & SNDMIX_AGC) ? TRUE : FALSE; }
+ static void SetAGC(BOOL b);
+ static void ResetAGC();
+ static void ProcessAGC(int count);
+
+ /*GCCFIX -- added these functions back in! */
+ static BOOL SetWaveConfigEx(BOOL bSurround,BOOL bNoOverSampling,BOOL bReverb,BOOL hqido,BOOL bMegaBass,BOOL bNR,BOOL bEQ);
+ /* DSP Effects */
+ static void InitializeDSP(BOOL bReset);
+ static void ProcessStereoDSP(int count);
+ static void ProcessMonoDSP(int count);
+ /* [Reverb level 0(quiet)-100(loud)], [delay in ms, usually 40-200ms] */
+ static BOOL SetReverbParameters(UINT nDepth, UINT nDelay);
+ /* [XBass level 0(quiet)-100(loud)], [cutoff in Hz 10-100] */
+ static BOOL SetXBassParameters(UINT nDepth, UINT nRange);
+ /* [Surround level 0(quiet)-100(heavy)] [delay in ms, usually 5-40ms] */
+ static BOOL SetSurroundParameters(UINT nDepth, UINT nDelay);
+public:
+ BOOL ReadNote();
+ BOOL ProcessRow();
+ BOOL ProcessEffects();
+ UINT GetNNAChannel(UINT nChn) const;
+ void CheckNNA(UINT nChn, UINT instr, int note, BOOL bForceCut);
+ void NoteChange(UINT nChn, int note, BOOL bPorta=FALSE, BOOL bResetEnv=TRUE);
+ void InstrumentChange(MODCHANNEL *pChn, UINT instr, BOOL bPorta=FALSE,BOOL bUpdVol=TRUE,BOOL bResetEnv=TRUE);
+ /* Channel Effects */
+ void PortamentoUp(MODCHANNEL *pChn, UINT param);
+ void PortamentoDown(MODCHANNEL *pChn, UINT param);
+ void FinePortamentoUp(MODCHANNEL *pChn, UINT param);
+ void FinePortamentoDown(MODCHANNEL *pChn, UINT param);
+ void ExtraFinePortamentoUp(MODCHANNEL *pChn, UINT param);
+ void ExtraFinePortamentoDown(MODCHANNEL *pChn, UINT param);
+ void TonePortamento(MODCHANNEL *pChn, UINT param);
+ void Vibrato(MODCHANNEL *pChn, UINT param);
+ void FineVibrato(MODCHANNEL *pChn, UINT param);
+ void VolumeSlide(MODCHANNEL *pChn, UINT param);
+ void PanningSlide(MODCHANNEL *pChn, UINT param);
+ void ChannelVolSlide(MODCHANNEL *pChn, UINT param);
+ void FineVolumeUp(MODCHANNEL *pChn, UINT param);
+ void FineVolumeDown(MODCHANNEL *pChn, UINT param);
+ void Tremolo(MODCHANNEL *pChn, UINT param);
+ void Panbrello(MODCHANNEL *pChn, UINT param);
+ void RetrigNote(UINT nChn, UINT param);
+ void NoteCut(UINT nChn, UINT nTick);
+ void KeyOff(UINT nChn);
+ int PatternLoop(MODCHANNEL *, UINT param);
+ void ExtendedMODCommands(UINT nChn, UINT param);
+ void ExtendedS3MCommands(UINT nChn, UINT param);
+ void ExtendedChannelEffect(MODCHANNEL *, UINT param);
+ void ProcessMidiMacro(UINT nChn, LPCSTR pszMidiMacro, UINT param=0);
+ void SetupChannelFilter(MODCHANNEL *pChn, BOOL bReset, int flt_modifier=256) const;
+ /* Low-Level effect processing */
+ void DoFreqSlide(MODCHANNEL *pChn, LONG nFreqSlide);
+ /* Global Effects */
+ void SetTempo(UINT param);
+ void SetSpeed(UINT param);
+ void GlobalVolSlide(UINT param);
+ DWORD IsSongFinished(UINT nOrder, UINT nRow) const;
+ BOOL IsValidBackwardJump(UINT nStartOrder, UINT nStartRow, UINT nJumpOrder, UINT nJumpRow) const;
+ /* Read/Write sample functions */
+ signed char GetDeltaValue(signed char prev, UINT n) const { return (signed char)(prev + CompressionTable[n & 0x0F]); }
+ UINT PackSample(int &sample, int next);
+ BOOL CanPackSample(LPSTR pSample, UINT nLen, UINT nPacking, BYTE *result=NULL);
+ UINT ReadSample(MODINSTRUMENT *pIns, UINT nFlags, LPCSTR pMemFile, DWORD dwMemLength);
+ BOOL DestroySample(UINT nSample);
+ BOOL DestroyInstrument(UINT nInstr);
+ BOOL IsSampleUsed(UINT nSample);
+ BOOL IsInstrumentUsed(UINT nInstr);
+ BOOL RemoveInstrumentSamples(UINT nInstr);
+ UINT DetectUnusedSamples(BOOL *);
+ BOOL RemoveSelectedSamples(BOOL *);
+ void AdjustSampleLoop(MODINSTRUMENT *pIns);
+ /* I/O from another sound file */
+ BOOL ReadInstrumentFromSong(UINT nInstr, CSoundFile *, UINT nSrcInstrument);
+ BOOL ReadSampleFromSong(UINT nSample, CSoundFile *, UINT nSrcSample);
+ /* Period/Note functions */
+ UINT GetNoteFromPeriod(UINT period) const;
+ UINT GetPeriodFromNote(UINT note, int nFineTune, UINT nC4Speed) const;
+ UINT GetFreqFromPeriod(UINT period, UINT nC4Speed, int nPeriodFrac=0) const;
+ /* Misc functions */
+ MODINSTRUMENT *GetSample(UINT n) { return Ins+n; }
+ void ResetMidiCfg();
+ UINT MapMidiInstrument(DWORD dwProgram, UINT nChannel, UINT nNote);
+ BOOL ITInstrToMPT(const void *p, INSTRUMENTHEADER *penv, UINT trkvers);
+ UINT SaveMixPlugins(FILE *f=NULL, BOOL bUpdate=TRUE);
+ UINT LoadMixPlugins(const void *pData, UINT nLen);
#ifndef NO_FILTER
- DWORD CutOffToFrequency (UINT nCutOff, int flt_modifier = 256) const; /* [0-255] => [1-10KHz] */
+ DWORD CutOffToFrequency(UINT nCutOff, int flt_modifier=256) const; /* [0-255] => [1-10KHz] */
#endif
- /* Static helper functions */
+ /* Static helper functions */
public:
- static DWORD TransposeToFrequency (int transp, int ftune = 0);
- static int FrequencyToTranspose (DWORD freq);
- static void FrequencyToTranspose (MODINSTRUMENT * psmp);
+ static DWORD TransposeToFrequency(int transp, int ftune=0);
+ static int FrequencyToTranspose(DWORD freq);
+ static void FrequencyToTranspose(MODINSTRUMENT *psmp);
- /* System-Dependant functions */
+ /* System-Dependant functions */
public:
- static MODCOMMAND *AllocatePattern (UINT rows, UINT nchns);
- static signed char *AllocateSample (UINT nbytes);
- static void FreePattern (LPVOID pat);
- static void FreeSample (LPVOID p);
- static UINT Normalize24BitBuffer (LPBYTE pbuffer, UINT cbsizebytes,
- DWORD lmax24, DWORD dwByteInc);
+ static MODCOMMAND *AllocatePattern(UINT rows, UINT nchns);
+ static signed char* AllocateSample(UINT nbytes);
+ static void FreePattern(LPVOID pat);
+ static void FreeSample(LPVOID p);
+ static UINT Normalize24BitBuffer(LPBYTE pbuffer, UINT cbsizebytes, DWORD lmax24, DWORD dwByteInc);
};
@@ -908,88 +812,88 @@ public:
typedef struct WAVEFILEHEADER
{
- DWORD id_RIFF; /* "RIFF" */
- DWORD filesize; /* file length-8 */
- DWORD id_WAVE;
+ DWORD id_RIFF; /* "RIFF" */
+ DWORD filesize; /* file length-8 */
+ DWORD id_WAVE;
} WAVEFILEHEADER;
typedef struct WAVEFORMATHEADER
{
- DWORD id_fmt; /* "fmt " */
- DWORD hdrlen; /* 16 */
- WORD format; /* 1 */
- WORD channels; /* 1:mono, 2:stereo */
- DWORD freqHz; /* sampling freq */
- DWORD bytessec; /* bytes/sec=freqHz*samplesize */
- WORD samplesize; /* sizeof(sample) */
- WORD bitspersample; /* bits per sample (8/16) */
+ DWORD id_fmt; /* "fmt " */
+ DWORD hdrlen; /* 16 */
+ WORD format; /* 1 */
+ WORD channels; /* 1:mono, 2:stereo */
+ DWORD freqHz; /* sampling freq */
+ DWORD bytessec; /* bytes/sec=freqHz*samplesize */
+ WORD samplesize; /* sizeof(sample) */
+ WORD bitspersample; /* bits per sample (8/16) */
} WAVEFORMATHEADER;
typedef struct WAVEDATAHEADER
{
- DWORD id_data; /* "data" */
- DWORD length; /* length of data */
+ DWORD id_data; /* "data" */
+ DWORD length; /* length of data */
} WAVEDATAHEADER;
typedef struct WAVESMPLHEADER
{
- /* SMPL */
- DWORD smpl_id; /* "smpl" -> 0x6C706D73 */
- DWORD smpl_len; /* length of smpl: 3Ch (54h with sustain loop) */
- DWORD dwManufacturer;
- DWORD dwProduct;
- DWORD dwSamplePeriod; /* 1000000000/freqHz */
- DWORD dwBaseNote; /* 3Ch = C-4 -> 60 + RelativeTone */
- DWORD dwPitchFraction;
- DWORD dwSMPTEFormat;
- DWORD dwSMPTEOffset;
- DWORD dwSampleLoops; /* number of loops */
- DWORD cbSamplerData;
+ /* SMPL */
+ DWORD smpl_id; /* "smpl" -> 0x6C706D73 */
+ DWORD smpl_len; /* length of smpl: 3Ch (54h with sustain loop) */
+ DWORD dwManufacturer;
+ DWORD dwProduct;
+ DWORD dwSamplePeriod; /* 1000000000/freqHz */
+ DWORD dwBaseNote; /* 3Ch = C-4 -> 60 + RelativeTone */
+ DWORD dwPitchFraction;
+ DWORD dwSMPTEFormat;
+ DWORD dwSMPTEOffset;
+ DWORD dwSampleLoops; /* number of loops */
+ DWORD cbSamplerData;
} WAVESMPLHEADER;
typedef struct SAMPLELOOPSTRUCT
{
- DWORD dwIdentifier;
- DWORD dwLoopType; /* 0=normal, 1=bidi */
- DWORD dwLoopStart;
- DWORD dwLoopEnd; /* Byte offset ? */
- DWORD dwFraction;
- DWORD dwPlayCount; /* Loop Count, 0=infinite */
+ DWORD dwIdentifier;
+ DWORD dwLoopType; /* 0=normal, 1=bidi */
+ DWORD dwLoopStart;
+ DWORD dwLoopEnd; /* Byte offset ? */
+ DWORD dwFraction;
+ DWORD dwPlayCount; /* Loop Count, 0=infinite */
} SAMPLELOOPSTRUCT;
typedef struct WAVESAMPLERINFO
{
- WAVESMPLHEADER wsiHdr;
- SAMPLELOOPSTRUCT wsiLoops[2];
+ WAVESMPLHEADER wsiHdr;
+ SAMPLELOOPSTRUCT wsiLoops[2];
} WAVESAMPLERINFO;
typedef struct WAVELISTHEADER
{
- DWORD list_id; /* "LIST" -> 0x5453494C */
- DWORD list_len;
- DWORD info; /* "INFO" */
+ DWORD list_id; /* "LIST" -> 0x5453494C */
+ DWORD list_len;
+ DWORD info; /* "INFO" */
} WAVELISTHEADER;
typedef struct WAVEEXTRAHEADER
{
- DWORD xtra_id; /* "xtra" -> 0x61727478 */
- DWORD xtra_len;
- DWORD dwFlags;
- WORD wPan;
- WORD wVolume;
- WORD wGlobalVol;
- WORD wReserved;
- BYTE nVibType;
- BYTE nVibSweep;
- BYTE nVibDepth;
- BYTE nVibRate;
+ DWORD xtra_id; /* "xtra" -> 0x61727478 */
+ DWORD xtra_len;
+ DWORD dwFlags;
+ WORD wPan;
+ WORD wVolume;
+ WORD wGlobalVol;
+ WORD wReserved;
+ BYTE nVibType;
+ BYTE nVibSweep;
+ BYTE nVibDepth;
+ BYTE nVibRate;
} WAVEEXTRAHEADER;
#pragma pack()
@@ -1019,8 +923,8 @@ typedef struct WAVEEXTRAHEADER
#define MOD2XMFineTune(k) ((int)( (signed char)((k)<<4) ))
#define XM2MODFineTune(k) ((int)( (k>>4)&0x0f ))
-int _muldiv (long a, long b, long c);
-int _muldivr (long a, long b, long c);
+int _muldiv(long a, long b, long c);
+int _muldivr(long a, long b, long c);
/* Byte swapping functions from the GNU C Library and libsdl */
@@ -1050,8 +954,8 @@ bswap_16 (unsigned short int __bsx)
static inline unsigned int
bswap_32 (unsigned int __bsx)
{
- return ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >> 8) |
- (((__bsx) & 0x0000ff00) << 8) | (((__bsx) & 0x000000ff) << 24));
+ return ((((__bsx) & 0xff000000) >> 24) | (((__bsx) & 0x00ff0000) >> 8) |
+ (((__bsx) & 0x0000ff00) << 8) | (((__bsx) & 0x000000ff) << 24));
}
#endif
diff --git a/gst/modplug/libmodplug/stdafx.h b/gst/modplug/libmodplug/stdafx.h
index 76b8f67f..dc71ea8f 100644
--- a/gst/modplug/libmodplug/stdafx.h
+++ b/gst/modplug/libmodplug/stdafx.h
@@ -19,10 +19,7 @@
#include <mmsystem.h>
#include <stdio.h>
-inline void
-ProcessPlugins (int n)
-{
-}
+inline void ProcessPlugins(int n) {}
#else
@@ -32,7 +29,7 @@ ProcessPlugins (int n)
typedef signed char CHAR;
typedef unsigned char UCHAR;
-typedef unsigned char *PUCHAR;
+typedef unsigned char* PUCHAR;
typedef unsigned short USHORT;
typedef unsigned long ULONG;
typedef unsigned long UINT;
@@ -40,24 +37,23 @@ typedef unsigned long DWORD;
typedef long LONG;
typedef unsigned short WORD;
typedef unsigned char BYTE;
-typedef unsigned char *LPBYTE;
+typedef unsigned char * LPBYTE;
typedef bool BOOL;
-typedef char *LPSTR;
-typedef void *LPVOID;
-typedef long *LPLONG;
-typedef unsigned long *LPDWORD;
-typedef unsigned short *LPWORD;
-typedef const char *LPCSTR;
+typedef char * LPSTR;
+typedef void * LPVOID;
+typedef long * LPLONG;
+typedef unsigned long * LPDWORD;
+typedef unsigned short * LPWORD;
+typedef const char * LPCSTR;
typedef long long LONGLONG;
-typedef void *PVOID;
+typedef void * PVOID;
typedef void VOID;
-inline LONG
-MulDiv (long a, long b, long c)
+inline LONG MulDiv (long a, long b, long c)
{
/* if (!c) return 0; */
- return ((unsigned long long) a * (unsigned long long) b) / c;
+ return ((unsigned long long) a * (unsigned long long) b ) / c;
}
#define MODPLUG_NO_FILESAVE
@@ -71,20 +67,15 @@ MulDiv (long a, long b, long c)
#define GHND 0
-inline signed char *
-GlobalAllocPtr (unsigned int, size_t size)
+inline signed char * GlobalAllocPtr(unsigned int, size_t size)
{
- signed char *p = (signed char *) malloc (size);
+ signed char * p = (signed char *) malloc(size);
- if (p != NULL)
- memset (p, 0, size);
+ if (p != NULL) memset(p, 0, size);
return p;
}
-inline void
-ProcessPlugins (int n)
-{
-}
+inline void ProcessPlugins(int n) {}
#define GlobalFreePtr(p) free((void *)(p))
@@ -102,3 +93,6 @@ ProcessPlugins (int n)
#endif /* MSC_VER */
#endif
+
+
+
diff --git a/gst/mpeg1sys/buffer.h b/gst/mpeg1sys/buffer.h
index 2a9fb71f..0624c3aa 100644
--- a/gst/mpeg1sys/buffer.h
+++ b/gst/mpeg1sys/buffer.h
@@ -24,9 +24,8 @@
#include <gst/gst.h>
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define MPEG1MUX_BUFFER_QUEUED(mb) (g_list_length((mb)->timecode_list))
#define MPEG1MUX_BUFFER_SPACE(mb) ((mb)->length)
@@ -42,104 +41,101 @@ extern "C"
#define FRAME_TYPE_PFRAME 3
#define FRAME_TYPE_AUDIO 4
- typedef struct _Mpeg1MuxBuffer Mpeg1MuxBuffer;
- typedef struct _Mpeg1MuxTimecode Mpeg1MuxTimecode;
-
- typedef struct video_struc /* Informationen ueber Video Stream */
- {
- unsigned int stream_length;
- unsigned int num_sequence;
- unsigned int num_seq_end;
- unsigned int num_pictures;
- unsigned int num_groups;
- unsigned int num_frames[4];
- unsigned int avg_frames[4];
-
- unsigned int horizontal_size;
- unsigned int vertical_size;
- unsigned int aspect_ratio;
- unsigned int picture_rate;
- unsigned int bit_rate;
- unsigned int comp_bit_rate;
- unsigned int vbv_buffer_size;
- unsigned int CSPF;
-
- guint64 PTS;
- guint64 DTS;
-
- guint64 current_PTS;
- guint64 current_DTS;
- guchar current_type;
-
- double secs_per_frame;
- gulong group_order, decoding_order;
- } Video_struc;
-
- typedef struct audio_struc /* Informationen ueber Audio Stream */
- {
- unsigned int stream_length;
- unsigned int num_syncword;
- unsigned int num_frames[2];
- unsigned int framesize;
- unsigned int layer;
- unsigned int protection;
- unsigned int bit_rate;
- unsigned int frequency;
- unsigned int mode;
- unsigned int mode_extension;
- unsigned int copyright;
- unsigned int original_copy;
- unsigned int emphasis;
-
- guint64 PTS;
-
- guint64 current_PTS;
-
- double samples_per_second;
- gulong decoding_order;
- } Audio_struc;
-
- struct _Mpeg1MuxTimecode
- {
- gulong length;
- gulong original_length;
- guchar frame_type;
- guint64 PTS;
- guint64 DTS;
- };
-
- struct _Mpeg1MuxBuffer
- {
- unsigned char *buffer;
- gulong length;
- gulong base;
- gulong scan_pos;
- gulong last_pos;
- gulong current_start;
- guchar buffer_type;
- guchar stream_id;
- gboolean new_frame;
- guint64 next_frame_time;
-
- union
- {
- Video_struc video;
- Audio_struc audio;
- } info;
-
- GList *timecode_list;
- GList *queued_list;
- };
-
- Mpeg1MuxBuffer *mpeg1mux_buffer_new (guchar type, guchar id);
-
- void mpeg1mux_buffer_queue (Mpeg1MuxBuffer * mb, GstBuffer * buf);
- void mpeg1mux_buffer_shrink (Mpeg1MuxBuffer * mb, gulong size);
- gulong mpeg1mux_buffer_update_queued (Mpeg1MuxBuffer * mb, guint64 scr);
+typedef struct _Mpeg1MuxBuffer Mpeg1MuxBuffer;
+typedef struct _Mpeg1MuxTimecode Mpeg1MuxTimecode;
+
+typedef struct video_struc /* Informationen ueber Video Stream */
+{
+ unsigned int stream_length ;
+ unsigned int num_sequence ;
+ unsigned int num_seq_end ;
+ unsigned int num_pictures ;
+ unsigned int num_groups ;
+ unsigned int num_frames[4] ;
+ unsigned int avg_frames[4] ;
+
+ unsigned int horizontal_size;
+ unsigned int vertical_size ;
+ unsigned int aspect_ratio ;
+ unsigned int picture_rate ;
+ unsigned int bit_rate ;
+ unsigned int comp_bit_rate ;
+ unsigned int vbv_buffer_size;
+ unsigned int CSPF ;
+
+ guint64 PTS;
+ guint64 DTS;
+
+ guint64 current_PTS;
+ guint64 current_DTS;
+ guchar current_type;
+
+ double secs_per_frame;
+ gulong group_order, decoding_order;
+} Video_struc;
+
+typedef struct audio_struc /* Informationen ueber Audio Stream */
+{
+ unsigned int stream_length ;
+ unsigned int num_syncword ;
+ unsigned int num_frames [2] ;
+ unsigned int framesize ;
+ unsigned int layer ;
+ unsigned int protection ;
+ unsigned int bit_rate ;
+ unsigned int frequency ;
+ unsigned int mode ;
+ unsigned int mode_extension ;
+ unsigned int copyright ;
+ unsigned int original_copy ;
+ unsigned int emphasis ;
+
+ guint64 PTS;
+
+ guint64 current_PTS;
+
+ double samples_per_second;
+ gulong decoding_order;
+} Audio_struc;
+
+struct _Mpeg1MuxTimecode {
+ gulong length;
+ gulong original_length;
+ guchar frame_type;
+ guint64 PTS;
+ guint64 DTS;
+};
+
+struct _Mpeg1MuxBuffer {
+ unsigned char *buffer;
+ gulong length;
+ gulong base;
+ gulong scan_pos;
+ gulong last_pos;
+ gulong current_start;
+ guchar buffer_type;
+ guchar stream_id;
+ gboolean new_frame;
+ guint64 next_frame_time;
+
+ union {
+ Video_struc video;
+ Audio_struc audio;
+ } info;
+
+ GList *timecode_list;
+ GList *queued_list;
+};
+
+Mpeg1MuxBuffer *mpeg1mux_buffer_new(guchar type, guchar id);
+
+void mpeg1mux_buffer_queue(Mpeg1MuxBuffer *mb, GstBuffer *buf);
+void mpeg1mux_buffer_shrink(Mpeg1MuxBuffer *mb, gulong size);
+gulong mpeg1mux_buffer_update_queued(Mpeg1MuxBuffer *mb, guint64 scr);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __BUFFER_H__ */
+#endif /* __BUFFER_H__ */
diff --git a/gst/mpeg1sys/gstmpeg1systemencode.h b/gst/mpeg1sys/gstmpeg1systemencode.h
index 0580cedc..44555332 100644
--- a/gst/mpeg1sys/gstmpeg1systemencode.h
+++ b/gst/mpeg1sys/gstmpeg1systemencode.h
@@ -29,9 +29,8 @@
#include "main.h"
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_SYSTEM_ENCODE \
@@ -45,68 +44,66 @@ extern "C"
#define GST_IS_SYSTEM_ENCODE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SYSTEM_ENCODE))
- typedef struct _GstMPEG1SystemEncode GstMPEG1SystemEncode;
- typedef struct _GstMPEG1SystemEncodeClass GstMPEG1SystemEncodeClass;
+typedef struct _GstMPEG1SystemEncode GstMPEG1SystemEncode;
+typedef struct _GstMPEG1SystemEncodeClass GstMPEG1SystemEncodeClass;
- struct _GstMPEG1SystemEncode
- {
- GstElement element;
+struct _GstMPEG1SystemEncode {
+ GstElement element;
- GstPad *srcpad;
+ GstPad *srcpad;
- gboolean have_setup;
+ gboolean have_setup;
- GMutex *lock;
+ GMutex *lock;
- guint num_audio_pads;
- guint num_video_pads;
+ guint num_audio_pads;
+ guint num_video_pads;
- Mpeg1MuxBuffer *audio_buffer;
- Mpeg1MuxBuffer *video_buffer;
+ Mpeg1MuxBuffer *audio_buffer;
+ Mpeg1MuxBuffer *video_buffer;
- Pack_struc *pack;
- Sys_header_struc *sys_header;
- Sector_struc *sector;
+ Pack_struc *pack;
+ Sys_header_struc *sys_header;
+ Sector_struc *sector;
- guint data_rate, video_rate, audio_rate;
- gdouble delay, audio_delay, video_delay;
- gdouble clock_cycles;
- gulong sectors_delay, video_delay_ms, audio_delay_ms;
- gulong startup_delay;
- gulong audio_buffer_size;
- gulong video_buffer_size;
- gulong mux_rate, dmux_rate;
- guint64 SCR;
- gint which_streams;
+ guint data_rate, video_rate, audio_rate;
+ gdouble delay, audio_delay, video_delay;
+ gdouble clock_cycles;
+ gulong sectors_delay, video_delay_ms, audio_delay_ms;
+ gulong startup_delay;
+ gulong audio_buffer_size;
+ gulong video_buffer_size;
+ gulong mux_rate, dmux_rate;
+ guint64 SCR;
+ gint which_streams;
- gint current_pack;
- gulong min_packet_data;
- gulong max_packet_data;
- gint packets_per_pack;
- gulong packet_size;
- gulong bytes_output;
+ gint current_pack;
+ gulong min_packet_data;
+ gulong max_packet_data;
+ gint packets_per_pack;
+ gulong packet_size;
+ gulong bytes_output;
- GList *mta;
+ GList *mta;
- /* stream input pads */
- GstPad *private_1_pad[8]; /* up to 8 ac3 audio tracks <grumble> */
- GstPad *private_2_pad;
- GstPad *video_pad[16];
- GstPad *audio_pad[32];
- };
+ /* stream input pads */
+ GstPad *private_1_pad[8]; /* up to 8 ac3 audio tracks <grumble> */
+ GstPad *private_2_pad;
+ GstPad *video_pad[16];
+ GstPad *audio_pad[32];
+};
- struct _GstMPEG1SystemEncodeClass
- {
- GstElementClass parent_class;
- };
+struct _GstMPEG1SystemEncodeClass {
+ GstElementClass parent_class;
+};
- GType gst_mpeg1_system_encode_get_type (void);
+GType gst_mpeg1_system_encode_get_type(void);
/* multplex.c */
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __SYSTEM_ENCODE_H__ */
+#endif /* __SYSTEM_ENCODE_H__ */
diff --git a/gst/mpeg1sys/main.h b/gst/mpeg1sys/main.h
index c09fc41b..434f57f5 100644
--- a/gst/mpeg1sys/main.h
+++ b/gst/mpeg1sys/main.h
@@ -45,82 +45,79 @@
#define ISO11172_END 0x000001b9
#define PACKET_START 0x000001
-#define CLOCKS 90000.0 /* System Clock Hertz */
+#define CLOCKS 90000.0 /* System Clock Hertz */
-#define AFTER_PACKET_LENGTH 15 /* No of non-data-bytes */
- /* following the packet */
- /* length field */
-#define LAST_SCR_BYTE_IN_PACK 9 /* No of bytes in pack */
- /* preceding, and */
- /* including, the SCR */
+#define AFTER_PACKET_LENGTH 15 /* No of non-data-bytes */
+ /* following the packet */
+ /* length field */
+#define LAST_SCR_BYTE_IN_PACK 9 /* No of bytes in pack */
+ /* preceding, and */
+ /* including, the SCR */
/* The following values for sys_header_length & size are only valid for */
/* System streams consisting of two basic streams. When wrapping around */
/* the system layer on a single video or a single audio stream, those */
/* values get decreased by 3. */
-#define SYS_HEADER_LENGTH 12 /* length of Sys Header */
- /* after start code and */
- /* length field */
+#define SYS_HEADER_LENGTH 12 /* length of Sys Header */
+ /* after start code and */
+ /* length field */
-#define SYS_HEADER_SIZE 18 /* incl. start code and */
- /* length field */
+#define SYS_HEADER_SIZE 18 /* incl. start code and */
+ /* length field */
#define PACK_HEADER_SIZE 12
#define PACKET_HEADER_SIZE 6
-#define MAX_SECTOR_SIZE 0x20000 /* Max Sektor Groesse */
+#define MAX_SECTOR_SIZE 0x20000 /* Max Sektor Groesse */
#define STREAMS_VIDEO 1
#define STREAMS_AUDIO 2
#define STREAMS_BOTH 3
-#define AUDIO_STREAMS 0xb8 /* Marker Audio Streams */
-#define VIDEO_STREAMS 0xb9 /* Marker Video Streams */
-#define AUDIO_STR_0 0xc0 /* Marker Audio Stream0 */
-#define VIDEO_STR_0 0xe0 /* Marker Video Stream0 */
-#define PADDING_STR 0xbe /* Marker Padding Stream */
+#define AUDIO_STREAMS 0xb8 /* Marker Audio Streams */
+#define VIDEO_STREAMS 0xb9 /* Marker Video Streams */
+#define AUDIO_STR_0 0xc0 /* Marker Audio Stream0 */
+#define VIDEO_STR_0 0xe0 /* Marker Video Stream0 */
+#define PADDING_STR 0xbe /* Marker Padding Stream*/
#define ZERO_STUFFING_BYTE 0
#define STUFFING_BYTE 0xff
#define RESERVED_BYTE 0xff
-#define TIMESTAMPS_NO 0 /* Flag NO timestamps */
-#define TIMESTAMPS_PTS 1 /* Flag PTS timestamp */
-#define TIMESTAMPS_PTS_DTS 2 /* Flag BOTH timestamps */
+#define TIMESTAMPS_NO 0 /* Flag NO timestamps */
+#define TIMESTAMPS_PTS 1 /* Flag PTS timestamp */
+#define TIMESTAMPS_PTS_DTS 2 /* Flag BOTH timestamps */
-#define MARKER_SCR 2 /* Marker SCR */
-#define MARKER_JUST_PTS 2 /* Marker only PTS */
-#define MARKER_PTS 3 /* Marker PTS */
-#define MARKER_DTS 1 /* Marker DTS */
-#define MARKER_NO_TIMESTAMPS 0x0f /* Marker NO timestamps */
+#define MARKER_SCR 2 /* Marker SCR */
+#define MARKER_JUST_PTS 2 /* Marker only PTS */
+#define MARKER_PTS 3 /* Marker PTS */
+#define MARKER_DTS 1 /* Marker DTS */
+#define MARKER_NO_TIMESTAMPS 0x0f /* Marker NO timestamps */
-#define STATUS_AUDIO_END 0 /* Statusmessage A end */
-#define STATUS_VIDEO_END 1 /* Statusmessage V end */
-#define STATUS_AUDIO_TIME_OUT 2 /* Statusmessage A out */
-#define STATUS_VIDEO_TIME_OUT 3 /* Statusmessage V out */
+#define STATUS_AUDIO_END 0 /* Statusmessage A end */
+#define STATUS_VIDEO_END 1 /* Statusmessage V end */
+#define STATUS_AUDIO_TIME_OUT 2 /* Statusmessage A out */
+#define STATUS_VIDEO_TIME_OUT 3 /* Statusmessage V out */
/*************************************************************************
Typ- und Strukturdefinitionen
*************************************************************************/
-typedef struct sector_struc /* A sector, can contain pack, sys header */
- /* and packet. */
-{
- unsigned char buf[MAX_SECTOR_SIZE];
- unsigned int length_of_sector;
- unsigned int length_of_packet_data;
- guint64 TS;
+typedef struct sector_struc /* A sector, can contain pack, sys header */
+ /* and packet. */
+{ unsigned char buf [MAX_SECTOR_SIZE] ;
+ unsigned int length_of_sector ;
+ unsigned int length_of_packet_data ;
+ guint64 TS ;
} Sector_struc;
-typedef struct pack_struc /* Pack Info */
-{
- unsigned char buf[PACK_HEADER_SIZE];
- guint64 SCR;
+typedef struct pack_struc /* Pack Info */
+{ unsigned char buf [PACK_HEADER_SIZE];
+ guint64 SCR;
} Pack_struc;
-typedef struct sys_header_struc /* System Header Info */
-{
- unsigned char buf[SYS_HEADER_SIZE];
+typedef struct sys_header_struc /* System Header Info */
+{ unsigned char buf [SYS_HEADER_SIZE];
} Sys_header_struc;
/*************************************************************************
@@ -128,20 +125,16 @@ typedef struct sys_header_struc /* System Header Info */
*************************************************************************/
/* systems.c */
-void create_sector (Sector_struc * sector, Pack_struc * pack,
- Sys_header_struc * sys_header, unsigned int packet_size,
- unsigned char *inputbuffer, unsigned char type, unsigned char buffer_scale,
- unsigned int buffer_size, unsigned char buffers, guint64 PTS, guint64 DTS,
- unsigned char timestamps, unsigned int which_streams);
-
-void create_pack (Pack_struc * pack, guint64 SCR, unsigned int mux_rate);
-
-void create_sys_header (Sys_header_struc * sys_header, unsigned int rate_bound,
- unsigned char audio_bound, unsigned char fixed, unsigned char CSPS,
- unsigned char audio_lock, unsigned char video_lock,
- unsigned char video_bound, unsigned char stream1,
- unsigned char buffer1_scale, unsigned int buffer1_size,
- unsigned char stream2, unsigned char buffer2_scale,
- unsigned int buffer2_size, unsigned int which_streams);
+void create_sector (Sector_struc *sector, Pack_struc *pack, Sys_header_struc *sys_header,
+ unsigned int packet_size, unsigned char *inputbuffer, unsigned char type, unsigned char buffer_scale,
+ unsigned int buffer_size, unsigned char buffers, guint64 PTS, guint64 DTS,
+ unsigned char timestamps, unsigned int which_streams);
+
+void create_pack (Pack_struc *pack, guint64 SCR, unsigned int mux_rate);
+
+void create_sys_header (Sys_header_struc *sys_header, unsigned int rate_bound, unsigned char audio_bound,
+ unsigned char fixed, unsigned char CSPS, unsigned char audio_lock, unsigned char video_lock,
+ unsigned char video_bound, unsigned char stream1, unsigned char buffer1_scale, unsigned int buffer1_size,
+ unsigned char stream2, unsigned char buffer2_scale, unsigned int buffer2_size, unsigned int which_streams);
#endif
diff --git a/gst/mpeg1videoparse/gstmp1videoparse.h b/gst/mpeg1videoparse/gstmp1videoparse.h
index 0fb4f161..b8b4f016 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.h
+++ b/gst/mpeg1videoparse/gstmp1videoparse.h
@@ -26,9 +26,8 @@
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_MP1VIDEOPARSE \
@@ -42,37 +41,35 @@ extern "C"
#define GST_IS_MP1VIDEOPARSE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MP1VIDEOPARSE))
- typedef struct _Mp1VideoParse Mp1VideoParse;
- typedef struct _Mp1VideoParseClass Mp1VideoParseClass;
+typedef struct _Mp1VideoParse Mp1VideoParse;
+typedef struct _Mp1VideoParseClass Mp1VideoParseClass;
- struct _Mp1VideoParse
- {
- GstElement element;
+struct _Mp1VideoParse {
+ GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
- GstBuffer *partialbuf; /* previous buffer (if carryover) */
- gulong next_buffer_offset;
- gboolean need_resync;
- gboolean in_flush;
- guint64 last_pts;
- gint picture_in_buffer;
+ GstBuffer *partialbuf; /* previous buffer (if carryover) */
+ gulong next_buffer_offset;
+ gboolean need_resync;
+ gboolean in_flush;
+ guint64 last_pts;
+ gint picture_in_buffer;
- gint width, height;
- gfloat fps, asr;
- };
+ gint width, height;
+ gfloat fps, asr;
+};
- struct _Mp1VideoParseClass
- {
- GstElementClass parent_class;
- };
+struct _Mp1VideoParseClass {
+ GstElementClass parent_class;
+};
- GType gst_mp1videoparse_get_type (void);
+GType gst_mp1videoparse_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __MP1VIDEOPARSE_H__ */
+#endif /* __MP1VIDEOPARSE_H__ */
diff --git a/gst/mpeg2sub/gstmpeg2subt.h b/gst/mpeg2sub/gstmpeg2subt.h
index 5cde7058..29f60b27 100644
--- a/gst/mpeg2sub/gstmpeg2subt.h
+++ b/gst/mpeg2sub/gstmpeg2subt.h
@@ -26,9 +26,8 @@
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_MPEG2SUBT \
@@ -42,43 +41,41 @@ extern "C"
#define GST_IS_MPEG2SUBT_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MPEG2SUBT))
- typedef struct _GstMpeg2Subt GstMpeg2Subt;
- typedef struct _GstMpeg2SubtClass GstMpeg2SubtClass;
+typedef struct _GstMpeg2Subt GstMpeg2Subt;
+typedef struct _GstMpeg2SubtClass GstMpeg2SubtClass;
- struct _GstMpeg2Subt
- {
- GstElement element;
+struct _GstMpeg2Subt {
+ GstElement element;
- GstPad *videopad, *subtitlepad, *srcpad;
+ GstPad *videopad,*subtitlepad,*srcpad;
- GstBuffer *partialbuf; /* previous buffer (if carryover) */
+ GstBuffer *partialbuf; /* previous buffer (if carryover) */
- gboolean have_title;
+ gboolean have_title;
- guint16 packet_size;
- guint16 data_size;
+ guint16 packet_size;
+ guint16 data_size;
- gint offset[2];
- guchar color[5];
- guchar trans[4];
+ gint offset[2];
+ guchar color[5];
+ guchar trans[4];
- guint duration;
+ guint duration;
- gint width, height;
+ gint width, height;
- };
+};
- struct _GstMpeg2SubtClass
- {
- GstElementClass parent_class;
- };
+struct _GstMpeg2SubtClass {
+ GstElementClass parent_class;
+};
- GType gst_mpeg2subt_get_type (void);
+GType gst_mpeg2subt_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_MPEG2SUBT_H__ */
+#endif /* __GST_MPEG2SUBT_H__ */
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.h b/gst/mpegaudioparse/gstmpegaudioparse.h
index 812a6d56..ce8121a0 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.h
+++ b/gst/mpegaudioparse/gstmpegaudioparse.h
@@ -26,9 +26,8 @@
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_MP3PARSE \
@@ -42,33 +41,31 @@ extern "C"
#define GST_IS_MP3PARSE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MP3PARSE))
- typedef struct _GstMPEGAudioParse GstMPEGAudioParse;
- typedef struct _GstMPEGAudioParseClass GstMPEGAudioParseClass;
+typedef struct _GstMPEGAudioParse GstMPEGAudioParse;
+typedef struct _GstMPEGAudioParseClass GstMPEGAudioParseClass;
- struct _GstMPEGAudioParse
- {
- GstElement element;
+struct _GstMPEGAudioParse {
+ GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
- GstBuffer *partialbuf; /* previous buffer (if carryover) */
- guint skip; /* number of frames to skip */
- guint bit_rate;
- gint channels, rate, layer;
- gboolean in_flush;
- };
+ GstBuffer *partialbuf; /* previous buffer (if carryover) */
+ guint skip; /* number of frames to skip */
+ guint bit_rate;
+ gint channels, rate, layer;
+ gboolean in_flush;
+};
- struct _GstMPEGAudioParseClass
- {
- GstElementClass parent_class;
- };
+struct _GstMPEGAudioParseClass {
+ GstElementClass parent_class;
+};
- GType gst_mp3parse_get_type (void);
+GType gst_mp3parse_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __MP3PARSE_H__ */
+#endif /* __MP3PARSE_H__ */
diff --git a/gst/overlay/gstoverlay.h b/gst/overlay/gstoverlay.h
index 377a2590..523656e0 100644
--- a/gst/overlay/gstoverlay.h
+++ b/gst/overlay/gstoverlay.h
@@ -37,32 +37,30 @@
typedef struct _GstOverlay GstOverlay;
typedef struct _GstOverlayClass GstOverlayClass;
-struct _GstOverlay
-{
- GstElement element;
+struct _GstOverlay {
+ GstElement element;
- GstPad *srcpad;
- GstPad *sinkpad1;
- GstPad *sinkpad2;
- GstPad *sinkpad3;
+ GstPad *srcpad;
+ GstPad *sinkpad1;
+ GstPad *sinkpad2;
+ GstPad *sinkpad3;
- gint format;
- gint width;
- gint height;
+ gint format;
+ gint width;
+ gint height;
- gint duration;
- gint position;
+ gint duration;
+ gint position;
- gint type;
- gint fps;
- gint border;
- gint depth;
+ gint type;
+ gint fps;
+ gint border;
+ gint depth;
- gdouble framerate;
+ gdouble framerate;
};
-struct _GstOverlayClass
-{
+struct _GstOverlayClass {
GstElementClass parent_class;
};
diff --git a/gst/passthrough/gstpassthrough.h b/gst/passthrough/gstpassthrough.h
index c8da5dea..0b6f9d58 100644
--- a/gst/passthrough/gstpassthrough.h
+++ b/gst/passthrough/gstpassthrough.h
@@ -25,6 +25,7 @@
#include <gst/gst.h>
G_BEGIN_DECLS
+
#define GST_TYPE_PASSTHROUGH \
(gst_passthrough_get_type())
#define GST_PASSTHROUGH(obj) \
@@ -35,18 +36,17 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PASSTHROUGH))
#define GST_IS_PASSTHROUGH_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PASSTHROUGH))
+
typedef struct _GstPassthrough GstPassthrough;
typedef struct _GstPassthroughClass GstPassthroughClass;
-typedef enum _GstPassthroughFormat GstPassthroughFormat;
+typedef enum _GstPassthroughFormat GstPassthroughFormat;
-enum _GstPassthroughFormat
-{
+enum _GstPassthroughFormat {
GST_PASSTHROUGH_FORMAT_INT,
GST_PASSTHROUGH_FORMAT_FLOAT
};
-struct _GstPassthrough
-{
+struct _GstPassthrough {
GstElement element;
GstPad *sinkpad, *srcpad;
@@ -66,12 +66,12 @@ struct _GstPassthrough
gboolean is_signed;
};
-struct _GstPassthroughClass
-{
+struct _GstPassthroughClass {
GstElementClass parent_class;
};
-GType gst_passthrough_get_type (void);
+GType gst_passthrough_get_type(void);
G_END_DECLS
+
#endif /* __GST_PASSTHROUGH_H__ */
diff --git a/gst/playondemand/gstplayondemand.h b/gst/playondemand/gstplayondemand.h
index a838d758..c99c8165 100644
--- a/gst/playondemand/gstplayondemand.h
+++ b/gst/playondemand/gstplayondemand.h
@@ -29,6 +29,7 @@
#include <gst/gst.h>
G_BEGIN_DECLS
+
#define GST_TYPE_PLAYONDEMAND \
(gst_play_on_demand_get_type())
#define GST_PLAYONDEMAND(obj) \
@@ -39,59 +40,58 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_PLAYONDEMAND))
#define GST_IS_PLAYONDEMAND_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_PLAYONDEMAND))
-typedef struct _GstPlayOnDemand GstPlayOnDemand;
-typedef struct _GstPlayOnDemandClass GstPlayOnDemandClass;
-typedef enum _GstPlayOnDemandFormat GstPlayOnDemandFormat;
-enum _GstPlayOnDemandFormat
-{
+typedef struct _GstPlayOnDemand GstPlayOnDemand;
+typedef struct _GstPlayOnDemandClass GstPlayOnDemandClass;
+typedef enum _GstPlayOnDemandFormat GstPlayOnDemandFormat;
+
+enum _GstPlayOnDemandFormat {
GST_PLAYONDEMAND_FORMAT_INT,
GST_PLAYONDEMAND_FORMAT_FLOAT
};
-struct _GstPlayOnDemand
-{
+struct _GstPlayOnDemand {
GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad, *srcpad;
GstClock *clock;
/* filter properties */
- gboolean mute;
- gfloat buffer_time;
- guint max_plays;
- gfloat tick_rate;
- guint total_ticks;
- guint32 *ticks;
+ gboolean mute;
+ gfloat buffer_time;
+ guint max_plays;
+ gfloat tick_rate;
+ guint total_ticks;
+ guint32 *ticks;
/* internal buffer info */
- gchar *buffer;
- guint buffer_bytes;
- gboolean eos;
+ gchar *buffer;
+ guint buffer_bytes;
+ gboolean eos;
/* play pointers == internal buffer offsets for producing output sound */
- guint *plays;
- guint write;
+ guint *plays;
+ guint write;
/* audio format info (used to calculate buffer_samples) */
GstPlayOnDemandFormat format;
- guint rate;
- guint channels;
- guint width;
+ guint rate;
+ guint channels;
+ guint width;
};
-struct _GstPlayOnDemandClass
-{
+struct _GstPlayOnDemandClass {
GstElementClass parent_class;
- void (*play) (GstElement * elem);
- void (*clear) (GstElement * elem);
- void (*reset) (GstElement * elem);
- void (*played) (GstElement * elem);
- void (*stopped) (GstElement * elem);
+ void (*play) (GstElement *elem);
+ void (*clear) (GstElement *elem);
+ void (*reset) (GstElement *elem);
+ void (*played) (GstElement *elem);
+ void (*stopped) (GstElement *elem);
};
-GType gst_play_on_demand_get_type (void);
+GType gst_play_on_demand_get_type(void);
G_END_DECLS
+
#endif /* __GST_PLAYONDEMAND_H__ */
diff --git a/gst/qtdemux/qtdemux.h b/gst/qtdemux/qtdemux.h
index ed0f3154..249ef216 100644
--- a/gst/qtdemux/qtdemux.h
+++ b/gst/qtdemux/qtdemux.h
@@ -26,9 +26,8 @@
#include <gst/getbits/getbits.h>
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_QTDEMUX \
@@ -44,45 +43,43 @@ extern "C"
#define GST_QTDEMUX_MAX_STREAMS 8
- typedef struct _GstQTDemux GstQTDemux;
- typedef struct _GstQTDemuxClass GstQTDemuxClass;
- typedef struct _QtDemuxStream QtDemuxStream;
+typedef struct _GstQTDemux GstQTDemux;
+typedef struct _GstQTDemuxClass GstQTDemuxClass;
+typedef struct _QtDemuxStream QtDemuxStream;
- struct _GstQTDemux
- {
- GstElement element;
+struct _GstQTDemux {
+ GstElement element;
- /* pads */
- GstPad *sinkpad;
+ /* pads */
+ GstPad *sinkpad;
- QtDemuxStream *streams[GST_QTDEMUX_MAX_STREAMS];
- int n_streams;
- int n_video_streams;
- int n_audio_streams;
+ QtDemuxStream *streams[GST_QTDEMUX_MAX_STREAMS];
+ int n_streams;
+ int n_video_streams;
+ int n_audio_streams;
- GstByteStream *bs;
+ GstByteStream *bs;
- GNode *moov_node;
- GNode *moov_node_compressed;
+ GNode *moov_node;
+ GNode *moov_node_compressed;
- guint32 timescale;
- guint32 duration;
+ guint32 timescale;
+ guint32 duration;
- int state;
+ int state;
- int offset;
+ int offset;
- /* track stuff */
+ /* track stuff */
- };
+};
- struct _GstQTDemuxClass
- {
- GstElementClass parent_class;
- };
+struct _GstQTDemuxClass {
+ GstElementClass parent_class;
+};
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_QTDEMUX_H__ */
+#endif /* __GST_QTDEMUX_H__ */
diff --git a/gst/rtjpeg/RTjpeg.h b/gst/rtjpeg/RTjpeg.h
index 3c90408f..92b35242 100644
--- a/gst/rtjpeg/RTjpeg.h
+++ b/gst/rtjpeg/RTjpeg.h
@@ -23,32 +23,30 @@
#include <inttypes.h>
-typedef uint8_t __u8;
+typedef uint8_t __u8;
typedef uint32_t __u32;
-typedef int8_t __s8;
+typedef int8_t __s8;
typedef uint16_t __u16;
-extern void RTjpeg_init_Q (__u8 Q);
-extern void RTjpeg_init_compress (long unsigned int *buf, int width, int height,
- __u8 Q);
-extern void RTjpeg_init_decompress (long unsigned int *buf, int width,
- int height);
-extern int RTjpeg_compressYUV420 (__s8 * sp, unsigned char *bp);
-extern int RTjpeg_compressYUV422 (__s8 * sp, unsigned char *bp);
-extern void RTjpeg_decompressYUV420 (__s8 * sp, __u8 * bp);
-extern void RTjpeg_decompressYUV422 (__s8 * sp, __u8 * bp);
-extern int RTjpeg_compress8 (__s8 * sp, unsigned char *bp);
-extern void RTjpeg_decompress8 (__s8 * sp, __u8 * bp);
-
-extern void RTjpeg_init_mcompress (void);
-extern int RTjpeg_mcompress (__s8 * sp, unsigned char *bp, __u16 lmask,
- __u16 cmask);
-extern int RTjpeg_mcompress8 (__s8 * sp, unsigned char *bp, __u16 lmask);
-extern void RTjpeg_set_test (int i);
-
-extern void RTjpeg_yuv420rgb (__u8 * buf, __u8 * rgb);
-extern void RTjpeg_yuv422rgb (__u8 * buf, __u8 * rgb);
-extern void RTjpeg_yuvrgb8 (__u8 * buf, __u8 * rgb);
-extern void RTjpeg_yuvrgb16 (__u8 * buf, __u8 * rgb);
-extern void RTjpeg_yuvrgb24 (__u8 * buf, __u8 * rgb);
-extern void RTjpeg_yuvrgb32 (__u8 * buf, __u8 * rgb);
+extern void RTjpeg_init_Q(__u8 Q);
+extern void RTjpeg_init_compress(long unsigned int *buf, int width, int height, __u8 Q);
+extern void RTjpeg_init_decompress(long unsigned int *buf, int width, int height);
+extern int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp);
+extern int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp);
+extern void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp);
+extern void RTjpeg_decompressYUV422(__s8 *sp, __u8 *bp);
+extern int RTjpeg_compress8(__s8 *sp, unsigned char *bp);
+extern void RTjpeg_decompress8(__s8 *sp, __u8 *bp);
+
+extern void RTjpeg_init_mcompress(void);
+extern int RTjpeg_mcompress(__s8 *sp, unsigned char *bp, __u16 lmask, __u16 cmask);
+extern int RTjpeg_mcompress8(__s8 *sp, unsigned char *bp, __u16 lmask);
+extern void RTjpeg_set_test(int i);
+
+extern void RTjpeg_yuv420rgb(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuv422rgb(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuvrgb8(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuvrgb16(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuvrgb24(__u8 *buf, __u8 *rgb);
+extern void RTjpeg_yuvrgb32(__u8 *buf, __u8 *rgb);
+
diff --git a/gst/rtjpeg/gstrtjpegdec.h b/gst/rtjpeg/gstrtjpegdec.h
index 23ddce44..2214ebd8 100644
--- a/gst/rtjpeg/gstrtjpegdec.h
+++ b/gst/rtjpeg/gstrtjpegdec.h
@@ -26,9 +26,8 @@
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_RTJPEGDEC \
@@ -42,32 +41,30 @@ extern "C"
#define GST_IS_RTJPEGDEC_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTJPEGDEC)))
- typedef struct _GstRTJpegDec GstRTJpegDec;
- typedef struct _GstRTJpegDecClass GstRTJpegDecClass;
+typedef struct _GstRTJpegDec GstRTJpegDec;
+typedef struct _GstRTJpegDecClass GstRTJpegDecClass;
- struct _GstRTJpegDec
- {
- GstElement element;
+struct _GstRTJpegDec {
+ GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
- gint width, height;
- gint quality;
- gint quant[128];
+ gint width,height;
+ gint quality;
+ gint quant[128];
- };
+};
- struct _GstRTJpegDecClass
- {
- GstElementClass parent_class;
- };
+struct _GstRTJpegDecClass {
+ GstElementClass parent_class;
+};
- GType gst_rtjpegdec_get_type (void);
+GType gst_rtjpegdec_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __RTJPEGDEC_H__ */
+#endif /* __RTJPEGDEC_H__ */
diff --git a/gst/rtjpeg/gstrtjpegenc.h b/gst/rtjpeg/gstrtjpegenc.h
index 34c143b2..61303b7b 100644
--- a/gst/rtjpeg/gstrtjpegenc.h
+++ b/gst/rtjpeg/gstrtjpegenc.h
@@ -28,9 +28,8 @@
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_RTJPEGENC \
@@ -44,31 +43,29 @@ extern "C"
#define GST_IS_RTJPEGENC_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_RTJPEGENC))
- typedef struct _GstRTJpegEnc GstRTJpegEnc;
- typedef struct _GstRTJpegEncClass GstRTJpegEncClass;
+typedef struct _GstRTJpegEnc GstRTJpegEnc;
+typedef struct _GstRTJpegEncClass GstRTJpegEncClass;
- struct _GstRTJpegEnc
- {
- GstElement element;
+struct _GstRTJpegEnc {
+ GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
- gint width, height;
- gint quality;
- gint quant[128];
- };
+ gint width,height;
+ gint quality;
+ gint quant[128];
+};
- struct _GstRTJpegEncClass
- {
- GstElementClass parent_class;
- };
+struct _GstRTJpegEncClass {
+ GstElementClass parent_class;
+};
- GType gst_rtjpegenc_get_type (void);
+GType gst_rtjpegenc_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __RTJPEGENC_H__ */
+#endif /* __RTJPEGENC_H__ */
diff --git a/gst/smooth/gstsmooth.h b/gst/smooth/gstsmooth.h
index aae3cc21..eb32de36 100644
--- a/gst/smooth/gstsmooth.h
+++ b/gst/smooth/gstsmooth.h
@@ -25,9 +25,8 @@
#include <gst/gst.h>
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_SMOOTH \
@@ -41,36 +40,34 @@ extern "C"
#define GST_IS_SMOOTH_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SMOOTH))
- typedef struct _GstSmooth GstSmooth;
- typedef struct _GstSmoothClass GstSmoothClass;
+typedef struct _GstSmooth GstSmooth;
+typedef struct _GstSmoothClass GstSmoothClass;
- struct _GstSmooth
- {
- GstElement element;
+struct _GstSmooth {
+ GstElement element;
- int format;
- int width;
- int height;
+ int format;
+ int width;
+ int height;
- gboolean active;
- int tolerance;
- int filtersize;
- gboolean lum_only;
+ gboolean active;
+ int tolerance;
+ int filtersize;
+ gboolean lum_only;
- GstPad *sinkpad, *srcpad;
- };
+ GstPad *sinkpad,*srcpad;
+};
- struct _GstSmoothClass
- {
- GstElementClass parent_class;
- };
+struct _GstSmoothClass {
+ GstElementClass parent_class;
+};
- GType gst_smooth_get_type (void);
+GType gst_smooth_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_SMOOTH_H__ */
+#endif /* __GST_SMOOTH_H__ */
diff --git a/gst/smoothwave/gstsmoothwave.h b/gst/smoothwave/gstsmoothwave.h
index df4d8763..87165131 100644
--- a/gst/smoothwave/gstsmoothwave.h
+++ b/gst/smoothwave/gstsmoothwave.h
@@ -26,9 +26,8 @@
#include <gtk/gtk.h>
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_SMOOTHWAVE \
@@ -42,33 +41,31 @@ extern "C"
#define GST_IS_SMOOTHWAVE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SMOOTHWAVE))
- typedef struct _GstSmoothWave GstSmoothWave;
- typedef struct _GstSmoothWaveClass GstSmoothWaveClass;
+typedef struct _GstSmoothWave GstSmoothWave;
+typedef struct _GstSmoothWaveClass GstSmoothWaveClass;
- struct _GstSmoothWave
- {
- GstElement element;
+struct _GstSmoothWave {
+ GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
- gint width, height;
+ gint width,height;
- GdkRgbCmap *cmap;
- GtkWidget *image;
- guchar *imagebuffer;
- };
+ GdkRgbCmap *cmap;
+ GtkWidget *image;
+ guchar *imagebuffer;
+};
- struct _GstSmoothWaveClass
- {
- GstElementClass parent_class;
- };
+struct _GstSmoothWaveClass {
+ GstElementClass parent_class;
+};
- GType gst_smoothwave_get_type (void);
+GType gst_smoothwave_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_SMOOTHWAVE_H__ */
+#endif /* __GST_SMOOTHWAVE_H__ */
diff --git a/gst/smpte/gstmask.h b/gst/smpte/gstmask.h
index 6f82078f..6131c624 100644
--- a/gst/smpte/gstmask.h
+++ b/gst/smpte/gstmask.h
@@ -27,39 +27,37 @@
typedef struct _GstMask GstMask;
typedef struct _GstMaskDefinition GstMaskDefinition;
-typedef void (*GstMaskDrawFunc) (GstMask * mask);
-typedef void (*GstMaskDestroyFunc) (GstMask * mask);
-
-struct _GstMaskDefinition
-{
- gint type;
- gchar *short_name;
- gchar *long_name;
- GstMaskDrawFunc draw_func;
- GstMaskDestroyFunc destroy_func;
- gpointer user_data;
+typedef void (*GstMaskDrawFunc) (GstMask *mask);
+typedef void (*GstMaskDestroyFunc) (GstMask *mask);
+
+struct _GstMaskDefinition {
+ gint type;
+ gchar *short_name;
+ gchar *long_name;
+ GstMaskDrawFunc draw_func;
+ GstMaskDestroyFunc destroy_func;
+ gpointer user_data;
};
-struct _GstMask
-{
- gint type;
- guint32 *data;
- gpointer user_data;
+struct _GstMask {
+ gint type;
+ guint32 *data;
+ gpointer user_data;
- gint width;
- gint height;
- gint bpp;
+ gint width;
+ gint height;
+ gint bpp;
- GstMaskDestroyFunc destroy_func;
+ GstMaskDestroyFunc destroy_func;
};
-void _gst_mask_init (void);
-void _gst_mask_register (GstMaskDefinition * definition);
+void _gst_mask_init (void);
+void _gst_mask_register (GstMaskDefinition *definition);
-void _gst_mask_default_destroy (GstMask * mask);
+void _gst_mask_default_destroy (GstMask *mask);
-const GList *gst_mask_get_definitions (void);
-GstMask *gst_mask_factory_new (gint type, gint bpp, gint width, gint height);
-void gst_mask_destroy (GstMask * mask);
+const GList* gst_mask_get_definitions (void);
+GstMask* gst_mask_factory_new (gint type, gint bpp, gint width, gint height);
+void gst_mask_destroy (GstMask *mask);
#endif /* __GST_MASK_H__ */
diff --git a/gst/smpte/gstsmpte.h b/gst/smpte/gstsmpte.h
index 762eebf8..40844209 100644
--- a/gst/smpte/gstsmpte.h
+++ b/gst/smpte/gstsmpte.h
@@ -38,28 +38,28 @@
typedef struct _GstSMPTE GstSMPTE;
typedef struct _GstSMPTEClass GstSMPTEClass;
-struct _GstSMPTE
-{
- GstElement element;
+struct _GstSMPTE {
+ GstElement element;
- gint format;
- gint width;
- gint height;
- gdouble fps;
+ gint format;
+ gint width;
+ gint height;
+ gdouble fps;
- gint duration;
- gint position;
+ gint duration;
+ gint position;
- GstPad *srcpad, *sinkpad1, *sinkpad2;
+ GstPad *srcpad,
+ *sinkpad1,
+ *sinkpad2;
- gint type;
- gint border;
- gint depth;
- GstMask *mask;
+ gint type;
+ gint border;
+ gint depth;
+ GstMask *mask;
};
-struct _GstSMPTEClass
-{
+struct _GstSMPTEClass {
GstElementClass parent_class;
};
diff --git a/gst/smpte/paint.h b/gst/smpte/paint.h
index aa9fd425..4c34cf92 100644
--- a/gst/smpte/paint.h
+++ b/gst/smpte/paint.h
@@ -22,21 +22,26 @@
#include <glib.h>
-void gst_smpte_paint_vbox (guint32 * dest, gint stride,
- gint x0, gint y0, gint c0, gint x1, gint y1, gint c1);
-void gst_smpte_paint_hbox (guint32 * dest, gint stride,
- gint x0, gint y0, gint c0, gint x1, gint y1, gint c1);
+void gst_smpte_paint_vbox (guint32 *dest, gint stride,
+ gint x0, gint y0, gint c0,
+ gint x1, gint y1, gint c1);
+void gst_smpte_paint_hbox (guint32 *dest, gint stride,
+ gint x0, gint y0, gint c0,
+ gint x1, gint y1, gint c1);
-void gst_smpte_paint_triangle_linear (guint32 * dest, gint stride,
- gint x0, gint y0, gint c0,
- gint x1, gint y1, gint c1, gint x2, gint y2, gint c2);
+void gst_smpte_paint_triangle_linear (guint32 *dest, gint stride,
+ gint x0, gint y0, gint c0,
+ gint x1, gint y1, gint c1,
+ gint x2, gint y2, gint c2);
-void gst_smpte_paint_triangle_clock (guint32 * dest, gint stride,
- gint x0, gint y0, gint c0,
- gint x1, gint y1, gint c1, gint x2, gint y2, gint c2);
+void gst_smpte_paint_triangle_clock (guint32 *dest, gint stride,
+ gint x0, gint y0, gint c0,
+ gint x1, gint y1, gint c1,
+ gint x2, gint y2, gint c2);
-void gst_smpte_paint_box_clock (guint32 * dest, gint stride,
- gint x0, gint y0, gint c0,
- gint x1, gint y1, gint c1, gint x2, gint y2, gint c2);
+void gst_smpte_paint_box_clock (guint32 *dest, gint stride,
+ gint x0, gint y0, gint c0,
+ gint x1, gint y1, gint c1,
+ gint x2, gint y2, gint c2);
#endif /* __GST_SMPTE_PAINT_H__ */
diff --git a/gst/spectrum/gstspectrum.h b/gst/spectrum/gstspectrum.h
index 23c4ef4b..8cc546ec 100644
--- a/gst/spectrum/gstspectrum.h
+++ b/gst/spectrum/gstspectrum.h
@@ -26,9 +26,8 @@
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_SPECTRUM \
@@ -42,29 +41,27 @@ extern "C"
#define GST_IS_SPECTRUM_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SPECTRUM))
- typedef struct _GstSpectrum GstSpectrum;
- typedef struct _GstSpectrumClass GstSpectrumClass;
+typedef struct _GstSpectrum GstSpectrum;
+typedef struct _GstSpectrumClass GstSpectrumClass;
- struct _GstSpectrum
- {
- GstElement element;
+struct _GstSpectrum {
+ GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
- gint width;
- };
+ gint width;
+};
- struct _GstSpectrumClass
- {
- GstElementClass parent_class;
- };
+struct _GstSpectrumClass {
+ GstElementClass parent_class;
+};
- GType gst_spectrum_get_type (void);
+GType gst_spectrum_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_SPECTRUM_H__ */
+#endif /* __GST_SPECTRUM_H__ */
diff --git a/gst/speed/gstspeed.h b/gst/speed/gstspeed.h
index d86d1fce..2bbb0e6c 100644
--- a/gst/speed/gstspeed.h
+++ b/gst/speed/gstspeed.h
@@ -25,6 +25,7 @@
#include <gst/gst.h>
G_BEGIN_DECLS
+
#define GST_TYPE_SPEED \
(gst_speed_get_type())
#define GST_SPEED(obj) \
@@ -35,18 +36,17 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SPEED))
#define GST_IS_SPEED_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SPEED))
+
typedef struct _GstSpeed GstSpeed;
typedef struct _GstSpeedClass GstSpeedClass;
typedef enum _GstSpeedFormat GstSpeedFormat;
-enum _GstSpeedFormat
-{
+enum _GstSpeedFormat {
GST_SPEED_FORMAT_INT,
GST_SPEED_FORMAT_FLOAT
};
-struct _GstSpeed
-{
+struct _GstSpeed {
GstElement element;
GstPad *sinkpad, *srcpad;
@@ -66,12 +66,12 @@ struct _GstSpeed
gboolean is_signed;
};
-struct _GstSpeedClass
-{
+struct _GstSpeedClass {
GstElementClass parent_class;
};
-GType gst_speed_get_type (void);
+GType gst_speed_get_type(void);
G_END_DECLS
+
#endif /* __GST_SPEED_H__ */
diff --git a/gst/stereo/gststereo.h b/gst/stereo/gststereo.h
index b665432b..8b78f25e 100644
--- a/gst/stereo/gststereo.h
+++ b/gst/stereo/gststereo.h
@@ -26,9 +26,8 @@
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_STEREO \
@@ -42,29 +41,27 @@ extern "C"
#define GST_IS_STEREO_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_STEREO))
- typedef struct _GstStereo GstStereo;
- typedef struct _GstStereoClass GstStereoClass;
+typedef struct _GstStereo GstStereo;
+typedef struct _GstStereoClass GstStereoClass;
- struct _GstStereo
- {
- GstElement element;
+struct _GstStereo {
+ GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
- gint8 active;
- gfloat stereo;
- };
+ gint8 active;
+ gfloat stereo;
+};
- struct _GstStereoClass
- {
- GstElementClass parent_class;
- };
+struct _GstStereoClass {
+ GstElementClass parent_class;
+};
- GType gst_stereo_get_type (void);
+GType gst_stereo_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_STEREO_H__ */
+#endif /* __GST_STEREO_H__ */
diff --git a/gst/switch/gstswitch.h b/gst/switch/gstswitch.h
index bd8e3739..59d66aeb 100644
--- a/gst/switch/gstswitch.h
+++ b/gst/switch/gstswitch.h
@@ -16,13 +16,14 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
-
+
#ifndef __GST_SWITCH_H__
#define __GST_SWITCH_H__
#include <gst/gst.h>
G_BEGIN_DECLS
+
#define GST_TYPE_SWITCH \
(gst_switch_get_type())
#define GST_SWITCH(obj) \
@@ -33,36 +34,35 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_SWITCH))
#define GST_IS_SWITCH_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_SWITCH))
+
typedef struct _GstSwitchPad GstSwitchPad;
typedef struct _GstSwitch GstSwitch;
typedef struct _GstSwitchClass GstSwitchClass;
-struct _GstSwitchPad
-{
+struct _GstSwitchPad {
GstPad *sinkpad;
GstData *data;
gboolean forwarded;
gboolean eos;
};
-struct _GstSwitch
-{
+struct _GstSwitch {
GstElement element;
-
+
GList *sinkpads;
GstPad *srcpad;
-
+
guint nb_sinkpads;
guint active_sinkpad;
};
-struct _GstSwitchClass
-{
+struct _GstSwitchClass {
GstElementClass parent_class;
};
GType gst_switch_get_type (void);
G_END_DECLS
+
#endif /* __GST_SWITCH_H__ */
diff --git a/gst/vbidec/gstvbidec.h b/gst/vbidec/gstvbidec.h
index e495f25c..8a5ea7e5 100644
--- a/gst/vbidec/gstvbidec.h
+++ b/gst/vbidec/gstvbidec.h
@@ -19,4 +19,4 @@
typedef struct _GstVBIDec GstVBIDec;
-void gst_vbidec_show_text (GstVBIDec * vbidec, char *text, int len);
+void gst_vbidec_show_text (GstVBIDec *vbidec, char *text, int len);
diff --git a/gst/vbidec/vbidata.h b/gst/vbidec/vbidata.h
index 78d902af..66b2cc3c 100644
--- a/gst/vbidec/vbidata.h
+++ b/gst/vbidec/vbidata.h
@@ -44,16 +44,16 @@ typedef struct vbidata_s vbidata_t;
#define CAPTURE_T3 8
#define CAPTURE_T4 9
-vbidata_t *vbidata_new_file (const char *filename, vbiscreen_t * vs,
- /*tvtime_osd_t* osd, */ int verbose);
-vbidata_t *vbidata_new_line (vbiscreen_t * vs, int verbose);
+vbidata_t *vbidata_new_file( const char *filename, vbiscreen_t *vs,
+ /*tvtime_osd_t* osd,*/ int verbose );
+vbidata_t *vbidata_new_line( vbiscreen_t *vs, int verbose );
-void vbidata_delete (vbidata_t * vbi);
-void vbidata_reset (vbidata_t * vbi);
-void vbidata_set_verbose (vbidata_t * vbi, int verbose);
-void vbidata_capture_mode (vbidata_t * vbi, int mode);
-void vbidata_process_frame (vbidata_t * vbi, int printdebug);
-void vbidata_process_line (vbidata_t * vbi, unsigned char *s, int bottom);
-void vbidata_process_16b (vbidata_t * vbi, int bottom, int w);
+void vbidata_delete( vbidata_t *vbi );
+void vbidata_reset( vbidata_t *vbi );
+void vbidata_set_verbose( vbidata_t *vbi, int verbose );
+void vbidata_capture_mode( vbidata_t *vbi, int mode );
+void vbidata_process_frame( vbidata_t *vbi, int printdebug );
+void vbidata_process_line( vbidata_t *vbi, unsigned char *s, int bottom );
+void vbidata_process_16b( vbidata_t *vbi, int bottom, int w );
#endif /* VBIDATA_H_INCLUDED */
diff --git a/gst/vbidec/vbiscreen.h b/gst/vbidec/vbiscreen.h
index f3c81fbf..9afe2843 100644
--- a/gst/vbidec/vbiscreen.h
+++ b/gst/vbidec/vbiscreen.h
@@ -25,24 +25,26 @@
typedef struct vbiscreen_s vbiscreen_t;
-vbiscreen_t *vbiscreen_new (int video_width, int video_height,
- double video_aspect, int verbose, void *user_data);
-void vbiscreen_delete (vbiscreen_t * vs);
-void vbiscreen_set_verbose (vbiscreen_t * vs, int verbose);
-void vbiscreen_set_mode (vbiscreen_t * vs, int caption, int style);
-void vbiscreen_new_caption (vbiscreen_t * vs, int indent, int ital,
- unsigned int colour, int row);
-void vbiscreen_tab (vbiscreen_t * vs, int cols);
-void vbiscreen_delete_to_end (vbiscreen_t * vs);
-void vbiscreen_backspace (vbiscreen_t * vs);
-void vbiscreen_erase_displayed (vbiscreen_t * vs);
-void vbiscreen_erase_non_displayed (vbiscreen_t * vs);
-void vbiscreen_carriage_return (vbiscreen_t * vs);
-void vbiscreen_end_of_caption (vbiscreen_t * vs);
-void vbiscreen_print (vbiscreen_t * vs, char c1, char c2);
-void vbiscreen_composite_packed422_scanline (vbiscreen_t * vs,
- unsigned char *output, int width, int xpos, int scanline);
-void vbiscreen_dump_screen_text (vbiscreen_t * vs);
-void vbiscreen_reset (vbiscreen_t * vs);
+vbiscreen_t *vbiscreen_new( int video_width, int video_height,
+ double video_aspect, int verbose, void *user_data );
+void vbiscreen_delete( vbiscreen_t *vs );
+void vbiscreen_set_verbose( vbiscreen_t *vs, int verbose );
+void vbiscreen_set_mode( vbiscreen_t *vs, int caption, int style);
+void vbiscreen_new_caption( vbiscreen_t *vs, int indent, int ital,
+ unsigned int colour, int row );
+void vbiscreen_tab( vbiscreen_t *vs, int cols );
+void vbiscreen_delete_to_end( vbiscreen_t *vs );
+void vbiscreen_backspace( vbiscreen_t *vs );
+void vbiscreen_erase_displayed( vbiscreen_t *vs );
+void vbiscreen_erase_non_displayed( vbiscreen_t *vs );
+void vbiscreen_carriage_return( vbiscreen_t *vs );
+void vbiscreen_end_of_caption( vbiscreen_t *vs );
+void vbiscreen_print( vbiscreen_t *vs, char c1, char c2 );
+void vbiscreen_composite_packed422_scanline( vbiscreen_t *vs,
+ unsigned char *output,
+ int width, int xpos,
+ int scanline );
+void vbiscreen_dump_screen_text( vbiscreen_t *vs );
+void vbiscreen_reset( vbiscreen_t *vs );
#endif
diff --git a/gst/videodrop/gstvideodrop.h b/gst/videodrop/gstvideodrop.h
index 913c91b5..20f954a4 100644
--- a/gst/videodrop/gstvideodrop.h
+++ b/gst/videodrop/gstvideodrop.h
@@ -23,6 +23,7 @@
#include <gst/gst.h>
G_BEGIN_DECLS
+
#define GST_TYPE_VIDEODROP \
(gst_videodrop_get_type())
#define GST_VIDEODROP(obj) \
@@ -33,28 +34,29 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VIDEODROP))
#define GST_IS_VIDEODROP_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VIDEODROP))
+
typedef struct _GstVideodrop GstVideodrop;
typedef struct _GstVideodropClass GstVideodropClass;
-struct _GstVideodrop
-{
+struct _GstVideodrop {
GstElement element;
GstPad *sinkpad, *srcpad;
/* video state */
gboolean inited;
- gfloat from_fps, to_fps;
+ gfloat from_fps,
+ to_fps;
gfloat speed;
guint64 pass, total, time_adjust;
};
-struct _GstVideodropClass
-{
+struct _GstVideodropClass {
GstElementClass parent_class;
};
-GType gst_videodrop_get_type (void);
+GType gst_videodrop_get_type(void);
G_END_DECLS
+
#endif /* __GST_VIDEODROP_H__ */
diff --git a/gst/virtualdub/gstvirtualdub.h b/gst/virtualdub/gstvirtualdub.h
index 286aa39d..f55d85e8 100644
--- a/gst/virtualdub/gstvirtualdub.h
+++ b/gst/virtualdub/gstvirtualdub.h
@@ -18,12 +18,12 @@
#include <gst/gst.h>
-typedef unsigned int Pixel;
-typedef unsigned int Pixel32;
-typedef unsigned char Pixel8;
-typedef int PixCoord;
-typedef int PixDim;
-typedef int PixOffset;
+typedef unsigned int Pixel;
+typedef unsigned int Pixel32;
+typedef unsigned char Pixel8;
+typedef int PixCoord;
+typedef int PixDim;
+typedef int PixOffset;
#define R_MASK (0x00ff0000)
diff --git a/gst/y4m/gsty4mencode.h b/gst/y4m/gsty4mencode.h
index 607b3e6d..07d369cc 100644
--- a/gst/y4m/gsty4mencode.h
+++ b/gst/y4m/gsty4mencode.h
@@ -27,9 +27,8 @@
#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+extern "C" {
+#endif /* __cplusplus */
#define GST_TYPE_Y4MENCODE \
@@ -43,32 +42,30 @@ extern "C"
#define GST_IS_Y4MENCODE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_Y4MENCODE))
- typedef struct _GstY4mEncode GstY4mEncode;
- typedef struct _GstY4mEncodeClass GstY4mEncodeClass;
+typedef struct _GstY4mEncode GstY4mEncode;
+typedef struct _GstY4mEncodeClass GstY4mEncodeClass;
- struct _GstY4mEncode
- {
- GstElement element;
+struct _GstY4mEncode {
+ GstElement element;
- GstPad *sinkpad, *srcpad;
+ GstPad *sinkpad,*srcpad;
- gint width, height;
- gfloat fps_idx;
+ gint width, height;
+ gfloat fps_idx;
- gboolean init;
+ gboolean init;
- };
+};
- struct _GstY4mEncodeClass
- {
- GstElementClass parent_class;
- };
+struct _GstY4mEncodeClass {
+ GstElementClass parent_class;
+};
- GType gst_y4mencode_get_type (void);
+GType gst_y4mencode_get_type(void);
#ifdef __cplusplus
}
-#endif /* __cplusplus */
+#endif /* __cplusplus */
-#endif /* __GST_Y4MENCODE_H__ */
+#endif /* __GST_Y4MENCODE_H__ */