From 484ab2a561178e4c1e93066b1ce343207e2e3d86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 26 Jun 2010 17:48:31 +0100 Subject: [PATCH] 0.10.29.2 pre-release --- configure.ac | 2 +- win32/common/config.h | 8 ++++---- win32/common/gstenumtypes.c | 24 ++++++++++++++++++++++++ win32/common/gstenumtypes.h | 2 ++ win32/common/gstversion.h | 2 +- 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 5bf00f9..0bcf977 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.60) dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, git and prerelease does Werror too -AC_INIT(GStreamer, 0.10.29.1, +AC_INIT(GStreamer, 0.10.29.2, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gstreamer) AG_GST_INIT diff --git a/win32/common/config.h b/win32/common/config.h index 3d43d38..1b7f445 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -59,7 +59,7 @@ #define GST_MAJORMINOR "0.10" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer git" +#define GST_PACKAGE_NAME "GStreamer prerelease" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" @@ -331,7 +331,7 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 0.10.29.1" +#define PACKAGE_STRING "GStreamer 0.10.29.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" @@ -340,7 +340,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.29.1" +#define PACKAGE_VERSION "0.10.29.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -371,7 +371,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.10.29.1" +#define VERSION "0.10.29.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/gstenumtypes.c b/win32/common/gstenumtypes.c index 3ae281e..ae7b641 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -759,6 +759,7 @@ gst_debug_level_get_type (void) {C_ENUM (GST_LEVEL_DEBUG), "GST_LEVEL_DEBUG", "debug"}, {C_ENUM (GST_LEVEL_LOG), "GST_LEVEL_LOG", "log"}, {C_ENUM (GST_LEVEL_FIXME), "GST_LEVEL_FIXME", "fixme"}, + {C_ENUM (GST_LEVEL_TRACE), "GST_LEVEL_TRACE", "trace"}, {C_ENUM (GST_LEVEL_MEMDUMP), "GST_LEVEL_MEMDUMP", "memdump"}, {C_ENUM (GST_LEVEL_COUNT), "GST_LEVEL_COUNT", "count"}, {0, NULL, NULL} @@ -1034,6 +1035,29 @@ gst_flow_return_get_type (void) } GType +gst_pad_link_check_get_type (void) +{ + static gsize id = 0; + static const GFlagsValue values[] = { + {C_FLAGS (GST_PAD_LINK_CHECK_NOTHING), "GST_PAD_LINK_CHECK_NOTHING", + "nothing"}, + {C_FLAGS (GST_PAD_LINK_CHECK_HIERARCHY), "GST_PAD_LINK_CHECK_HIERARCHY", + "hierarchy"}, + {C_FLAGS (GST_PAD_LINK_CHECK_TEMPLATE_CAPS), + "GST_PAD_LINK_CHECK_TEMPLATE_CAPS", "template-caps"}, + {C_FLAGS (GST_PAD_LINK_CHECK_CAPS), "GST_PAD_LINK_CHECK_CAPS", "caps"}, + {0, NULL, NULL} + }; + + if (g_once_init_enter (&id)) { + GType tmp = g_flags_register_static ("GstPadLinkCheck", values); + g_once_init_leave (&id, tmp); + } + + return (GType) id; +} + +GType gst_activate_mode_get_type (void) { static gsize id = 0; diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h index e21a9b9..3dfb07a 100644 --- a/win32/common/gstenumtypes.h +++ b/win32/common/gstenumtypes.h @@ -125,6 +125,8 @@ GType gst_pad_link_return_get_type (void); #define GST_TYPE_PAD_LINK_RETURN (gst_pad_link_return_get_type()) GType gst_flow_return_get_type (void); #define GST_TYPE_FLOW_RETURN (gst_flow_return_get_type()) +GType gst_pad_link_check_get_type (void); +#define GST_TYPE_PAD_LINK_CHECK (gst_pad_link_check_get_type()) GType gst_activate_mode_get_type (void); #define GST_TYPE_ACTIVATE_MODE (gst_activate_mode_get_type()) GType gst_pad_direction_get_type (void); diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 7c73713..dc5f8cf 100644 --- a/win32/common/gstversion.h +++ b/win32/common/gstversion.h @@ -64,7 +64,7 @@ G_BEGIN_DECLS * The nano version of GStreamer at compile time: * Actual releases have 0, GIT versions have 1, prerelease versions have 2-... */ -#define GST_VERSION_NANO (1) +#define GST_VERSION_NANO (2) /** * GST_CHECK_VERSION: -- 2.7.4