diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-17 11:04:47 +0100 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-17 11:04:47 +0100 |
commit | 1fa32659e3e2df030d0d9f3376316bed0b5b27a3 (patch) | |
tree | e6ff8001e096264e5ebc2be8a759fd074e447108 /win32 | |
parent | 3ce9836a593ccce0a1bba9add2c03de5ae4264f4 (diff) |
RELEASE 0.11.1
Diffstat (limited to 'win32')
-rw-r--r-- | win32/common/config.h | 69 | ||||
-rw-r--r-- | win32/common/gstrtpbin-marshal.c | 74 | ||||
-rw-r--r-- | win32/common/gstrtpbin-marshal.h | 17 |
3 files changed, 108 insertions, 52 deletions
diff --git a/win32/common/config.h b/win32/common/config.h index c8c9ac491..b616ededb 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -31,7 +31,13 @@ #undef ENABLE_NLS /* gettext package name */ -#define GETTEXT_PACKAGE "gst-plugins-good-0.10" +#define GETTEXT_PACKAGE "gst-plugins-good-0.11" + +/* The GIO library directory. */ +#undef GIO_LIBDIR + +/* The GIO modules directory. */ +#undef GIO_MODULE_DIR /* Defined if gcov is enabled to force a rebuild due to config.h changing */ #undef GST_GCOV_ENABLED @@ -43,13 +49,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 source release" /* 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-05-18T13:36Z" +#define GST_PACKAGE_RELEASE_DATETIME "2012-02-16" /* struct v4l2_buffer missing */ #undef GST_V4L2_MISSING_BUFDECL @@ -145,9 +151,6 @@ /* Define to enable raw1394 and avc1394 library (used by 1394). */ #undef HAVE_DV1394 -/* Define to enable ESounD sound daemon (used by esdsink). */ -#undef HAVE_ESD - /* Define to enable building of experimental plug-ins. */ #undef HAVE_EXPERIMENTAL @@ -172,12 +175,6 @@ /* Define if compiler supports gcc inline assembly */ #undef HAVE_GCC_ASM -/* Define to enable GConf libraries (used by gconfelements). */ -#undef HAVE_GCONF - -/* Define to enable GConf schemas. */ -#undef HAVE_GCONFTOOL - /* Define to enable GDK pixbuf (used by gdkpixbuf). */ #undef HAVE_GDK_PIXBUF @@ -193,9 +190,6 @@ /* Whether gudev is available for device detection */ #undef HAVE_GUDEV -/* Define to enable HAL libraries (used by halelements). */ -#undef HAVE_HAL - /* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV @@ -229,9 +223,6 @@ /* Define to enable Portable Network Graphics library (used by png). */ #undef HAVE_LIBPNG -/* Define to 1 if you have the `socket' library (-lsocket). */ -#undef HAVE_LIBSOCKET - /* soup gnome integration */ #undef HAVE_LIBSOUP_GNOME @@ -244,9 +235,6 @@ /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP -/* Define to 1 if you have the <netinet/in.h> header file. */ -#undef HAVE_NETINET_IN_H - /* Use Orc */ #undef HAVE_ORC @@ -277,24 +265,6 @@ /* Define to enable pulseaudio plug-in (used by pulseaudio). */ #undef HAVE_PULSE -/* defined if pulseaudio >= 0.9.11 is available */ -#undef HAVE_PULSE_0_9_11 - -/* defined if pulseaudio >= 0.9.12 is available */ -#undef HAVE_PULSE_0_9_12 - -/* defined if pulseaudio >= 0.9.13 is available */ -#undef HAVE_PULSE_0_9_13 - -/* defined if pulseaudio >= 0.9.15 is available */ -#undef HAVE_PULSE_0_9_15 - -/* defined if pulseaudio >= 0.9.16 is available */ -#undef HAVE_PULSE_0_9_16 - -/* defined if pulseaudio >= 0.9.20 is available */ -#undef HAVE_PULSE_0_9_20 - /* Define if RDTSC is available */ #undef HAVE_RDTSC @@ -334,9 +304,6 @@ /* Define to 1 if you have the <sys/param.h> header file. */ #undef HAVE_SYS_PARAM_H -/* Define to 1 if you have the <sys/socket.h> header file. */ -#undef HAVE_SYS_SOCKET_H - /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 @@ -355,12 +322,12 @@ /* Define if valgrind should be used */ #undef HAVE_VALGRIND +/* Define to enable Win32 WaveForm (used by waveformsink). */ +#undef HAVE_WAVEFORM + /* Define to enable wavpack plug-in (used by wavpack). */ #undef HAVE_WAVPACK -/* Define to 1 if you have the <winsock2.h> header file. */ -#define HAVE_WINSOCK2_H 1 - /* Define to enable X libraries and plugins (used by ximagesrc). */ #undef HAVE_X @@ -370,7 +337,7 @@ /* Define to enable X11 XVideo extensions. */ #undef HAVE_XVIDEO -/* Define to enable zlib support for id3demux/qtdemux/matroska. */ +/* Define to enable zlib support for qtdemux/matroska. */ #undef HAVE_ZLIB /* the host CPU */ @@ -396,7 +363,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.30.1" +#define PACKAGE_STRING "GStreamer Good Plug-ins 0.11.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-good" @@ -405,13 +372,13 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.30.1" +#define PACKAGE_VERSION "0.11.1" /* directory where plugins are located */ #ifdef _DEBUG -# define PLUGINDIR PREFIX "\\debug\\lib\\gstreamer-0.10" +# define PLUGINDIR PREFIX "\\debug\\lib\\gstreamer-0.11" #else -# define PLUGINDIR PREFIX "\\lib\\gstreamer-0.10" +# define PLUGINDIR PREFIX "\\lib\\gstreamer-0.11" #endif /* The size of `char', as computed by sizeof. */ @@ -436,7 +403,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.10.30.1" +#define VERSION "0.11.1" /* old wavpack API */ #undef WAVPACK_OLD_API diff --git a/win32/common/gstrtpbin-marshal.c b/win32/common/gstrtpbin-marshal.c index 633995758..bbea5a4e5 100644 --- a/win32/common/gstrtpbin-marshal.c +++ b/win32/common/gstrtpbin-marshal.c @@ -5,7 +5,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) @@ -350,3 +350,75 @@ gst_rtp_bin_marshal_VOID__UINT64 (GClosure * closure, callback (data1, g_marshal_value_peek_uint64 (param_values + 1), data2); } + +/* BOOL:BOXED,BOOL (gstrtpbin-marshal.list:11) */ +void +gst_rtp_bin_marshal_BOOLEAN__BOXED_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__BOXED_BOOLEAN) (gpointer data1, + gpointer arg_1, gboolean arg_2, gpointer data2); + register GMarshalFunc_BOOLEAN__BOXED_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__BOXED_BOOLEAN) (marshal_data ? marshal_data : + cc->callback); + + v_return = callback (data1, + g_marshal_value_peek_boxed (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,BOXED (gstrtpbin-marshal.list:12) */ +void +gst_rtp_bin_marshal_VOID__UINT_UINT_UINT_UINT_BOXED (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_BOXED) (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_BOXED 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_BOXED) (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_boxed (param_values + 5), data2); +} diff --git a/win32/common/gstrtpbin-marshal.h b/win32/common/gstrtpbin-marshal.h index d5242046e..5a9a196d5 100644 --- a/win32/common/gstrtpbin-marshal.h +++ b/win32/common/gstrtpbin-marshal.h @@ -82,6 +82,23 @@ extern void gst_rtp_bin_marshal_VOID__UINT64 (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); +/* BOOL:BOXED,BOOL (gstrtpbin-marshal.list:11) */ +extern void gst_rtp_bin_marshal_BOOLEAN__BOXED_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__BOXED_BOOL gst_rtp_bin_marshal_BOOLEAN__BOXED_BOOLEAN + +/* VOID:UINT,UINT,UINT,UINT,BOXED (gstrtpbin-marshal.list:12) */ +extern void gst_rtp_bin_marshal_VOID__UINT_UINT_UINT_UINT_BOXED (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + G_END_DECLS #endif /* __gst_rtp_bin_marshal_MARSHAL_H__ */ |