From ca9ef2d8c077eea69de1929a78fef747f1c53b2f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 3 Aug 2011 12:08:16 +0200 Subject: [PATCH] back to development --- configure.ac | 2 +- win32/common/_stdint.h | 4 +- win32/common/config.h | 10 +- win32/common/multichannel-enumtypes.c | 132 +++++++++++++++++++++++++- win32/common/multichannel-enumtypes.h | 10 ++ 5 files changed, 145 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 2cb38ec3e4..820aac9c8b 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file dnl initialize autoconf dnl releases only do -Wall, git and prerelease does -Werror too dnl use a three digit version number for releases, and four for git/prerelease -AC_INIT(GStreamer Base Plug-ins, 0.11.0, +AC_INIT(GStreamer Base Plug-ins, 0.11.0.2, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-plugins-base) diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h index c5a771dd27..21ec7c91a6 100644 --- a/win32/common/_stdint.h +++ b/win32/common/_stdint.h @@ -1,8 +1,8 @@ #ifndef _GST_PLUGINS_BASE__STDINT_H #define _GST_PLUGINS_BASE__STDINT_H 1 #ifndef _GENERATED_STDINT_H -#define _GENERATED_STDINT_H "gst-plugins-base 0.11.0" -/* generated using gnu compiler gcc (Ubuntu/Linaro 4.5.2-8ubuntu4) 4.5.2 */ +#define _GENERATED_STDINT_H "gst-plugins-base 0.11.0.2" +/* generated using gnu compiler gcc (Ubuntu/Linaro 4.4.4-14ubuntu5) 4.4.5 */ #define _STDINT_HAVE_STDINT_H 1 #include #endif diff --git a/win32/common/config.h b/win32/common/config.h index 831bce9116..88edf0e150 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -75,13 +75,13 @@ #define GST_MAJORMINOR "0.11" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer Base Plug-ins source release" +#define GST_PACKAGE_NAME "GStreamer Base Plug-ins prerelease" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2011-08-02" +#define GST_PACKAGE_RELEASE_DATETIME "2011-08-03T09:53Z" /* Define to enable ALSA (used by alsa). */ #undef HAVE_ALSA @@ -322,7 +322,7 @@ #define PACKAGE_NAME "GStreamer Base Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Base Plug-ins 0.11.0" +#define PACKAGE_STRING "GStreamer Base Plug-ins 0.11.0.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-base" @@ -331,7 +331,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.11.0" +#define PACKAGE_VERSION "0.11.0.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -362,7 +362,7 @@ #undef USE_TREMOLO /* Version number of package */ -#define VERSION "0.11.0" +#define VERSION "0.11.0.2" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/win32/common/multichannel-enumtypes.c b/win32/common/multichannel-enumtypes.c index d8a64d6709..789a1be236 100644 --- a/win32/common/multichannel-enumtypes.c +++ b/win32/common/multichannel-enumtypes.c @@ -4,14 +4,14 @@ #include "multichannel-enumtypes.h" #include "multichannel.h" +#include "gstringbuffer.h" /* enumerations from "multichannel.h" */ GType gst_audio_channel_position_get_type (void) { - static GType etype = 0; - - if (etype == 0) { + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { static const GEnumValue values[] = { {GST_AUDIO_CHANNEL_POSITION_INVALID, "GST_AUDIO_CHANNEL_POSITION_INVALID", "invalid"}, @@ -45,9 +45,131 @@ gst_audio_channel_position_get_type (void) {GST_AUDIO_CHANNEL_POSITION_NUM, "GST_AUDIO_CHANNEL_POSITION_NUM", "num"}, {0, NULL, NULL} }; - etype = g_enum_register_static ("GstAudioChannelPosition", values); + GType g_define_type_id = + g_enum_register_static ("GstAudioChannelPosition", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); } - return etype; + return g_define_type_id__volatile; +} + +/* enumerations from "gstringbuffer.h" */ +GType +gst_ring_buffer_state_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GEnumValue values[] = { + {GST_RING_BUFFER_STATE_STOPPED, "GST_RING_BUFFER_STATE_STOPPED", + "stopped"}, + {GST_RING_BUFFER_STATE_PAUSED, "GST_RING_BUFFER_STATE_PAUSED", "paused"}, + {GST_RING_BUFFER_STATE_STARTED, "GST_RING_BUFFER_STATE_STARTED", + "started"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_enum_register_static ("GstRingBufferState", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} + +GType +gst_ring_buffer_seg_state_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GEnumValue values[] = { + {GST_SEGSTATE_INVALID, "GST_SEGSTATE_INVALID", "invalid"}, + {GST_SEGSTATE_EMPTY, "GST_SEGSTATE_EMPTY", "empty"}, + {GST_SEGSTATE_FILLED, "GST_SEGSTATE_FILLED", "filled"}, + {GST_SEGSTATE_PARTIAL, "GST_SEGSTATE_PARTIAL", "partial"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_enum_register_static ("GstRingBufferSegState", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} + +GType +gst_buffer_format_type_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GEnumValue values[] = { + {GST_BUFTYPE_LINEAR, "GST_BUFTYPE_LINEAR", "linear"}, + {GST_BUFTYPE_FLOAT, "GST_BUFTYPE_FLOAT", "float"}, + {GST_BUFTYPE_MU_LAW, "GST_BUFTYPE_MU_LAW", "mu-law"}, + {GST_BUFTYPE_A_LAW, "GST_BUFTYPE_A_LAW", "a-law"}, + {GST_BUFTYPE_IMA_ADPCM, "GST_BUFTYPE_IMA_ADPCM", "ima-adpcm"}, + {GST_BUFTYPE_MPEG, "GST_BUFTYPE_MPEG", "mpeg"}, + {GST_BUFTYPE_GSM, "GST_BUFTYPE_GSM", "gsm"}, + {GST_BUFTYPE_IEC958, "GST_BUFTYPE_IEC958", "iec958"}, + {GST_BUFTYPE_AC3, "GST_BUFTYPE_AC3", "ac3"}, + {GST_BUFTYPE_EAC3, "GST_BUFTYPE_EAC3", "eac3"}, + {GST_BUFTYPE_DTS, "GST_BUFTYPE_DTS", "dts"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_enum_register_static ("GstBufferFormatType", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} + +GType +gst_buffer_format_get_type (void) +{ + static volatile gsize g_define_type_id__volatile = 0; + if (g_once_init_enter (&g_define_type_id__volatile)) { + static const GEnumValue values[] = { + {GST_UNKNOWN, "GST_UNKNOWN", "unknown"}, + {GST_S8, "GST_S8", "s8"}, + {GST_U8, "GST_U8", "u8"}, + {GST_S16_LE, "GST_S16_LE", "s16-le"}, + {GST_S16_BE, "GST_S16_BE", "s16-be"}, + {GST_U16_LE, "GST_U16_LE", "u16-le"}, + {GST_U16_BE, "GST_U16_BE", "u16-be"}, + {GST_S24_LE, "GST_S24_LE", "s24-le"}, + {GST_S24_BE, "GST_S24_BE", "s24-be"}, + {GST_U24_LE, "GST_U24_LE", "u24-le"}, + {GST_U24_BE, "GST_U24_BE", "u24-be"}, + {GST_S32_LE, "GST_S32_LE", "s32-le"}, + {GST_S32_BE, "GST_S32_BE", "s32-be"}, + {GST_U32_LE, "GST_U32_LE", "u32-le"}, + {GST_U32_BE, "GST_U32_BE", "u32-be"}, + {GST_S24_3LE, "GST_S24_3LE", "s24-3le"}, + {GST_S24_3BE, "GST_S24_3BE", "s24-3be"}, + {GST_U24_3LE, "GST_U24_3LE", "u24-3le"}, + {GST_U24_3BE, "GST_U24_3BE", "u24-3be"}, + {GST_S20_3LE, "GST_S20_3LE", "s20-3le"}, + {GST_S20_3BE, "GST_S20_3BE", "s20-3be"}, + {GST_U20_3LE, "GST_U20_3LE", "u20-3le"}, + {GST_U20_3BE, "GST_U20_3BE", "u20-3be"}, + {GST_S18_3LE, "GST_S18_3LE", "s18-3le"}, + {GST_S18_3BE, "GST_S18_3BE", "s18-3be"}, + {GST_U18_3LE, "GST_U18_3LE", "u18-3le"}, + {GST_U18_3BE, "GST_U18_3BE", "u18-3be"}, + {GST_FLOAT32_LE, "GST_FLOAT32_LE", "float32-le"}, + {GST_FLOAT32_BE, "GST_FLOAT32_BE", "float32-be"}, + {GST_FLOAT64_LE, "GST_FLOAT64_LE", "float64-le"}, + {GST_FLOAT64_BE, "GST_FLOAT64_BE", "float64-be"}, + {GST_MU_LAW, "GST_MU_LAW", "mu-law"}, + {GST_A_LAW, "GST_A_LAW", "a-law"}, + {GST_IMA_ADPCM, "GST_IMA_ADPCM", "ima-adpcm"}, + {GST_MPEG, "GST_MPEG", "mpeg"}, + {GST_GSM, "GST_GSM", "gsm"}, + {GST_IEC958, "GST_IEC958", "iec958"}, + {GST_AC3, "GST_AC3", "ac3"}, + {GST_EAC3, "GST_EAC3", "eac3"}, + {GST_DTS, "GST_DTS", "dts"}, + {0, NULL, NULL} + }; + GType g_define_type_id = g_enum_register_static ("GstBufferFormat", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; } /* Generated data ends here */ diff --git a/win32/common/multichannel-enumtypes.h b/win32/common/multichannel-enumtypes.h index f3cc6bdfcc..b3d1558169 100644 --- a/win32/common/multichannel-enumtypes.h +++ b/win32/common/multichannel-enumtypes.h @@ -11,6 +11,16 @@ G_BEGIN_DECLS /* enumerations from "multichannel.h" */ GType gst_audio_channel_position_get_type (void); #define GST_TYPE_AUDIO_CHANNEL_POSITION (gst_audio_channel_position_get_type()) + +/* enumerations from "gstringbuffer.h" */ +GType gst_ring_buffer_state_get_type (void); +#define GST_TYPE_RING_BUFFER_STATE (gst_ring_buffer_state_get_type()) +GType gst_ring_buffer_seg_state_get_type (void); +#define GST_TYPE_RING_BUFFER_SEG_STATE (gst_ring_buffer_seg_state_get_type()) +GType gst_buffer_format_type_get_type (void); +#define GST_TYPE_BUFFER_FORMAT_TYPE (gst_buffer_format_type_get_type()) +GType gst_buffer_format_get_type (void); +#define GST_TYPE_BUFFER_FORMAT (gst_buffer_format_get_type()) G_END_DECLS #endif /* __GST_AUDIO_ENUM_TYPES_H__ */