From 8e2cd0b0bbaaf8b4af72dd40f4a6fe2b064d5f5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 24 Sep 2010 14:03:45 +0100 Subject: [PATCH] win32: define GST_PACKAGE_RELEASE_DATETIME in win32 config.h as well Also update enums. --- configure.ac | 1 + win32/common/_stdint.h | 2 +- win32/common/audio-enumtypes.c | 4 +--- win32/common/audio-enumtypes.h | 4 ++-- win32/common/config.h | 6 ++++++ win32/common/gstrtsp-enumtypes.c | 4 +--- win32/common/gstrtsp-enumtypes.h | 4 ++-- win32/common/interfaces-enumtypes.c | 4 +--- win32/common/interfaces-enumtypes.h | 4 ++-- win32/common/pbutils-enumtypes.c | 26 ++++++++++++++++++++++++-- win32/common/pbutils-enumtypes.h | 8 ++++++-- win32/common/video-enumtypes.c | 5 ++--- win32/common/video-enumtypes.h | 4 ++-- 13 files changed, 51 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac index 126ebdd..2623a1d 100644 --- a/configure.ac +++ b/configure.ac @@ -990,6 +990,7 @@ sed \ -e 's/.* GST_MAJORMINOR$/#define GST_MAJORMINOR "'$GST_MAJORMINOR'"/' \ -e "s,.* GST_PACKAGE_NAME$,#define GST_PACKAGE_NAME \"${GST_PACKAGE_NAME}\"," \ -e 's/.* GST_PACKAGE_ORIGIN$/#define GST_PACKAGE_ORIGIN "Unknown package origin"/' \ + -e "s,.* GST_PACKAGE_RELEASE_DATETIME$,#define GST_PACKAGE_RELEASE_DATETIME \"${GST_PACKAGE_RELEASE_DATETIME}\"," \ -e 's/.* HAVE_CPU_I386$/#define HAVE_CPU_I386 1/' \ -e 's/.* HAVE_FGETPOS$/#define HAVE_FGETPOS 1/' \ -e 's/.* HAVE_FSETPOS$/#define HAVE_FSETPOS 1/' \ diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h index 58fe880..4e6ac08 100644 --- a/win32/common/_stdint.h +++ b/win32/common/_stdint.h @@ -2,7 +2,7 @@ #define _GST_PLUGINS_BASE__STDINT_H 1 #ifndef _GENERATED_STDINT_H #define _GENERATED_STDINT_H "gst-plugins-base 0.10.30.1" -/* generated using gnu compiler gcc (Debian 4.4.4-7) 4.4.4 */ +/* generated using gnu compiler gcc (Debian 4.4.4-15) 4.4.5 20100913 (prerelease) */ #define _STDINT_HAVE_STDINT_H 1 #include #endif diff --git a/win32/common/audio-enumtypes.c b/win32/common/audio-enumtypes.c index b87241d..61af357 100644 --- a/win32/common/audio-enumtypes.c +++ b/win32/common/audio-enumtypes.c @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #include "audio-enumtypes.h" @@ -171,5 +171,3 @@ gst_buffer_format_get_type (void) } return g_define_type_id__volatile; } - -/* Generated data ends here */ diff --git a/win32/common/audio-enumtypes.h b/win32/common/audio-enumtypes.h index b3d1558..bc0db46 100644 --- a/win32/common/audio-enumtypes.h +++ b/win32/common/audio-enumtypes.h @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #ifndef __GST_AUDIO_ENUM_TYPES_H__ #define __GST_AUDIO_ENUM_TYPES_H__ @@ -25,5 +25,5 @@ G_END_DECLS #endif /* __GST_AUDIO_ENUM_TYPES_H__ */ -/* Generated data ends here */ + diff --git a/win32/common/config.h b/win32/common/config.h index f9f505a..2d9bd68 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -74,6 +74,9 @@ /* 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 "2010-09-24T11:21Z" + /* I know the API is subject to change. */ #undef G_UDEV_API_IS_SUBJECT_TO_CHANGE @@ -209,6 +212,9 @@ /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R +/* Define to 1 if you have the `log2' function. */ +#undef HAVE_LOG2 + /* Define if you have C99's lrint function. */ #undef HAVE_LRINT diff --git a/win32/common/gstrtsp-enumtypes.c b/win32/common/gstrtsp-enumtypes.c index 8e47a45..15a0c4b 100644 --- a/win32/common/gstrtsp-enumtypes.c +++ b/win32/common/gstrtsp-enumtypes.c @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #include "gstrtsp-enumtypes.h" @@ -387,5 +387,3 @@ gst_rtsp_status_code_get_type (void) } return g_define_type_id__volatile; } - -/* Generated data ends here */ diff --git a/win32/common/gstrtsp-enumtypes.h b/win32/common/gstrtsp-enumtypes.h index 5a631f6..3254324 100644 --- a/win32/common/gstrtsp-enumtypes.h +++ b/win32/common/gstrtsp-enumtypes.h @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #ifndef __gst_rtsp_ENUM_TYPES_H__ #define __gst_rtsp_ENUM_TYPES_H__ @@ -31,5 +31,5 @@ G_END_DECLS #endif /* __gst_rtsp_ENUM_TYPES_H__ */ -/* Generated data ends here */ + diff --git a/win32/common/interfaces-enumtypes.c b/win32/common/interfaces-enumtypes.c index 3213b81..9cb315d 100644 --- a/win32/common/interfaces-enumtypes.c +++ b/win32/common/interfaces-enumtypes.c @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #include "interfaces-enumtypes.h" @@ -272,5 +272,3 @@ gst_tuner_channel_flags_get_type (void) } return g_define_type_id__volatile; } - -/* Generated data ends here */ diff --git a/win32/common/interfaces-enumtypes.h b/win32/common/interfaces-enumtypes.h index 3c6960f..77fd7eb 100644 --- a/win32/common/interfaces-enumtypes.h +++ b/win32/common/interfaces-enumtypes.h @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #ifndef __GST_INTERFACES_ENUM_TYPES_H__ #define __GST_INTERFACES_ENUM_TYPES_H__ @@ -45,5 +45,5 @@ G_END_DECLS #endif /* __GST_INTERFACES_ENUM_TYPES_H__ */ -/* Generated data ends here */ + diff --git a/win32/common/pbutils-enumtypes.c b/win32/common/pbutils-enumtypes.c index 18ae03d..375b844 100644 --- a/win32/common/pbutils-enumtypes.c +++ b/win32/common/pbutils-enumtypes.c @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #include "pbutils-enumtypes.h" @@ -7,6 +7,7 @@ #include "descriptions.h" #include "install-plugins.h" #include "missing-plugins.h" +#include "gstdiscoverer.h" /* enumerations from "install-plugins.h" */ GType @@ -42,4 +43,25 @@ gst_install_plugins_return_get_type (void) return g_define_type_id__volatile; } -/* Generated data ends here */ +/* enumerations from "gstdiscoverer.h" */ +GType +gst_discoverer_result_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_DISCOVERER_OK, "GST_DISCOVERER_OK", "ok"}, + {GST_DISCOVERER_URI_INVALID, "GST_DISCOVERER_URI_INVALID", "uri-invalid"}, + {GST_DISCOVERER_ERROR, "GST_DISCOVERER_ERROR", "error"}, + {GST_DISCOVERER_TIMEOUT, "GST_DISCOVERER_TIMEOUT", "timeout"}, + {GST_DISCOVERER_BUSY, "GST_DISCOVERER_BUSY", "busy"}, + {GST_DISCOVERER_MISSING_PLUGINS, "GST_DISCOVERER_MISSING_PLUGINS", + "missing-plugins"}, + {0, NULL, NULL} + }; + GType g_define_type_id = + g_enum_register_static ("GstDiscovererResult", values); + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + } + return g_define_type_id__volatile; +} diff --git a/win32/common/pbutils-enumtypes.h b/win32/common/pbutils-enumtypes.h index 1b2398a..2a59c68 100644 --- a/win32/common/pbutils-enumtypes.h +++ b/win32/common/pbutils-enumtypes.h @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #ifndef __GST_INSTALL_ENUM_TYPES_H__ #define __GST_INSTALL_ENUM_TYPES_H__ @@ -11,9 +11,13 @@ G_BEGIN_DECLS /* enumerations from "install-plugins.h" */ GType gst_install_plugins_return_get_type (void); #define GST_TYPE_INSTALL_PLUGINS_RETURN (gst_install_plugins_return_get_type()) + +/* enumerations from "gstdiscoverer.h" */ +GType gst_discoverer_result_get_type (void); +#define GST_TYPE_DISCOVERER_RESULT (gst_discoverer_result_get_type()) G_END_DECLS #endif /* __GST_INSTALL_ENUM_TYPES_H__ */ -/* Generated data ends here */ + diff --git a/win32/common/video-enumtypes.c b/win32/common/video-enumtypes.c index 6644df5..6c31aeb 100644 --- a/win32/common/video-enumtypes.c +++ b/win32/common/video-enumtypes.c @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #include "video-enumtypes.h" @@ -46,6 +46,7 @@ gst_video_format_get_type (void) {GST_VIDEO_FORMAT_BGR16, "GST_VIDEO_FORMAT_BGR16", "bgr16"}, {GST_VIDEO_FORMAT_RGB15, "GST_VIDEO_FORMAT_RGB15", "rgb15"}, {GST_VIDEO_FORMAT_BGR15, "GST_VIDEO_FORMAT_BGR15", "bgr15"}, + {GST_VIDEO_FORMAT_UYVP, "GST_VIDEO_FORMAT_UYVP", "uyvp"}, {0, NULL, NULL} }; GType g_define_type_id = g_enum_register_static ("GstVideoFormat", values); @@ -53,5 +54,3 @@ gst_video_format_get_type (void) } return g_define_type_id__volatile; } - -/* Generated data ends here */ diff --git a/win32/common/video-enumtypes.h b/win32/common/video-enumtypes.h index 3f99b47..a247abc 100644 --- a/win32/common/video-enumtypes.h +++ b/win32/common/video-enumtypes.h @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ + #ifndef __GST_VIDEO_ENUM_TYPES_H__ #define __GST_VIDEO_ENUM_TYPES_H__ @@ -15,5 +15,5 @@ G_END_DECLS #endif /* __GST_VIDEO_ENUM_TYPES_H__ */ -/* Generated data ends here */ + -- 2.7.4