From 5c9e2646e09524ec14ad74c5ed976409c75d2abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 16 Apr 2011 18:50:11 +0100 Subject: [PATCH] 0.10.28.2 pre-release --- configure.ac | 2 +- win32/common/config.h | 16 ++++--- win32/common/gstrtpbin-marshal.c | 74 +------------------------------- win32/common/gstrtpbin-marshal.h | 19 +------- 4 files changed, 14 insertions(+), 97 deletions(-) diff --git a/configure.ac b/configure.ac index 8f0b052f80..2413c481a6 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/pre -AC_INIT(GStreamer Good Plug-ins, 0.10.28.1, +AC_INIT(GStreamer Good Plug-ins, 0.10.28.2, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-plugins-good) diff --git a/win32/common/config.h b/win32/common/config.h index 84520c4792..f332d338e2 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -43,13 +43,13 @@ #define GST_LICENSE "LGPL" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer Good Plug-ins git" +#define GST_PACKAGE_NAME "GStreamer Good 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-03-08T16:22Z" +#define GST_PACKAGE_RELEASE_DATETIME "2011-04-16T15:21Z" /* struct v4l2_buffer missing */ #undef GST_V4L2_MISSING_BUFDECL @@ -211,6 +211,12 @@ /* Define to enable Jack (used by jack). */ #undef HAVE_JACK +/* defined if jack >= 0.120.1 is available */ +#undef HAVE_JACK_0_120_1 + +/* defined if jack >= 1.9.7 is available */ +#undef HAVE_JACK_1_9_7 + /* Define to enable jpeg library (used by jpeg). */ #undef HAVE_JPEG @@ -390,7 +396,7 @@ #define PACKAGE_NAME "GStreamer Good Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Good Plug-ins 0.10.28.1" +#define PACKAGE_STRING "GStreamer Good Plug-ins 0.10.28.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-good" @@ -399,7 +405,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.28.1" +#define PACKAGE_VERSION "0.10.28.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -430,7 +436,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.10.28.1" +#define VERSION "0.10.28.2" /* old wavpack API */ #undef WAVPACK_OLD_API diff --git a/win32/common/gstrtpbin-marshal.c b/win32/common/gstrtpbin-marshal.c index 5fae29f3fc..6339957582 100644 --- a/win32/common/gstrtpbin-marshal.c +++ b/win32/common/gstrtpbin-marshal.c @@ -322,79 +322,7 @@ gst_rtp_bin_marshal_UINT64__BOOLEAN_UINT64 (GClosure * closure, g_value_set_uint64 (return_value, v_return); } -/* BOOL:POINTER,BOOL (gstrtpbin-marshal.list:10) */ -void -gst_rtp_bin_marshal_BOOLEAN__POINTER_BOOLEAN (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_BOOLEAN) (gpointer data1, - gpointer arg_1, gboolean arg_2, gpointer data2); - register GMarshalFunc_BOOLEAN__POINTER_BOOLEAN callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - gboolean v_return; - - g_return_if_fail (return_value != NULL); - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_BOOLEAN__POINTER_BOOLEAN) (marshal_data ? marshal_data : - cc->callback); - - v_return = callback (data1, - g_marshal_value_peek_pointer (param_values + 1), - g_marshal_value_peek_boolean (param_values + 2), data2); - - g_value_set_boolean (return_value, v_return); -} - -/* VOID:UINT,UINT,UINT,UINT,POINTER (gstrtpbin-marshal.list:11) */ -void -gst_rtp_bin_marshal_VOID__UINT_UINT_UINT_UINT_POINTER (GClosure * closure, - GValue * return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue * param_values, - gpointer invocation_hint G_GNUC_UNUSED, gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__UINT_UINT_UINT_UINT_POINTER) (gpointer - data1, guint arg_1, guint arg_2, guint arg_3, guint arg_4, gpointer arg_5, - gpointer data2); - register GMarshalFunc_VOID__UINT_UINT_UINT_UINT_POINTER callback; - register GCClosure *cc = (GCClosure *) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 6); - - if (G_CCLOSURE_SWAP_DATA (closure)) { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } else { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = - (GMarshalFunc_VOID__UINT_UINT_UINT_UINT_POINTER) (marshal_data ? - marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_uint (param_values + 1), - g_marshal_value_peek_uint (param_values + 2), - g_marshal_value_peek_uint (param_values + 3), - g_marshal_value_peek_uint (param_values + 4), - g_marshal_value_peek_pointer (param_values + 5), data2); -} - -/* VOID:UINT64 (gstrtpbin-marshal.list:12) */ +/* VOID:UINT64 (gstrtpbin-marshal.list:10) */ void gst_rtp_bin_marshal_VOID__UINT64 (GClosure * closure, GValue * return_value G_GNUC_UNUSED, diff --git a/win32/common/gstrtpbin-marshal.h b/win32/common/gstrtpbin-marshal.h index 6d25b44127..d5242046e7 100644 --- a/win32/common/gstrtpbin-marshal.h +++ b/win32/common/gstrtpbin-marshal.h @@ -74,24 +74,7 @@ extern void gst_rtp_bin_marshal_UINT64__BOOLEAN_UINT64 (GClosure *closure, gpointer marshal_data); #define gst_rtp_bin_marshal_UINT64__BOOL_UINT64 gst_rtp_bin_marshal_UINT64__BOOLEAN_UINT64 -/* BOOL:POINTER,BOOL (gstrtpbin-marshal.list:10) */ -extern void gst_rtp_bin_marshal_BOOLEAN__POINTER_BOOLEAN (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define gst_rtp_bin_marshal_BOOL__POINTER_BOOL gst_rtp_bin_marshal_BOOLEAN__POINTER_BOOLEAN - -/* VOID:UINT,UINT,UINT,UINT,POINTER (gstrtpbin-marshal.list:11) */ -extern void gst_rtp_bin_marshal_VOID__UINT_UINT_UINT_UINT_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:UINT64 (gstrtpbin-marshal.list:12) */ +/* VOID:UINT64 (gstrtpbin-marshal.list:10) */ extern void gst_rtp_bin_marshal_VOID__UINT64 (GClosure *closure, GValue *return_value, guint n_param_values,