diff options
| -rw-r--r-- | win32/common/config.h | 108 | ||||
| -rw-r--r-- | win32/common/gstenumtypes.c | 135 | ||||
| -rw-r--r-- | win32/common/gstenumtypes.h | 12 | ||||
| -rw-r--r-- | win32/common/gstversion.h | 4 |
4 files changed, 244 insertions, 15 deletions
diff --git a/win32/common/config.h b/win32/common/config.h index 0f06ac3b68..fa392ec79e 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -1,5 +1,7 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ -/* This copy of config.h.in is specifically for win32 Visual Studio builds */ +/* Autogenerated config.h created for win32 Visual Studio builds */ + +/* PREFIX -- specifically added for Windows for easier moving */ +#define PREFIX "C:\\gstreamer" /* Define to 1 if translation of program messages to the user's native language is requested. */ @@ -8,20 +10,26 @@ /* gettext package name */ #define GETTEXT_PACKAGE "gstreamer-0.10" -/* PREFIX - specifically added for Windows for easier moving */ -#define PREFIX "C:\\gstreamer" - /* data dir */ #define GST_DATADIR PREFIX "\\share" -/* Location of registry */ -#define GST_CACHE_DIR PREFIX "\\var\\cache" +/* Define if option parsing is disabled */ +#undef GST_DISABLE_OPTION_PARSING /* Define if pipeline parsing code is disabled */ -/* #undef GST_DISABLE_PARSE */ +#undef GST_DISABLE_PARSE + +/* Extra platform specific plugin suffix */ +#undef GST_EXTRA_MODULE_SUFFIX + +/* macro to use to show function name */ +#undef GST_FUNCTION /* Defined if gcov is enabled to force a rebuild due to config.h changing */ -/* #undef GST_GCOV_ENABLED */ +#undef GST_GCOV_ENABLED + +/* Defined when registry scanning through fork is unsafe */ +#undef GST_HAVE_UNSAFE_FORK /* Default errorlevel to use */ #define GST_LEVEL_DEFAULT GST_LEVEL_ERROR @@ -38,12 +46,29 @@ /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + /* Define if the host CPU is an Alpha */ #undef HAVE_CPU_ALPHA /* Define if the host CPU is an ARM */ #undef HAVE_CPU_ARM +/* Define if the host CPU is a CRIS */ +#undef HAVE_CPU_CRIS + +/* Define if the host CPU is a CRISv32 */ +#undef HAVE_CPU_CRISV32 + /* Define if the host CPU is a HPPA */ #undef HAVE_CPU_HPPA @@ -62,6 +87,9 @@ /* Define if the host CPU is a PowerPC */ #undef HAVE_CPU_PPC +/* Define if the host CPU is a 64 bit PowerPC */ +#undef HAVE_CPU_PPC64 + /* Define if the host CPU is a S390 */ #undef HAVE_CPU_S390 @@ -108,12 +136,21 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define if you have the iconv() function. */ +/* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H +/* Define to 1 if you have the `nsl' library (-lnsl). */ +#undef HAVE_LIBNSL + +/* Define to 1 if you have the `resolv' library (-lresolv). */ +#undef HAVE_LIBRESOLV + +/* Define to 1 if you have the `socket' library (-lsocket). */ +#undef HAVE_LIBSOCKET + /* Define if libxml2 is available */ #define HAVE_LIBXML2 1 @@ -123,6 +160,18 @@ /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP +/* Have a monotonic clock */ +#undef HAVE_MONOTONIC_CLOCK + +/* Define to 1 if you have the `poll' function. */ +#undef HAVE_POLL + +/* Have posix timers */ +#undef HAVE_POSIX_TIMERS + +/* Define to 1 if you have the `ppoll' function. */ +#undef HAVE_PPOLL + /* defined if the compiler implements __PRETTY_FUNCTION__ */ #undef HAVE_PRETTY_FUNCTION @@ -132,6 +181,9 @@ /* Define to 1 if you have the <process.h> header file. */ #define HAVE_PROCESS_H 1 +/* Define to 1 if you have the `pselect' function. */ +#undef HAVE_PSELECT + /* Define if RDTSC is available */ #undef HAVE_RDTSC @@ -141,6 +193,9 @@ /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio_ext.h> header file. */ +#undef HAVE_STDIO_EXT_H + /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H 1 @@ -156,9 +211,15 @@ /* Define to 1 if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the <sys/times.h> header file. */ +#undef HAVE_SYS_TIMES_H + /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the <sys/utsname.h> header file. */ +#undef HAVE_SYS_UTSNAME_H + /* Define to 1 if you have the <ucontext.h> header file. */ #undef HAVE_UCONTEXT_H @@ -171,10 +232,16 @@ /* Define if valgrind should be used */ #undef HAVE_VALGRIND +/* Define to 1 if you have the <valgrind/valgrind.h> header file. */ +#undef HAVE_VALGRIND_VALGRIND_H + /* Defined if compiling for Windows */ #define HAVE_WIN32 1 -/* Define host CPU */ +/* Define to 1 if you have the <winsock2.h> header file. */ +#define HAVE_WINSOCK2_H 1 + +/* the host CPU */ #define HOST_CPU "i686" /* library dir */ @@ -187,6 +254,16 @@ /* gettext locale dir */ #define LOCALEDIR PREFIX "\\share\\locale" +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Define if you have no native inet_aton() function. */ +#undef NO_INET_ATON + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #define PACKAGE "gstreamer" @@ -205,7 +282,7 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "0.10.22.1" -/* Define the plugin directory */ +/* directory where plugins are located */ #ifdef _DEBUG # define PLUGINDIR PREFIX "\\debug\\lib\\gstreamer-0.10" #else @@ -215,6 +292,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define if we should use binary registry instead xml registry */ +#define USE_BINARY_REGISTRY + /* Define if we should poison deallocated memory */ #undef USE_POISONING @@ -236,4 +316,6 @@ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ -/* #undef inline */ +#ifndef __cplusplus +#undef inline +#endif diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c index c8f0249df7..09ecb94b2e 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -64,6 +64,9 @@ register_gst_buffer_flag (GType * id) {C_FLAGS (GST_BUFFER_FLAG_GAP), "GST_BUFFER_FLAG_GAP", "gap"}, {C_FLAGS (GST_BUFFER_FLAG_DELTA_UNIT), "GST_BUFFER_FLAG_DELTA_UNIT", "delta-unit"}, + {C_FLAGS (GST_BUFFER_FLAG_MEDIA1), "GST_BUFFER_FLAG_MEDIA1", "media1"}, + {C_FLAGS (GST_BUFFER_FLAG_MEDIA2), "GST_BUFFER_FLAG_MEDIA2", "media2"}, + {C_FLAGS (GST_BUFFER_FLAG_MEDIA3), "GST_BUFFER_FLAG_MEDIA3", "media3"}, {C_FLAGS (GST_BUFFER_FLAG_LAST), "GST_BUFFER_FLAG_LAST", "last"}, {0, NULL, NULL} }; @@ -79,6 +82,7 @@ gst_buffer_flag_get_type (void) g_once (&once, (GThreadFunc) register_gst_buffer_flag, &id); return id; } + static void register_gst_buffer_copy_flags (GType * id) { @@ -123,6 +127,7 @@ gst_bus_flags_get_type (void) g_once (&once, (GThreadFunc) register_gst_bus_flags, &id); return id; } + static void register_gst_bus_sync_reply (GType * id) { @@ -192,6 +197,7 @@ gst_clock_return_get_type (void) g_once (&once, (GThreadFunc) register_gst_clock_return, &id); return id; } + static void register_gst_clock_entry_type (GType * id) { @@ -212,6 +218,7 @@ gst_clock_entry_type_get_type (void) g_once (&once, (GThreadFunc) register_gst_clock_entry_type, &id); return id; } + static void register_gst_clock_flags (GType * id) { @@ -297,6 +304,7 @@ gst_state_get_type (void) g_once (&once, (GThreadFunc) register_gst_state, &id); return id; } + static void register_gst_state_change_return (GType * id) { @@ -320,6 +328,7 @@ gst_state_change_return_get_type (void) g_once (&once, (GThreadFunc) register_gst_state_change_return, &id); return id; } + static void register_gst_state_change (GType * id) { @@ -350,6 +359,7 @@ gst_state_change_get_type (void) g_once (&once, (GThreadFunc) register_gst_state_change, &id); return id; } + static void register_gst_element_flags (GType * id) { @@ -414,6 +424,7 @@ gst_core_error_get_type (void) g_once (&once, (GThreadFunc) register_gst_core_error, &id); return id; } + static void register_gst_library_error (GType * id) { @@ -443,6 +454,7 @@ gst_library_error_get_type (void) g_once (&once, (GThreadFunc) register_gst_library_error, &id); return id; } + static void register_gst_resource_error (GType * id) { @@ -484,6 +496,7 @@ gst_resource_error_get_type (void) g_once (&once, (GThreadFunc) register_gst_resource_error, &id); return id; } + static void register_gst_stream_error (GType * id) { @@ -548,6 +561,7 @@ gst_event_type_flags_get_type (void) g_once (&once, (GThreadFunc) register_gst_event_type_flags, &id); return id; } + static void register_gst_event_type (GType * id) { @@ -586,6 +600,7 @@ gst_event_type_get_type (void) g_once (&once, (GThreadFunc) register_gst_event_type, &id); return id; } + static void register_gst_seek_type (GType * id) { @@ -608,6 +623,7 @@ gst_seek_type_get_type (void) g_once (&once, (GThreadFunc) register_gst_seek_type, &id); return id; } + static void register_gst_seek_flags (GType * id) { @@ -617,6 +633,7 @@ register_gst_seek_flags (GType * id) {C_FLAGS (GST_SEEK_FLAG_ACCURATE), "GST_SEEK_FLAG_ACCURATE", "accurate"}, {C_FLAGS (GST_SEEK_FLAG_KEY_UNIT), "GST_SEEK_FLAG_KEY_UNIT", "key-unit"}, {C_FLAGS (GST_SEEK_FLAG_SEGMENT), "GST_SEEK_FLAG_SEGMENT", "segment"}, + {C_FLAGS (GST_SEEK_FLAG_SKIP), "GST_SEEK_FLAG_SKIP", "skip"}, {0, NULL, NULL} }; *id = g_flags_register_static ("GstSeekFlags", values); @@ -680,6 +697,7 @@ gst_index_certainty_get_type (void) g_once (&once, (GThreadFunc) register_gst_index_certainty, &id); return id; } + static void register_gst_index_entry_type (GType * id) { @@ -703,6 +721,7 @@ gst_index_entry_type_get_type (void) g_once (&once, (GThreadFunc) register_gst_index_entry_type, &id); return id; } + static void register_gst_index_lookup_method (GType * id) { @@ -724,6 +743,7 @@ gst_index_lookup_method_get_type (void) g_once (&once, (GThreadFunc) register_gst_index_lookup_method, &id); return id; } + static void register_gst_assoc_flags (GType * id) { @@ -748,6 +768,7 @@ gst_assoc_flags_get_type (void) g_once (&once, (GThreadFunc) register_gst_assoc_flags, &id); return id; } + static void register_gst_index_resolver_method (GType * id) { @@ -769,6 +790,7 @@ gst_index_resolver_method_get_type (void) g_once (&once, (GThreadFunc) register_gst_index_resolver_method, &id); return id; } + static void register_gst_index_flags (GType * id) { @@ -817,6 +839,7 @@ gst_debug_level_get_type (void) g_once (&once, (GThreadFunc) register_gst_debug_level, &id); return id; } + static void register_gst_debug_color_flags (GType * id) { @@ -877,6 +900,7 @@ gst_iterator_result_get_type (void) g_once (&once, (GThreadFunc) register_gst_iterator_result, &id); return id; } + static void register_gst_iterator_item (GType * id) { @@ -936,6 +960,8 @@ register_gst_message_type (GType * id) {C_FLAGS (GST_MESSAGE_ASYNC_START), "GST_MESSAGE_ASYNC_START", "async-start"}, {C_FLAGS (GST_MESSAGE_ASYNC_DONE), "GST_MESSAGE_ASYNC_DONE", "async-done"}, + {C_FLAGS (GST_MESSAGE_REQUEST_STATE), "GST_MESSAGE_REQUEST_STATE", + "request-state"}, {C_FLAGS (GST_MESSAGE_ANY), "GST_MESSAGE_ANY", "any"}, {0, NULL, NULL} }; @@ -952,6 +978,29 @@ gst_message_type_get_type (void) return id; } +static void +register_gst_structure_change_type (GType * id) +{ + static const GEnumValue values[] = { + {C_ENUM (GST_STRUCTURE_CHANGE_TYPE_PAD_LINK), + "GST_STRUCTURE_CHANGE_TYPE_PAD_LINK", "link"}, + {C_ENUM (GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK), + "GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK", "unlink"}, + {0, NULL, NULL} + }; + *id = g_enum_register_static ("GstStructureChangeType", values); +} + +GType +gst_structure_change_type_get_type (void) +{ + static GType id; + static GOnce once = G_ONCE_INIT; + + g_once (&once, (GThreadFunc) register_gst_structure_change_type, &id); + return id; +} + /* enumerations from "gstminiobject.h" */ static void register_gst_mini_object_flags (GType * id) @@ -1003,6 +1052,7 @@ gst_pad_link_return_get_type (void) g_once (&once, (GThreadFunc) register_gst_pad_link_return, &id); return id; } + static void register_gst_flow_return (GType * id) { @@ -1034,6 +1084,7 @@ gst_flow_return_get_type (void) g_once (&once, (GThreadFunc) register_gst_flow_return, &id); return id; } + static void register_gst_activate_mode (GType * id) { @@ -1055,6 +1106,7 @@ gst_activate_mode_get_type (void) g_once (&once, (GThreadFunc) register_gst_activate_mode, &id); return id; } + static void register_gst_pad_direction (GType * id) { @@ -1076,6 +1128,7 @@ gst_pad_direction_get_type (void) g_once (&once, (GThreadFunc) register_gst_pad_direction, &id); return id; } + static void register_gst_pad_flags (GType * id) { @@ -1123,6 +1176,7 @@ gst_pad_presence_get_type (void) g_once (&once, (GThreadFunc) register_gst_pad_presence, &id); return id; } + static void register_gst_pad_template_flags (GType * id) { @@ -1192,6 +1246,7 @@ gst_plugin_error_get_type (void) g_once (&once, (GThreadFunc) register_gst_plugin_error, &id); return id; } + static void register_gst_plugin_flags (GType * id) { @@ -1212,6 +1267,35 @@ gst_plugin_flags_get_type (void) return id; } +static void +register_gst_plugin_dependency_flags (GType * id) +{ + static const GFlagsValue values[] = { + {C_FLAGS (GST_PLUGIN_DEPENDENCY_FLAG_NONE), + "GST_PLUGIN_DEPENDENCY_FLAG_NONE", "none"}, + {C_FLAGS (GST_PLUGIN_DEPENDENCY_FLAG_RECURSE), + "GST_PLUGIN_DEPENDENCY_FLAG_RECURSE", "recurse"}, + {C_FLAGS (GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY), + "GST_PLUGIN_DEPENDENCY_FLAG_PATHS_ARE_DEFAULT_ONLY", + "paths-are-default-only"}, + {C_FLAGS (GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX), + "GST_PLUGIN_DEPENDENCY_FLAG_FILE_NAME_IS_SUFFIX", + "file-name-is-suffix"}, + {0, NULL, NULL} + }; + *id = g_flags_register_static ("GstPluginDependencyFlags", values); +} + +GType +gst_plugin_dependency_flags_get_type (void) +{ + static GType id; + static GOnce once = G_ONCE_INIT; + + g_once (&once, (GThreadFunc) register_gst_plugin_dependency_flags, &id); + return id; +} + /* enumerations from "gstpluginfeature.h" */ static void register_gst_rank (GType * id) @@ -1252,6 +1336,8 @@ register_gst_query_type (GType * id) {C_ENUM (GST_QUERY_CONVERT), "GST_QUERY_CONVERT", "convert"}, {C_ENUM (GST_QUERY_FORMATS), "GST_QUERY_FORMATS", "formats"}, {C_ENUM (GST_QUERY_BUFFERING), "GST_QUERY_BUFFERING", "buffering"}, + {C_ENUM (GST_QUERY_CUSTOM), "GST_QUERY_CUSTOM", "custom"}, + {C_ENUM (GST_QUERY_URI), "GST_QUERY_URI", "uri"}, {0, NULL, NULL} }; *id = g_enum_register_static ("GstQueryType", values); @@ -1266,6 +1352,7 @@ gst_query_type_get_type (void) g_once (&once, (GThreadFunc) register_gst_query_type, &id); return id; } + static void register_gst_buffering_mode (GType * id) { @@ -1289,6 +1376,29 @@ gst_buffering_mode_get_type (void) return id; } +/* enumerations from "gstsystemclock.h" */ +static void +register_gst_clock_type (GType * id) +{ + static const GEnumValue values[] = { + {C_ENUM (GST_CLOCK_TYPE_REALTIME), "GST_CLOCK_TYPE_REALTIME", "realtime"}, + {C_ENUM (GST_CLOCK_TYPE_MONOTONIC), "GST_CLOCK_TYPE_MONOTONIC", + "monotonic"}, + {0, NULL, NULL} + }; + *id = g_enum_register_static ("GstClockType", values); +} + +GType +gst_clock_type_get_type (void) +{ + static GType id; + static GOnce once = G_ONCE_INIT; + + g_once (&once, (GThreadFunc) register_gst_clock_type, &id); + return id; +} + /* enumerations from "gsttaglist.h" */ static void register_gst_tag_merge_mode (GType * id) @@ -1317,6 +1427,7 @@ gst_tag_merge_mode_get_type (void) g_once (&once, (GThreadFunc) register_gst_tag_merge_mode, &id); return id; } + static void register_gst_tag_flag (GType * id) { @@ -1436,6 +1547,29 @@ gst_uri_type_get_type (void) return id; } +/* enumerations from "gstutils.h" */ +static void +register_gst_search_mode (GType * id) +{ + static const GEnumValue values[] = { + {C_ENUM (GST_SEARCH_MODE_EXACT), "GST_SEARCH_MODE_EXACT", "exact"}, + {C_ENUM (GST_SEARCH_MODE_BEFORE), "GST_SEARCH_MODE_BEFORE", "before"}, + {C_ENUM (GST_SEARCH_MODE_AFTER), "GST_SEARCH_MODE_AFTER", "after"}, + {0, NULL, NULL} + }; + *id = g_enum_register_static ("GstSearchMode", values); +} + +GType +gst_search_mode_get_type (void) +{ + static GType id; + static GOnce once = G_ONCE_INIT; + + g_once (&once, (GThreadFunc) register_gst_search_mode, &id); + return id; +} + /* enumerations from "gstparse.h" */ static void register_gst_parse_error (GType * id) @@ -1466,6 +1600,7 @@ gst_parse_error_get_type (void) g_once (&once, (GThreadFunc) register_gst_parse_error, &id); return id; } + static void register_gst_parse_flags (GType * id) { diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h index 670729215b..2c87789d10 100644 --- a/win32/common/gstenumtypes.h +++ b/win32/common/gstenumtypes.h @@ -107,6 +107,8 @@ GType gst_iterator_item_get_type (void); /* enumerations from "gstmessage.h" */ GType gst_message_type_get_type (void); #define GST_TYPE_MESSAGE_TYPE (gst_message_type_get_type()) +GType gst_structure_change_type_get_type (void); +#define GST_TYPE_STRUCTURE_CHANGE_TYPE (gst_structure_change_type_get_type()) /* enumerations from "gstminiobject.h" */ GType gst_mini_object_flags_get_type (void); @@ -139,6 +141,8 @@ GType gst_plugin_error_get_type (void); #define GST_TYPE_PLUGIN_ERROR (gst_plugin_error_get_type()) GType gst_plugin_flags_get_type (void); #define GST_TYPE_PLUGIN_FLAGS (gst_plugin_flags_get_type()) +GType gst_plugin_dependency_flags_get_type (void); +#define GST_TYPE_PLUGIN_DEPENDENCY_FLAGS (gst_plugin_dependency_flags_get_type()) /* enumerations from "gstpluginfeature.h" */ GType gst_rank_get_type (void); @@ -150,6 +154,10 @@ GType gst_query_type_get_type (void); GType gst_buffering_mode_get_type (void); #define GST_TYPE_BUFFERING_MODE (gst_buffering_mode_get_type()) +/* enumerations from "gstsystemclock.h" */ +GType gst_clock_type_get_type (void); +#define GST_TYPE_CLOCK_TYPE (gst_clock_type_get_type()) + /* enumerations from "gsttaglist.h" */ GType gst_tag_merge_mode_get_type (void); #define GST_TYPE_TAG_MERGE_MODE (gst_tag_merge_mode_get_type()) @@ -172,6 +180,10 @@ GType gst_type_find_probability_get_type (void); GType gst_uri_type_get_type (void); #define GST_TYPE_URI_TYPE (gst_uri_type_get_type()) +/* enumerations from "gstutils.h" */ +GType gst_search_mode_get_type (void); +#define GST_TYPE_SEARCH_MODE (gst_search_mode_get_type()) + /* enumerations from "gstparse.h" */ GType gst_parse_error_get_type (void); #define GST_TYPE_PARSE_ERROR (gst_parse_error_get_type()) diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 243c92130e..f557794d99 100644 --- a/win32/common/gstversion.h +++ b/win32/common/gstversion.h @@ -57,12 +57,12 @@ G_BEGIN_DECLS * * The micro version of GStreamer at compile time: */ -#define GST_VERSION_MICRO (20) +#define GST_VERSION_MICRO (22) /** * GST_VERSION_NANO: * * The nano version of GStreamer at compile time: - * Actual releases have 0, CVS versions have 1, prerelease versions have 2-... + * Actual releases have 0, GIT versions have 1, prerelease versions have 2-... */ #define GST_VERSION_NANO (1) |