From 68c67118a97992ae317a2ac5889c04e86b12bcb8 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 16 Apr 2009 00:40:59 +0100 Subject: [PATCH] win32: Update win32 build files --- win32/common/_stdint.h | 2 +- win32/common/config.h | 23 +++++-- win32/common/gstrtsp-enumtypes.c | 37 +++++++++++ win32/common/interfaces-enumtypes.c | 97 +++++++++++++++++++++++++++++ win32/common/interfaces-enumtypes.h | 10 +++ win32/common/video-enumtypes.c | 1 + 6 files changed, 163 insertions(+), 7 deletions(-) diff --git a/win32/common/_stdint.h b/win32/common/_stdint.h index 91486463a9..0ef8dcf736 100644 --- a/win32/common/_stdint.h +++ b/win32/common/_stdint.h @@ -1,7 +1,7 @@ #ifndef _GST_PLUGINS_BASE__STDINT_H #define _GST_PLUGINS_BASE__STDINT_H 1 #ifndef _GENERATED_STDINT_H -#define _GENERATED_STDINT_H "gst-plugins-base 0.10.22.1" +#define _GENERATED_STDINT_H "gst-plugins-base 0.10.22.2" /* generated using gnu compiler gcc (Ubuntu 4.3.2-1ubuntu12) 4.3.2 */ #define _STDINT_HAVE_STDINT_H 1 #include diff --git a/win32/common/config.h b/win32/common/config.h index 1311f0dbfb..32ebe5e9ea 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -3,6 +3,9 @@ /* PREFIX -- specifically added for Windows for easier moving */ #define PREFIX "C:\\gstreamer" +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + /* The implementation that should be used for integer audio resampling witll be benchmarked at runtime */ #undef AUDIORESAMPLE_FORMAT_AUTO @@ -301,13 +304,13 @@ #define PACKAGE_NAME "GStreamer Base Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.22.1" +#define PACKAGE_STRING "GStreamer Base Plug-ins 0.10.22.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-base" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.22.1" +#define PACKAGE_VERSION "0.10.22.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -335,11 +338,19 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.10.22.1" +#define VERSION "0.10.22.2" -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING diff --git a/win32/common/gstrtsp-enumtypes.c b/win32/common/gstrtsp-enumtypes.c index ce9c9cb6d3..2f86639d6d 100644 --- a/win32/common/gstrtsp-enumtypes.c +++ b/win32/common/gstrtsp-enumtypes.c @@ -222,6 +222,43 @@ gst_rtsp_header_field_get_type (void) {GST_RTSP_HDR_PLAYER_START_TIME, "GST_RTSP_HDR_PLAYER_START_TIME", "player-start-time"}, {GST_RTSP_HDR_LOCATION, "GST_RTSP_HDR_LOCATION", "location"}, + {GST_RTSP_HDR_ETAG, "GST_RTSP_HDR_ETAG", "etag"}, + {GST_RTSP_HDR_IF_MATCH, "GST_RTSP_HDR_IF_MATCH", "if-match"}, + {GST_RTSP_HDR_ACCEPT_CHARSET, "GST_RTSP_HDR_ACCEPT_CHARSET", + "accept-charset"}, + {GST_RTSP_HDR_SUPPORTED, "GST_RTSP_HDR_SUPPORTED", "supported"}, + {GST_RTSP_HDR_VARY, "GST_RTSP_HDR_VARY", "vary"}, + {GST_RTSP_HDR_X_ACCELERATE_STREAMING, + "GST_RTSP_HDR_X_ACCELERATE_STREAMING", "x-accelerate-streaming"}, + {GST_RTSP_HDR_X_ACCEPT_AUTHENT, "GST_RTSP_HDR_X_ACCEPT_AUTHENT", + "x-accept-authent"}, + {GST_RTSP_HDR_X_ACCEPT_PROXY_AUTHENT, + "GST_RTSP_HDR_X_ACCEPT_PROXY_AUTHENT", "x-accept-proxy-authent"}, + {GST_RTSP_HDR_X_BROADCAST_ID, "GST_RTSP_HDR_X_BROADCAST_ID", + "x-broadcast-id"}, + {GST_RTSP_HDR_X_BURST_STREAMING, "GST_RTSP_HDR_X_BURST_STREAMING", + "x-burst-streaming"}, + {GST_RTSP_HDR_X_NOTICE, "GST_RTSP_HDR_X_NOTICE", "x-notice"}, + {GST_RTSP_HDR_X_PLAYER_LAG_TIME, "GST_RTSP_HDR_X_PLAYER_LAG_TIME", + "x-player-lag-time"}, + {GST_RTSP_HDR_X_PLAYLIST, "GST_RTSP_HDR_X_PLAYLIST", "x-playlist"}, + {GST_RTSP_HDR_X_PLAYLIST_CHANGE_NOTICE, + "GST_RTSP_HDR_X_PLAYLIST_CHANGE_NOTICE", + "x-playlist-change-notice"}, + {GST_RTSP_HDR_X_PLAYLIST_GEN_ID, "GST_RTSP_HDR_X_PLAYLIST_GEN_ID", + "x-playlist-gen-id"}, + {GST_RTSP_HDR_X_PLAYLIST_SEEK_ID, "GST_RTSP_HDR_X_PLAYLIST_SEEK_ID", + "x-playlist-seek-id"}, + {GST_RTSP_HDR_X_PROXY_CLIENT_AGENT, "GST_RTSP_HDR_X_PROXY_CLIENT_AGENT", + "x-proxy-client-agent"}, + {GST_RTSP_HDR_X_PROXY_CLIENT_VERB, "GST_RTSP_HDR_X_PROXY_CLIENT_VERB", + "x-proxy-client-verb"}, + {GST_RTSP_HDR_X_RECEDING_PLAYLISTCHANGE, + "GST_RTSP_HDR_X_RECEDING_PLAYLISTCHANGE", + "x-receding-playlistchange"}, + {GST_RTSP_HDR_X_RTP_INFO, "GST_RTSP_HDR_X_RTP_INFO", "x-rtp-info"}, + {GST_RTSP_HDR_X_STARTUPPROFILE, "GST_RTSP_HDR_X_STARTUPPROFILE", + "x-startupprofile"}, {0, NULL, NULL} }; etype = g_enum_register_static ("GstRTSPHeaderField", values); diff --git a/win32/common/interfaces-enumtypes.c b/win32/common/interfaces-enumtypes.c index eaa648cb1f..69978839f7 100644 --- a/win32/common/interfaces-enumtypes.c +++ b/win32/common/interfaces-enumtypes.c @@ -116,6 +116,103 @@ gst_mixer_track_flags_get_type (void) return etype; } +/* enumerations from "navigation.h" */ +GType +gst_navigation_command_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + {GST_NAVIGATION_COMMAND_INVALID, "GST_NAVIGATION_COMMAND_INVALID", + "invalid"}, + {GST_NAVIGATION_COMMAND_MENU1, "GST_NAVIGATION_COMMAND_MENU1", "menu1"}, + {GST_NAVIGATION_COMMAND_MENU2, "GST_NAVIGATION_COMMAND_MENU2", "menu2"}, + {GST_NAVIGATION_COMMAND_MENU3, "GST_NAVIGATION_COMMAND_MENU3", "menu3"}, + {GST_NAVIGATION_COMMAND_MENU4, "GST_NAVIGATION_COMMAND_MENU4", "menu4"}, + {GST_NAVIGATION_COMMAND_MENU5, "GST_NAVIGATION_COMMAND_MENU5", "menu5"}, + {GST_NAVIGATION_COMMAND_MENU6, "GST_NAVIGATION_COMMAND_MENU6", "menu6"}, + {GST_NAVIGATION_COMMAND_MENU7, "GST_NAVIGATION_COMMAND_MENU7", "menu7"}, + {GST_NAVIGATION_COMMAND_LEFT, "GST_NAVIGATION_COMMAND_LEFT", "left"}, + {GST_NAVIGATION_COMMAND_RIGHT, "GST_NAVIGATION_COMMAND_RIGHT", "right"}, + {GST_NAVIGATION_COMMAND_UP, "GST_NAVIGATION_COMMAND_UP", "up"}, + {GST_NAVIGATION_COMMAND_DOWN, "GST_NAVIGATION_COMMAND_DOWN", "down"}, + {GST_NAVIGATION_COMMAND_ACTIVATE, "GST_NAVIGATION_COMMAND_ACTIVATE", + "activate"}, + {GST_NAVIGATION_COMMAND_PREV_ANGLE, "GST_NAVIGATION_COMMAND_PREV_ANGLE", + "prev-angle"}, + {GST_NAVIGATION_COMMAND_NEXT_ANGLE, "GST_NAVIGATION_COMMAND_NEXT_ANGLE", + "next-angle"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstNavigationCommand", values); + } + return etype; +} + +GType +gst_navigation_query_type_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + {GST_NAVIGATION_QUERY_INVALID, "GST_NAVIGATION_QUERY_INVALID", "invalid"}, + {GST_NAVIGATION_QUERY_COMMANDS, "GST_NAVIGATION_QUERY_COMMANDS", + "commands"}, + {GST_NAVIGATION_QUERY_ANGLES, "GST_NAVIGATION_QUERY_ANGLES", "angles"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstNavigationQueryType", values); + } + return etype; +} + +GType +gst_navigation_message_type_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + {GST_NAVIGATION_MESSAGE_INVALID, "GST_NAVIGATION_MESSAGE_INVALID", + "invalid"}, + {GST_NAVIGATION_MESSAGE_MOUSE_OVER, "GST_NAVIGATION_MESSAGE_MOUSE_OVER", + "mouse-over"}, + {GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED, + "GST_NAVIGATION_MESSAGE_COMMANDS_CHANGED", "commands-changed"}, + {GST_NAVIGATION_MESSAGE_ANGLES_CHANGED, + "GST_NAVIGATION_MESSAGE_ANGLES_CHANGED", "angles-changed"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstNavigationMessageType", values); + } + return etype; +} + +GType +gst_navigation_event_type_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + {GST_NAVIGATION_EVENT_INVALID, "GST_NAVIGATION_EVENT_INVALID", "invalid"}, + {GST_NAVIGATION_EVENT_KEY_PRESS, "GST_NAVIGATION_EVENT_KEY_PRESS", + "key-press"}, + {GST_NAVIGATION_EVENT_KEY_RELEASE, "GST_NAVIGATION_EVENT_KEY_RELEASE", + "key-release"}, + {GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS, + "GST_NAVIGATION_EVENT_MOUSE_BUTTON_PRESS", "mouse-button-press"}, + {GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE, + "GST_NAVIGATION_EVENT_MOUSE_BUTTON_RELEASE", + "mouse-button-release"}, + {GST_NAVIGATION_EVENT_MOUSE_MOVE, "GST_NAVIGATION_EVENT_MOUSE_MOVE", + "mouse-move"}, + {GST_NAVIGATION_EVENT_COMMAND, "GST_NAVIGATION_EVENT_COMMAND", "command"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstNavigationEventType", values); + } + return etype; +} + /* enumerations from "tunerchannel.h" */ GType gst_tuner_channel_flags_get_type (void) diff --git a/win32/common/interfaces-enumtypes.h b/win32/common/interfaces-enumtypes.h index 511559e6b7..09633c38a4 100644 --- a/win32/common/interfaces-enumtypes.h +++ b/win32/common/interfaces-enumtypes.h @@ -24,6 +24,16 @@ GType gst_mixer_flags_get_type (void); GType gst_mixer_track_flags_get_type (void); #define GST_TYPE_MIXER_TRACK_FLAGS (gst_mixer_track_flags_get_type()) +/* enumerations from "navigation.h" */ +GType gst_navigation_command_get_type (void); +#define GST_TYPE_NAVIGATION_COMMAND (gst_navigation_command_get_type()) +GType gst_navigation_query_type_get_type (void); +#define GST_TYPE_NAVIGATION_QUERY_TYPE (gst_navigation_query_type_get_type()) +GType gst_navigation_message_type_get_type (void); +#define GST_TYPE_NAVIGATION_MESSAGE_TYPE (gst_navigation_message_type_get_type()) +GType gst_navigation_event_type_get_type (void); +#define GST_TYPE_NAVIGATION_EVENT_TYPE (gst_navigation_event_type_get_type()) + /* enumerations from "tunerchannel.h" */ GType gst_tuner_channel_flags_get_type (void); #define GST_TYPE_TUNER_CHANNEL_FLAGS (gst_tuner_channel_flags_get_type()) diff --git a/win32/common/video-enumtypes.c b/win32/common/video-enumtypes.c index 2a93e021c6..9788695451 100644 --- a/win32/common/video-enumtypes.c +++ b/win32/common/video-enumtypes.c @@ -30,6 +30,7 @@ gst_video_format_get_type (void) {GST_VIDEO_FORMAT_BGR, "GST_VIDEO_FORMAT_BGR", "bgr"}, {GST_VIDEO_FORMAT_Y41B, "GST_VIDEO_FORMAT_Y41B", "y41b"}, {GST_VIDEO_FORMAT_Y42B, "GST_VIDEO_FORMAT_Y42B", "y42b"}, + {GST_VIDEO_FORMAT_YVYU, "GST_VIDEO_FORMAT_YVYU", "yvyu"}, {0, NULL, NULL} }; etype = g_enum_register_static ("GstVideoFormat", values);