From 6520cc20bebdb6e590e82f4e34ef4a0ca00f8ac2 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Thu, 8 Sep 2005 12:07:13 +0000 Subject: [PATCH] gst\elements\gstfdsink.c gst\elements\gstfdsrc.c gst\elements\gstfilesrc.c gst\elements\gstpipefilter.c gst\elements\... Original commit message from CVS: * gst\elements\gstfdsink.c * gst\elements\gstfdsrc.c * gst\elements\gstfilesrc.c * gst\elements\gstpipefilter.c * gst\elements\gstpipefilter.h * gst\gstinfo.h * win32\config.h * win32\gstenumtypes.c * win32\gstenumtypes.h compilation fixes for MSVC --- gst/elements/gstfdsink.c | 3 + gst/elements/gstfdsrc.c | 3 + gst/elements/gstfilesrc.c | 3 + gst/elements/gstpipefilter.c | 15 ++++ gst/elements/gstpipefilter.h | 4 ++ gst/gstinfo.h | 4 ++ plugins/elements/gstfdsink.c | 3 + plugins/elements/gstfdsrc.c | 3 + plugins/elements/gstfilesrc.c | 3 + plugins/elements/gstpipefilter.c | 15 ++++ plugins/elements/gstpipefilter.h | 4 ++ win32/config.h | 8 ++- win32/gstenumtypes.c | 118 ++++++++++++++++++++----------- win32/gstenumtypes.h | 61 ++++------------ 14 files changed, 155 insertions(+), 92 deletions(-) diff --git a/gst/elements/gstfdsink.c b/gst/elements/gstfdsink.c index 411dd0a32e..0d7baff1ff 100644 --- a/gst/elements/gstfdsink.c +++ b/gst/elements/gstfdsink.c @@ -28,6 +28,9 @@ #ifdef HAVE_UNISTD_H #include #endif +#ifdef _MSC_VER +#include +#endif static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, diff --git a/gst/elements/gstfdsrc.c b/gst/elements/gstfdsrc.c index ce1d76a10a..fdeac10707 100644 --- a/gst/elements/gstfdsrc.c +++ b/gst/elements/gstfdsrc.c @@ -36,6 +36,9 @@ #ifdef HAVE_UNISTD_H #include #endif +#ifdef _MSC_VER +#include +#endif #include #include diff --git a/gst/elements/gstfilesrc.c b/gst/elements/gstfilesrc.c index fa87859c0b..5126fa8f20 100644 --- a/gst/elements/gstfilesrc.c +++ b/gst/elements/gstfilesrc.c @@ -33,6 +33,9 @@ #ifdef HAVE_UNISTD_H #include #endif +#ifdef _MSC_VER +#include +#endif #ifdef HAVE_MMAP #include #endif diff --git a/gst/elements/gstpipefilter.c b/gst/elements/gstpipefilter.c index f802124076..bd27372ec9 100644 --- a/gst/elements/gstpipefilter.c +++ b/gst/elements/gstpipefilter.c @@ -27,7 +27,13 @@ #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef _MSC_VER +#include +#include +#endif #include #ifdef HAVE_CONFIG_H @@ -289,17 +295,26 @@ gst_pipefilter_open_file (GstPipefilter * src) pipe (src->fdin); pipe (src->fdout); +#ifdef _MSC_VER + src->childpid = 0; +#else if ((src->childpid = fork ()) == -1) { GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, (NULL), GST_ERROR_SYSTEM); return FALSE; } +#endif if (src->childpid == 0) { close (src->fdin[1]); close (src->fdout[0]); /* child */ +#ifdef _MSC_VER + dup2 (src->fdin[0], fileno (stdin)); /* set the childs input stream */ + dup2 (src->fdout[1], fileno (stdout)); /* set the childs output stream */ +#else dup2 (src->fdin[0], STDIN_FILENO); /* set the childs input stream */ dup2 (src->fdout[1], STDOUT_FILENO); /* set the childs output stream */ +#endif execvp (src->command[0], &src->command[0]); /* will only be reached if execvp has an error */ GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, (NULL), GST_ERROR_SYSTEM); diff --git a/gst/elements/gstpipefilter.h b/gst/elements/gstpipefilter.h index 08c3a47187..d392e91499 100644 --- a/gst/elements/gstpipefilter.h +++ b/gst/elements/gstpipefilter.h @@ -62,7 +62,11 @@ struct _GstPipefilter { /* fd */ gint fdout[2]; gint fdin[2]; +#ifdef _MSC_VER + int childpid; +#else pid_t childpid; +#endif gulong curoffset; /* current offset in file */ gulong bytes_per_read; /* bytes per read */ diff --git a/gst/gstinfo.h b/gst/gstinfo.h index 3e36994b30..9d73d9c1ac 100644 --- a/gst/gstinfo.h +++ b/gst/gstinfo.h @@ -629,7 +629,11 @@ guint gst_debug_remove_log_function_by_data (gpointer data); #define gst_debug_unset_threshold_for_name(name) /* NOP */ #define GST_DEBUG_CATEGORY(var) /* NOP */ +#if defined(G_HAVE_ISO_VARARGS) #define GST_DEBUG_CATEGORY_EXTERN(var) /* NOP */ +#else +#define GST_DEBUG_CATEGORY_EXTERN(cat) extern GstDebugCategory *cat +#endif #if !defined(G_HAVE_GNUC_VARARGS) && !defined(G_HAVE_ISO_VARARGS) #define GST_DEBUG_CATEGORY_STATIC(var) static GstDebugCategory *var = NULL #else diff --git a/plugins/elements/gstfdsink.c b/plugins/elements/gstfdsink.c index 411dd0a32e..0d7baff1ff 100644 --- a/plugins/elements/gstfdsink.c +++ b/plugins/elements/gstfdsink.c @@ -28,6 +28,9 @@ #ifdef HAVE_UNISTD_H #include #endif +#ifdef _MSC_VER +#include +#endif static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, diff --git a/plugins/elements/gstfdsrc.c b/plugins/elements/gstfdsrc.c index ce1d76a10a..fdeac10707 100644 --- a/plugins/elements/gstfdsrc.c +++ b/plugins/elements/gstfdsrc.c @@ -36,6 +36,9 @@ #ifdef HAVE_UNISTD_H #include #endif +#ifdef _MSC_VER +#include +#endif #include #include diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c index fa87859c0b..5126fa8f20 100644 --- a/plugins/elements/gstfilesrc.c +++ b/plugins/elements/gstfilesrc.c @@ -33,6 +33,9 @@ #ifdef HAVE_UNISTD_H #include #endif +#ifdef _MSC_VER +#include +#endif #ifdef HAVE_MMAP #include #endif diff --git a/plugins/elements/gstpipefilter.c b/plugins/elements/gstpipefilter.c index f802124076..bd27372ec9 100644 --- a/plugins/elements/gstpipefilter.c +++ b/plugins/elements/gstpipefilter.c @@ -27,7 +27,13 @@ #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef _MSC_VER +#include +#include +#endif #include #ifdef HAVE_CONFIG_H @@ -289,17 +295,26 @@ gst_pipefilter_open_file (GstPipefilter * src) pipe (src->fdin); pipe (src->fdout); +#ifdef _MSC_VER + src->childpid = 0; +#else if ((src->childpid = fork ()) == -1) { GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, (NULL), GST_ERROR_SYSTEM); return FALSE; } +#endif if (src->childpid == 0) { close (src->fdin[1]); close (src->fdout[0]); /* child */ +#ifdef _MSC_VER + dup2 (src->fdin[0], fileno (stdin)); /* set the childs input stream */ + dup2 (src->fdout[1], fileno (stdout)); /* set the childs output stream */ +#else dup2 (src->fdin[0], STDIN_FILENO); /* set the childs input stream */ dup2 (src->fdout[1], STDOUT_FILENO); /* set the childs output stream */ +#endif execvp (src->command[0], &src->command[0]); /* will only be reached if execvp has an error */ GST_ELEMENT_ERROR (src, RESOURCE, TOO_LAZY, (NULL), GST_ERROR_SYSTEM); diff --git a/plugins/elements/gstpipefilter.h b/plugins/elements/gstpipefilter.h index 08c3a47187..d392e91499 100644 --- a/plugins/elements/gstpipefilter.h +++ b/plugins/elements/gstpipefilter.h @@ -62,7 +62,11 @@ struct _GstPipefilter { /* fd */ gint fdout[2]; gint fdin[2]; +#ifdef _MSC_VER + int childpid; +#else pid_t childpid; +#endif gulong curoffset; /* current offset in file */ gulong bytes_per_read; /* bytes per read */ diff --git a/win32/config.h b/win32/config.h index 3f9f945273..af19019f41 100644 --- a/win32/config.h +++ b/win32/config.h @@ -29,7 +29,7 @@ #define GST_PACKAGE "GStreamer" /* Define the version */ -#define GST_VERSION "0.8.5" +#define GST_VERSION "0.8.11" /* Define the release version */ #define GST_VERSION_RELEASE "20040129_103536" @@ -190,7 +190,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.8.5.0" +#define VERSION "0.8.11.0" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ @@ -198,3 +198,7 @@ #define GST_MAJORMINOR "0.8" +#define LIBDIR PLUGINS_DIR + +#define HAVE_FFMPEG_UNINSTALLED +#define HAVE_AV_CONFIG_H diff --git a/win32/gstenumtypes.c b/win32/gstenumtypes.c index f490ef2d2b..9ea7a86e53 100644 --- a/win32/gstenumtypes.c +++ b/win32/gstenumtypes.c @@ -33,11 +33,12 @@ gst_bin_flags_get_type (void) static const GEnumValue values[] = { {GST_BIN_FLAG_MANAGER, "GST_BIN_FLAG_MANAGER", "flag-manager"}, {GST_BIN_SELF_SCHEDULABLE, "GST_BIN_SELF_SCHEDULABLE", - "self-schedulable"}, + "self-schedulable"}, {GST_BIN_FLAG_PREFER_COTHREADS, "GST_BIN_FLAG_PREFER_COTHREADS", - "flag-prefer-cothreads"}, + "flag-prefer-cothreads"}, {GST_BIN_FLAG_FIXED_CLOCK, "GST_BIN_FLAG_FIXED_CLOCK", - "flag-fixed-clock"}, + "flag-fixed-clock"}, + {GST_BIN_STATE_LOCKED, "GST_BIN_STATE_LOCKED", "state-locked"}, {GST_BIN_FLAG_LAST, "GST_BIN_FLAG_LAST", "flag-last"}, {0, NULL, NULL} }; @@ -133,17 +134,17 @@ gst_clock_flags_get_type (void) if (etype == 0) { static const GFlagsValue values[] = { {GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC, "GST_CLOCK_FLAG_CAN_DO_SINGLE_SYNC", - "do-single-sync"}, + "do-single-sync"}, {GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC, "GST_CLOCK_FLAG_CAN_DO_SINGLE_ASYNC", - "do-single-async"}, + "do-single-async"}, {GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC, - "GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC", "do-periodic-sync"}, + "GST_CLOCK_FLAG_CAN_DO_PERIODIC_SYNC", "do-periodic-sync"}, {GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC, - "GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC", "do-periodic-async"}, + "GST_CLOCK_FLAG_CAN_DO_PERIODIC_ASYNC", "do-periodic-async"}, {GST_CLOCK_FLAG_CAN_SET_RESOLUTION, "GST_CLOCK_FLAG_CAN_SET_RESOLUTION", - "set-resolution"}, + "set-resolution"}, {GST_CLOCK_FLAG_CAN_SET_SPEED, "GST_CLOCK_FLAG_CAN_SET_SPEED", - "set-speed"}, + "set-speed"}, {0, NULL, NULL} }; etype = g_flags_register_static ("GstClockFlags", values); @@ -201,19 +202,20 @@ gst_element_flags_get_type (void) {GST_ELEMENT_COMPLEX, "GST_ELEMENT_COMPLEX", "complex"}, {GST_ELEMENT_DECOUPLED, "GST_ELEMENT_DECOUPLED", "decoupled"}, {GST_ELEMENT_THREAD_SUGGESTED, "GST_ELEMENT_THREAD_SUGGESTED", - "thread-suggested"}, + "thread-suggested"}, {GST_ELEMENT_INFINITE_LOOP, "GST_ELEMENT_INFINITE_LOOP", "infinite-loop"}, {GST_ELEMENT_NEW_LOOPFUNC, "GST_ELEMENT_NEW_LOOPFUNC", "new-loopfunc"}, {GST_ELEMENT_EVENT_AWARE, "GST_ELEMENT_EVENT_AWARE", "event-aware"}, {GST_ELEMENT_USE_THREADSAFE_PROPERTIES, "GST_ELEMENT_USE_THREADSAFE_PROPERTIES", - "use-threadsafe-properties"}, + "use-threadsafe-properties"}, {GST_ELEMENT_SCHEDULER_PRIVATE1, "GST_ELEMENT_SCHEDULER_PRIVATE1", - "scheduler-private1"}, + "scheduler-private1"}, {GST_ELEMENT_SCHEDULER_PRIVATE2, "GST_ELEMENT_SCHEDULER_PRIVATE2", - "scheduler-private2"}, + "scheduler-private2"}, {GST_ELEMENT_LOCKED_STATE, "GST_ELEMENT_LOCKED_STATE", "locked-state"}, {GST_ELEMENT_IN_ERROR, "GST_ELEMENT_IN_ERROR", "in-error"}, + {GST_ELEMENT_WORK_IN_PLACE, "GST_ELEMENT_WORK_IN_PLACE", "work-in-place"}, {GST_ELEMENT_FLAG_LAST, "GST_ELEMENT_FLAG_LAST", "flag-last"}, {0, NULL, NULL} }; @@ -234,9 +236,9 @@ gst_core_error_get_type (void) {GST_CORE_ERROR_FAILED, "GST_CORE_ERROR_FAILED", "failed"}, {GST_CORE_ERROR_TOO_LAZY, "GST_CORE_ERROR_TOO_LAZY", "too-lazy"}, {GST_CORE_ERROR_NOT_IMPLEMENTED, "GST_CORE_ERROR_NOT_IMPLEMENTED", - "not-implemented"}, + "not-implemented"}, {GST_CORE_ERROR_STATE_CHANGE, "GST_CORE_ERROR_STATE_CHANGE", - "state-change"}, + "state-change"}, {GST_CORE_ERROR_PAD, "GST_CORE_ERROR_PAD", "pad"}, {GST_CORE_ERROR_THREAD, "GST_CORE_ERROR_THREAD", "thread"}, {GST_CORE_ERROR_SCHEDULER, "GST_CORE_ERROR_SCHEDULER", "scheduler"}, @@ -267,7 +269,7 @@ gst_library_error_get_type (void) {GST_LIBRARY_ERROR_SETTINGS, "GST_LIBRARY_ERROR_SETTINGS", "settings"}, {GST_LIBRARY_ERROR_ENCODE, "GST_LIBRARY_ERROR_ENCODE", "encode"}, {GST_LIBRARY_ERROR_NUM_ERRORS, "GST_LIBRARY_ERROR_NUM_ERRORS", - "num-errors"}, + "num-errors"}, {0, NULL, NULL} }; etype = g_enum_register_static ("GstLibraryError", values); @@ -285,14 +287,14 @@ gst_resource_error_get_type (void) {GST_RESOURCE_ERROR_FAILED, "GST_RESOURCE_ERROR_FAILED", "failed"}, {GST_RESOURCE_ERROR_TOO_LAZY, "GST_RESOURCE_ERROR_TOO_LAZY", "too-lazy"}, {GST_RESOURCE_ERROR_NOT_FOUND, "GST_RESOURCE_ERROR_NOT_FOUND", - "not-found"}, + "not-found"}, {GST_RESOURCE_ERROR_BUSY, "GST_RESOURCE_ERROR_BUSY", "busy"}, {GST_RESOURCE_ERROR_OPEN_READ, "GST_RESOURCE_ERROR_OPEN_READ", - "open-read"}, + "open-read"}, {GST_RESOURCE_ERROR_OPEN_WRITE, "GST_RESOURCE_ERROR_OPEN_WRITE", - "open-write"}, + "open-write"}, {GST_RESOURCE_ERROR_OPEN_READ_WRITE, "GST_RESOURCE_ERROR_OPEN_READ_WRITE", - "open-read-write"}, + "open-read-write"}, {GST_RESOURCE_ERROR_CLOSE, "GST_RESOURCE_ERROR_CLOSE", "close"}, {GST_RESOURCE_ERROR_READ, "GST_RESOURCE_ERROR_READ", "read"}, {GST_RESOURCE_ERROR_WRITE, "GST_RESOURCE_ERROR_WRITE", "write"}, @@ -300,7 +302,7 @@ gst_resource_error_get_type (void) {GST_RESOURCE_ERROR_SYNC, "GST_RESOURCE_ERROR_SYNC", "sync"}, {GST_RESOURCE_ERROR_SETTINGS, "GST_RESOURCE_ERROR_SETTINGS", "settings"}, {GST_RESOURCE_ERROR_NUM_ERRORS, "GST_RESOURCE_ERROR_NUM_ERRORS", - "num-errors"}, + "num-errors"}, {0, NULL, NULL} }; etype = g_enum_register_static ("GstResourceError", values); @@ -318,20 +320,20 @@ gst_stream_error_get_type (void) {GST_STREAM_ERROR_FAILED, "GST_STREAM_ERROR_FAILED", "failed"}, {GST_STREAM_ERROR_TOO_LAZY, "GST_STREAM_ERROR_TOO_LAZY", "too-lazy"}, {GST_STREAM_ERROR_NOT_IMPLEMENTED, "GST_STREAM_ERROR_NOT_IMPLEMENTED", - "not-implemented"}, + "not-implemented"}, {GST_STREAM_ERROR_TYPE_NOT_FOUND, "GST_STREAM_ERROR_TYPE_NOT_FOUND", - "type-not-found"}, + "type-not-found"}, {GST_STREAM_ERROR_WRONG_TYPE, "GST_STREAM_ERROR_WRONG_TYPE", - "wrong-type"}, + "wrong-type"}, {GST_STREAM_ERROR_CODEC_NOT_FOUND, "GST_STREAM_ERROR_CODEC_NOT_FOUND", - "codec-not-found"}, + "codec-not-found"}, {GST_STREAM_ERROR_DECODE, "GST_STREAM_ERROR_DECODE", "decode"}, {GST_STREAM_ERROR_ENCODE, "GST_STREAM_ERROR_ENCODE", "encode"}, {GST_STREAM_ERROR_DEMUX, "GST_STREAM_ERROR_DEMUX", "demux"}, {GST_STREAM_ERROR_MUX, "GST_STREAM_ERROR_MUX", "mux"}, {GST_STREAM_ERROR_FORMAT, "GST_STREAM_ERROR_FORMAT", "format"}, {GST_STREAM_ERROR_NUM_ERRORS, "GST_STREAM_ERROR_NUM_ERRORS", - "num-errors"}, + "num-errors"}, {0, NULL, NULL} }; etype = g_enum_register_static ("GstStreamError", values); @@ -401,7 +403,7 @@ gst_seek_type_get_type (void) {GST_SEEK_FLAG_ACCURATE, "GST_SEEK_FLAG_ACCURATE", "flag-accurate"}, {GST_SEEK_FLAG_KEY_UNIT, "GST_SEEK_FLAG_KEY_UNIT", "flag-key-unit"}, {GST_SEEK_FLAG_SEGMENT_LOOP, "GST_SEEK_FLAG_SEGMENT_LOOP", - "flag-segment-loop"}, + "flag-segment-loop"}, {0, NULL, NULL} }; etype = g_flags_register_static ("GstSeekType", values); @@ -425,6 +427,23 @@ gst_seek_accuracy_get_type (void) return etype; } +GType +gst_event_common_flag_get_type (void) +{ + static GType etype = 0; + + if (etype == 0) { + static const GEnumValue values[] = { + {GST_EVENT_COMMON_FLAG_NEED_RESPONSE, + "GST_EVENT_COMMON_FLAG_NEED_RESPONSE", "need-response"}, + {GST_EVENT_COMMON_FLAG_LAST, "GST_EVENT_COMMON_FLAG_LAST", "last"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstEventCommonFlag", values); + } + return etype; +} + /* enumerations from "gstformat.h" */ GType @@ -475,7 +494,7 @@ gst_index_entry_type_get_type (void) static const GEnumValue values[] = { {GST_INDEX_ENTRY_ID, "GST_INDEX_ENTRY_ID", "id"}, {GST_INDEX_ENTRY_ASSOCIATION, "GST_INDEX_ENTRY_ASSOCIATION", - "association"}, + "association"}, {GST_INDEX_ENTRY_OBJECT, "GST_INDEX_ENTRY_OBJECT", "object"}, {GST_INDEX_ENTRY_FORMAT, "GST_INDEX_ENTRY_FORMAT", "format"}, {0, NULL, NULL} @@ -511,9 +530,9 @@ gst_assoc_flags_get_type (void) static const GFlagsValue values[] = { {GST_ASSOCIATION_FLAG_NONE, "GST_ASSOCIATION_FLAG_NONE", "none"}, {GST_ASSOCIATION_FLAG_KEY_UNIT, "GST_ASSOCIATION_FLAG_KEY_UNIT", - "key-unit"}, + "key-unit"}, {GST_ASSOCIATION_FLAG_DELTA_UNIT, "GST_ASSOCIATION_FLAG_DELTA_UNIT", - "delta-unit"}, + "delta-unit"}, {GST_ASSOCIATION_FLAG_LAST, "GST_ASSOCIATION_FLAG_LAST", "last"}, {0, NULL, NULL} }; @@ -666,6 +685,23 @@ gst_pad_flags_get_type (void) return etype; } +GType +gst_real_pad_flags_get_type (void) +{ + static GType etype = 0; + + if (etype == 0) { + static const GEnumValue values[] = { + {GST_RPAD_IN_GETFUNC, "GST_RPAD_IN_GETFUNC", "in-getfunc"}, + {GST_RPAD_IN_CHAINFUNC, "GST_RPAD_IN_CHAINFUNC", "in-chainfunc"}, + {GST_RPAD_FLAG_LAST, "GST_RPAD_FLAG_LAST", "flag-last"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstRealPadFlags", values); + } + return etype; +} + GType gst_pad_presence_get_type (void) { @@ -710,9 +746,9 @@ gst_plugin_error_get_type (void) static const GEnumValue values[] = { {GST_PLUGIN_ERROR_MODULE, "GST_PLUGIN_ERROR_MODULE", "module"}, {GST_PLUGIN_ERROR_DEPENDENCIES, "GST_PLUGIN_ERROR_DEPENDENCIES", - "dependencies"}, + "dependencies"}, {GST_PLUGIN_ERROR_NAME_MISMATCH, "GST_PLUGIN_ERROR_NAME_MISMATCH", - "name-mismatch"}, + "name-mismatch"}, {0, NULL, NULL} }; etype = g_enum_register_static ("GstPluginError", values); @@ -754,7 +790,7 @@ gst_scheduler_flags_get_type (void) if (etype == 0) { static const GEnumValue values[] = { {GST_SCHEDULER_FLAG_FIXED_CLOCK, "GST_SCHEDULER_FLAG_FIXED_CLOCK", - "fixed-clock"}, + "fixed-clock"}, {GST_SCHEDULER_FLAG_NEW_API, "GST_SCHEDULER_FLAG_NEW_API", "new-api"}, {GST_SCHEDULER_FLAG_LAST, "GST_SCHEDULER_FLAG_LAST", "last"}, {0, NULL, NULL} @@ -835,7 +871,7 @@ gst_thread_state_get_type (void) if (etype == 0) { static const GEnumValue values[] = { {GST_THREAD_STATE_SPINNING, "GST_THREAD_STATE_SPINNING", - "state-spinning"}, + "state-spinning"}, {GST_THREAD_STATE_REAPING, "GST_THREAD_STATE_REAPING", "state-reaping"}, {GST_THREAD_STATE_WAITING, "GST_THREAD_STATE_WAITING", "state-waiting"}, {GST_THREAD_FLAG_LAST, "GST_THREAD_FLAG_LAST", "flag-last"}, @@ -877,7 +913,7 @@ gst_type_find_probability_get_type (void) {GST_TYPE_FIND_POSSIBLE, "GST_TYPE_FIND_POSSIBLE", "possible"}, {GST_TYPE_FIND_LIKELY, "GST_TYPE_FIND_LIKELY", "likely"}, {GST_TYPE_FIND_NEARLY_CERTAIN, "GST_TYPE_FIND_NEARLY_CERTAIN", - "nearly-certain"}, + "nearly-certain"}, {GST_TYPE_FIND_MAXIMUM, "GST_TYPE_FIND_MAXIMUM", "maximum"}, {0, NULL, NULL} }; @@ -991,9 +1027,9 @@ gst_registry_return_get_type (void) {GST_REGISTRY_LOAD_ERROR, "GST_REGISTRY_LOAD_ERROR", "load-error"}, {GST_REGISTRY_SAVE_ERROR, "GST_REGISTRY_SAVE_ERROR", "save-error"}, {GST_REGISTRY_PLUGIN_LOAD_ERROR, "GST_REGISTRY_PLUGIN_LOAD_ERROR", - "plugin-load-error"}, + "plugin-load-error"}, {GST_REGISTRY_PLUGIN_SIGNATURE_ERROR, - "GST_REGISTRY_PLUGIN_SIGNATURE_ERROR", "plugin-signature-error"}, + "GST_REGISTRY_PLUGIN_SIGNATURE_ERROR", "plugin-signature-error"}, {0, NULL, NULL} }; etype = g_flags_register_static ("GstRegistryReturn", values); @@ -1013,7 +1049,7 @@ gst_registry_flags_get_type (void) {GST_REGISTRY_EXISTS, "GST_REGISTRY_EXISTS", "exists"}, {GST_REGISTRY_REMOTE, "GST_REGISTRY_REMOTE", "remote"}, {GST_REGISTRY_DELAYED_LOADING, "GST_REGISTRY_DELAYED_LOADING", - "delayed-loading"}, + "delayed-loading"}, {0, NULL, NULL} }; etype = g_flags_register_static ("GstRegistryFlags", values); @@ -1032,12 +1068,12 @@ gst_parse_error_get_type (void) static const GEnumValue values[] = { {GST_PARSE_ERROR_SYNTAX, "GST_PARSE_ERROR_SYNTAX", "syntax"}, {GST_PARSE_ERROR_NO_SUCH_ELEMENT, "GST_PARSE_ERROR_NO_SUCH_ELEMENT", - "no-such-element"}, + "no-such-element"}, {GST_PARSE_ERROR_NO_SUCH_PROPERTY, "GST_PARSE_ERROR_NO_SUCH_PROPERTY", - "no-such-property"}, + "no-such-property"}, {GST_PARSE_ERROR_LINK, "GST_PARSE_ERROR_LINK", "link"}, {GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY, - "GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY", "could-not-set-property"}, + "GST_PARSE_ERROR_COULD_NOT_SET_PROPERTY", "could-not-set-property"}, {GST_PARSE_ERROR_EMPTY_BIN, "GST_PARSE_ERROR_EMPTY_BIN", "empty-bin"}, {GST_PARSE_ERROR_EMPTY, "GST_PARSE_ERROR_EMPTY", "empty"}, {0, NULL, NULL} diff --git a/win32/gstenumtypes.h b/win32/gstenumtypes.h index 61517d8f06..468a4352d1 100644 --- a/win32/gstenumtypes.h +++ b/win32/gstenumtypes.h @@ -7,248 +7,211 @@ #include G_BEGIN_DECLS + /* enumerations from "gstobject.h" */ - GType gst_object_flags_get_type (void); + +GType gst_object_flags_get_type (void); #define GST_TYPE_OBJECT_FLAGS (gst_object_flags_get_type()) /* enumerations from "gstbin.h" */ GType gst_bin_flags_get_type (void); - #define GST_TYPE_BIN_FLAGS (gst_bin_flags_get_type()) /* enumerations from "gstbuffer.h" */ GType gst_buffer_flag_get_type (void); - #define GST_TYPE_BUFFER_FLAG (gst_buffer_flag_get_type()) /* enumerations from "gstclock.h" */ GType gst_clock_entry_status_get_type (void); - #define GST_TYPE_CLOCK_ENTRY_STATUS (gst_clock_entry_status_get_type()) GType gst_clock_entry_type_get_type (void); - #define GST_TYPE_CLOCK_ENTRY_TYPE (gst_clock_entry_type_get_type()) GType gst_clock_return_get_type (void); - #define GST_TYPE_CLOCK_RETURN (gst_clock_return_get_type()) GType gst_clock_flags_get_type (void); - #define GST_TYPE_CLOCK_FLAGS (gst_clock_flags_get_type()) /* enumerations from "gstcpu.h" */ GType gst_cpu_flags_get_type (void); - #define GST_TYPE_CPU_FLAGS (gst_cpu_flags_get_type()) /* enumerations from "gstdata.h" */ GType gst_data_flags_get_type (void); - #define GST_TYPE_DATA_FLAGS (gst_data_flags_get_type()) /* enumerations from "gstelement.h" */ GType gst_element_flags_get_type (void); - #define GST_TYPE_ELEMENT_FLAGS (gst_element_flags_get_type()) /* enumerations from "gsterror.h" */ GType gst_core_error_get_type (void); - #define GST_TYPE_CORE_ERROR (gst_core_error_get_type()) GType gst_library_error_get_type (void); - #define GST_TYPE_LIBRARY_ERROR (gst_library_error_get_type()) GType gst_resource_error_get_type (void); - #define GST_TYPE_RESOURCE_ERROR (gst_resource_error_get_type()) GType gst_stream_error_get_type (void); - #define GST_TYPE_STREAM_ERROR (gst_stream_error_get_type()) /* enumerations from "gstevent.h" */ GType gst_event_type_get_type (void); - #define GST_TYPE_EVENT_TYPE (gst_event_type_get_type()) GType gst_event_flag_get_type (void); - #define GST_TYPE_EVENT_FLAG (gst_event_flag_get_type()) GType gst_seek_type_get_type (void); - #define GST_TYPE_SEEK_TYPE (gst_seek_type_get_type()) GType gst_seek_accuracy_get_type (void); - #define GST_TYPE_SEEK_ACCURACY (gst_seek_accuracy_get_type()) +GType gst_event_common_flag_get_type (void); +#define GST_TYPE_EVENT_COMMON_FLAG (gst_event_common_flag_get_type()) + /* enumerations from "gstformat.h" */ GType gst_format_get_type (void); - #define GST_TYPE_FORMAT (gst_format_get_type()) /* enumerations from "gstindex.h" */ GType gst_index_certainty_get_type (void); - #define GST_TYPE_INDEX_CERTAINTY (gst_index_certainty_get_type()) GType gst_index_entry_type_get_type (void); - #define GST_TYPE_INDEX_ENTRY_TYPE (gst_index_entry_type_get_type()) GType gst_index_lookup_method_get_type (void); - #define GST_TYPE_INDEX_LOOKUP_METHOD (gst_index_lookup_method_get_type()) GType gst_assoc_flags_get_type (void); - #define GST_TYPE_ASSOC_FLAGS (gst_assoc_flags_get_type()) GType gst_index_resolver_method_get_type (void); - #define GST_TYPE_INDEX_RESOLVER_METHOD (gst_index_resolver_method_get_type()) GType gst_index_flags_get_type (void); - #define GST_TYPE_INDEX_FLAGS (gst_index_flags_get_type()) /* enumerations from "gstinfo.h" */ GType gst_debug_level_get_type (void); - #define GST_TYPE_DEBUG_LEVEL (gst_debug_level_get_type()) GType gst_debug_color_flags_get_type (void); - #define GST_TYPE_DEBUG_COLOR_FLAGS (gst_debug_color_flags_get_type()) /* enumerations from "gstpad.h" */ GType gst_pad_link_return_get_type (void); - #define GST_TYPE_PAD_LINK_RETURN (gst_pad_link_return_get_type()) GType gst_pad_direction_get_type (void); - #define GST_TYPE_PAD_DIRECTION (gst_pad_direction_get_type()) GType gst_pad_flags_get_type (void); - #define GST_TYPE_PAD_FLAGS (gst_pad_flags_get_type()) -GType gst_pad_presence_get_type (void); +GType gst_real_pad_flags_get_type (void); +#define GST_TYPE_REAL_PAD_FLAGS (gst_real_pad_flags_get_type()) +GType gst_pad_presence_get_type (void); #define GST_TYPE_PAD_PRESENCE (gst_pad_presence_get_type()) GType gst_pad_template_flags_get_type (void); - #define GST_TYPE_PAD_TEMPLATE_FLAGS (gst_pad_template_flags_get_type()) /* enumerations from "gstplugin.h" */ GType gst_plugin_error_get_type (void); - #define GST_TYPE_PLUGIN_ERROR (gst_plugin_error_get_type()) /* enumerations from "gstquery.h" */ GType gst_query_type_get_type (void); - #define GST_TYPE_QUERY_TYPE (gst_query_type_get_type()) /* enumerations from "gstscheduler.h" */ GType gst_scheduler_flags_get_type (void); - #define GST_TYPE_SCHEDULER_FLAGS (gst_scheduler_flags_get_type()) GType gst_scheduler_state_get_type (void); - #define GST_TYPE_SCHEDULER_STATE (gst_scheduler_state_get_type()) /* enumerations from "gsttag.h" */ GType gst_tag_merge_mode_get_type (void); - #define GST_TYPE_TAG_MERGE_MODE (gst_tag_merge_mode_get_type()) GType gst_tag_flag_get_type (void); - #define GST_TYPE_TAG_FLAG (gst_tag_flag_get_type()) /* enumerations from "gstthread.h" */ GType gst_thread_state_get_type (void); - #define GST_TYPE_THREAD_STATE (gst_thread_state_get_type()) /* enumerations from "gsttrace.h" */ GType gst_alloc_trace_flags_get_type (void); - #define GST_TYPE_ALLOC_TRACE_FLAGS (gst_alloc_trace_flags_get_type()) /* enumerations from "gsttypefind.h" */ GType gst_type_find_probability_get_type (void); - #define GST_TYPE_TYPE_FIND_PROBABILITY (gst_type_find_probability_get_type()) /* enumerations from "gsttypes.h" */ GType gst_element_state_get_type (void); - #define GST_TYPE_ELEMENT_STATE (gst_element_state_get_type()) GType gst_element_state_return_get_type (void); - #define GST_TYPE_ELEMENT_STATE_RETURN (gst_element_state_return_get_type()) GType gst_result_get_type (void); - #define GST_TYPE_RESULT (gst_result_get_type()) GType gst_rank_get_type (void); - #define GST_TYPE_RANK (gst_rank_get_type()) /* enumerations from "gsturi.h" */ GType gst_uri_type_get_type (void); - #define GST_TYPE_URI_TYPE (gst_uri_type_get_type()) /* enumerations from "gstregistry.h" */ GType gst_registry_return_get_type (void); - #define GST_TYPE_REGISTRY_RETURN (gst_registry_return_get_type()) GType gst_registry_flags_get_type (void); - #define GST_TYPE_REGISTRY_FLAGS (gst_registry_flags_get_type()) /* enumerations from "gstparse.h" */ GType gst_parse_error_get_type (void); - #define GST_TYPE_PARSE_ERROR (gst_parse_error_get_type()) G_END_DECLS + #endif /* __GST_ENUM_TYPES_H__ */ + /* Generated data ends here */ +