From a4f67464788e85285dcc63e258f7c9f3f3101c88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 16 Apr 2011 14:56:03 +0100 Subject: [PATCH] 0.10.32.2 pre-release --- configure.ac | 2 +- docs/plugins/gstreamer-plugins.args | 2 +- docs/plugins/inspect/plugin-coreelements.xml | 6 +- docs/plugins/inspect/plugin-coreindexers.xml | 4 +- win32/common/config.h | 10 +-- win32/common/gstenumtypes.c | 66 ++++++++++++++++++++ win32/common/gstenumtypes.h | 6 ++ win32/common/gstversion.h | 2 +- 8 files changed, 85 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index a918ebb42c..7f8c3db616 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.32.1, +AC_INIT(GStreamer, 0.10.32.2, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gstreamer) AG_GST_INIT diff --git a/docs/plugins/gstreamer-plugins.args b/docs/plugins/gstreamer-plugins.args index 507789f70a..75548b2bcd 100644 --- a/docs/plugins/gstreamer-plugins.args +++ b/docs/plugins/gstreamer-plugins.args @@ -994,7 +994,7 @@ rw Max. ring buffer size (bytes) -Max. amount of data in the ring buffer (bytes, 0 = disabled. +Max. amount of data in the ring buffer (bytes, 0 = disabled). 0 diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml index d0acd6440b..41c43f502e 100644 --- a/docs/plugins/inspect/plugin-coreelements.xml +++ b/docs/plugins/inspect/plugin-coreelements.xml @@ -3,10 +3,10 @@ standard GStreamer elements ../../plugins/elements/.libs/libgstcoreelements.so libgstcoreelements.so - 0.10.32.1 + 0.10.32.2 LGPL gstreamer - GStreamer git + GStreamer prerelease Unknown package origin @@ -122,7 +122,7 @@ funnel - Farsight Funnel pipe fitting + Funnel pipe fitting Generic N-to-1 pipe fitting Olivier Crete <olivier.crete@collabora.co.uk> diff --git a/docs/plugins/inspect/plugin-coreindexers.xml b/docs/plugins/inspect/plugin-coreindexers.xml index 29f92f5d53..31b1908af5 100644 --- a/docs/plugins/inspect/plugin-coreindexers.xml +++ b/docs/plugins/inspect/plugin-coreindexers.xml @@ -3,10 +3,10 @@ GStreamer core indexers ../../plugins/indexers/.libs/libgstcoreindexers.so libgstcoreindexers.so - 0.10.32.1 + 0.10.32.2 LGPL gstreamer - GStreamer git + GStreamer prerelease Unknown package origin diff --git a/win32/common/config.h b/win32/common/config.h index a58663cc10..756fc529ea 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -59,13 +59,13 @@ #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" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2011-01-23T23:22Z" +#define GST_PACKAGE_RELEASE_DATETIME "2011-04-16T12:48Z" /* location of the installed gst-plugin-scanner */ #define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner" @@ -340,7 +340,7 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 0.10.32.1" +#define PACKAGE_STRING "GStreamer 0.10.32.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" @@ -349,7 +349,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.32.1" +#define PACKAGE_VERSION "0.10.32.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -380,7 +380,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.10.32.1" +#define VERSION "0.10.32.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 a21b61e4e8..7a0f5ae30d 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -53,6 +53,7 @@ gst_buffer_flag_get_type (void) static const GFlagsValue values[] = { {C_FLAGS (GST_BUFFER_FLAG_READONLY), "GST_BUFFER_FLAG_READONLY", "readonly"}, + {C_FLAGS (GST_BUFFER_FLAG_MEDIA4), "GST_BUFFER_FLAG_MEDIA4", "media4"}, {C_FLAGS (GST_BUFFER_FLAG_PREROLL), "GST_BUFFER_FLAG_PREROLL", "preroll"}, {C_FLAGS (GST_BUFFER_FLAG_DISCONT), "GST_BUFFER_FLAG_DISCONT", "discont"}, {C_FLAGS (GST_BUFFER_FLAG_IN_CAPS), "GST_BUFFER_FLAG_IN_CAPS", "in-caps"}, @@ -171,6 +172,25 @@ gst_caps_flags_get_type (void) return (GType) id; } +GType +gst_caps_intersect_mode_get_type (void) +{ + static gsize id = 0; + static const GEnumValue values[] = { + {C_ENUM (GST_CAPS_INTERSECT_ZIG_ZAG), "GST_CAPS_INTERSECT_ZIG_ZAG", + "zig-zag"}, + {C_ENUM (GST_CAPS_INTERSECT_FIRST), "GST_CAPS_INTERSECT_FIRST", "first"}, + {0, NULL, NULL} + }; + + if (g_once_init_enter (&id)) { + GType tmp = g_enum_register_static ("GstCapsIntersectMode", values); + g_once_init_leave (&id, tmp); + } + + return (GType) id; +} + /* enumerations from "gstclock.h" */ GType gst_clock_return_get_type (void) @@ -605,6 +625,25 @@ gst_seek_flags_get_type (void) return (GType) id; } +GType +gst_qos_type_get_type (void) +{ + static gsize id = 0; + static const GEnumValue values[] = { + {C_ENUM (GST_QOS_TYPE_OVERFLOW), "GST_QOS_TYPE_OVERFLOW", "overflow"}, + {C_ENUM (GST_QOS_TYPE_UNDERFLOW), "GST_QOS_TYPE_UNDERFLOW", "underflow"}, + {C_ENUM (GST_QOS_TYPE_THROTTLE), "GST_QOS_TYPE_THROTTLE", "throttle"}, + {0, NULL, NULL} + }; + + if (g_once_init_enter (&id)) { + GType tmp = g_enum_register_static ("GstQOSType", values); + g_once_init_leave (&id, tmp); + } + + return (GType) id; +} + /* enumerations from "gstformat.h" */ GType gst_format_get_type (void) @@ -891,6 +930,7 @@ gst_message_type_get_type (void) "request-state"}, {C_FLAGS (GST_MESSAGE_STEP_START), "GST_MESSAGE_STEP_START", "step-start"}, {C_FLAGS (GST_MESSAGE_QOS), "GST_MESSAGE_QOS", "qos"}, + {C_FLAGS (GST_MESSAGE_PROGRESS), "GST_MESSAGE_PROGRESS", "progress"}, {C_FLAGS (GST_MESSAGE_ANY), "GST_MESSAGE_ANY", "any"}, {0, NULL, NULL} }; @@ -953,6 +993,30 @@ gst_stream_status_type_get_type (void) return (GType) id; } +GType +gst_progress_type_get_type (void) +{ + static gsize id = 0; + static const GEnumValue values[] = { + {C_ENUM (GST_PROGRESS_TYPE_START), "GST_PROGRESS_TYPE_START", "start"}, + {C_ENUM (GST_PROGRESS_TYPE_CONTINUE), "GST_PROGRESS_TYPE_CONTINUE", + "continue"}, + {C_ENUM (GST_PROGRESS_TYPE_COMPLETE), "GST_PROGRESS_TYPE_COMPLETE", + "complete"}, + {C_ENUM (GST_PROGRESS_TYPE_CANCELED), "GST_PROGRESS_TYPE_CANCELED", + "canceled"}, + {C_ENUM (GST_PROGRESS_TYPE_ERROR), "GST_PROGRESS_TYPE_ERROR", "error"}, + {0, NULL, NULL} + }; + + if (g_once_init_enter (&id)) { + GType tmp = g_enum_register_static ("GstProgressType", values); + g_once_init_leave (&id, tmp); + } + + return (GType) id; +} + /* enumerations from "gstminiobject.h" */ GType gst_mini_object_flags_get_type (void) @@ -961,6 +1025,8 @@ gst_mini_object_flags_get_type (void) static const GFlagsValue values[] = { {C_FLAGS (GST_MINI_OBJECT_FLAG_READONLY), "GST_MINI_OBJECT_FLAG_READONLY", "readonly"}, + {C_FLAGS (GST_MINI_OBJECT_FLAG_RESERVED1), "GST_MINI_OBJECT_FLAG_RESERVED1", + "reserved1"}, {C_FLAGS (GST_MINI_OBJECT_FLAG_LAST), "GST_MINI_OBJECT_FLAG_LAST", "last"}, {0, NULL, NULL} }; diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h index 2e19727556..292eb54847 100644 --- a/win32/common/gstenumtypes.h +++ b/win32/common/gstenumtypes.h @@ -35,6 +35,8 @@ GType gst_bus_sync_reply_get_type (void); /* enumerations from "gstcaps.h" */ GType gst_caps_flags_get_type (void); #define GST_TYPE_CAPS_FLAGS (gst_caps_flags_get_type()) +GType gst_caps_intersect_mode_get_type (void); +#define GST_TYPE_CAPS_INTERSECT_MODE (gst_caps_intersect_mode_get_type()) /* enumerations from "gstclock.h" */ GType gst_clock_return_get_type (void); @@ -77,6 +79,8 @@ GType gst_seek_type_get_type (void); #define GST_TYPE_SEEK_TYPE (gst_seek_type_get_type()) GType gst_seek_flags_get_type (void); #define GST_TYPE_SEEK_FLAGS (gst_seek_flags_get_type()) +GType gst_qos_type_get_type (void); +#define GST_TYPE_QOS_TYPE (gst_qos_type_get_type()) /* enumerations from "gstformat.h" */ GType gst_format_get_type (void); @@ -115,6 +119,8 @@ GType gst_structure_change_type_get_type (void); #define GST_TYPE_STRUCTURE_CHANGE_TYPE (gst_structure_change_type_get_type()) GType gst_stream_status_type_get_type (void); #define GST_TYPE_STREAM_STATUS_TYPE (gst_stream_status_type_get_type()) +GType gst_progress_type_get_type (void); +#define GST_TYPE_PROGRESS_TYPE (gst_progress_type_get_type()) /* enumerations from "gstminiobject.h" */ GType gst_mini_object_flags_get_type (void); diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 86116c35bf..558dceb2f6 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.34.1