diff options
author | Edward Hervey <bilboed@bilboed.com> | 2010-06-27 10:07:28 +0200 |
---|---|---|
committer | Edward Hervey <bilboed@bilboed.com> | 2010-06-27 10:08:02 +0200 |
commit | 7ac79bfef9c069beec5007a5874809d09e894e3a (patch) | |
tree | 6b776933524b30383c5d198d0971e1efd278a04e | |
parent | e3d0bc1448c714d92bef3060489efb90accfae47 (diff) |
Add new core 0.10.29 and 0.10.30 API definitions
-rw-r--r-- | configure.ac | 18 | ||||
-rw-r--r-- | gst/Makefile.am | 2 | ||||
-rw-r--r-- | gst/gst-0.10.29.ignore | 9 | ||||
-rw-r--r-- | gst/gst-0.10.30.ignore | 11 | ||||
-rw-r--r-- | gst/gst-types.defs | 18 | ||||
-rw-r--r-- | gst/gst.defs | 128 | ||||
-rw-r--r-- | gst/gstversion.override.in | 2 |
7 files changed, 186 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b2f7fa9..b122b5d 100644 --- a/configure.ac +++ b/configure.ac @@ -159,6 +159,20 @@ then IGNORE_GST_0_10_26="" fi + if test $GST_MINOR_VERSION -lt "29" + then + IGNORE_GST_0_10_29="gst-0.10.29.ignore" + else + IGNORE_GST_0_10_29="" + fi + + if test $GST_MINOR_VERSION -lt "30" + then + IGNORE_GST_0_10_30="gst-0.10.30.ignore" + else + IGNORE_GST_0_10_30="" + fi + dnl plugins base if test $GST_PB_MINOR_VERSION -ge "22" then @@ -197,6 +211,8 @@ else IGNORE_GST_0_10_24="" IGNORE_GST_0_10_25="" IGNORE_GST_0_10_26="" + IGNORE_GST_0_10_29="" + IGNORE_GST_0_10_30="" IGNORE_GST_PB_0_10_23="" IGNORE_GST_PB_0_10_25="" IGNORE_GST_PB_0_10_26="" @@ -212,6 +228,8 @@ AC_SUBST(IGNORE_GST_0_10_23) AC_SUBST(IGNORE_GST_0_10_24) AC_SUBST(IGNORE_GST_0_10_25) AC_SUBST(IGNORE_GST_0_10_26) +AC_SUBST(IGNORE_GST_0_10_29) +AC_SUBST(IGNORE_GST_0_10_30) AC_SUBST(IGNORE_GST_PB_0_10_23) AC_SUBST(IGNORE_GST_PB_0_10_25) AC_SUBST(IGNORE_GST_PB_0_10_26) diff --git a/gst/Makefile.am b/gst/Makefile.am index 7cba3ab..13fc41d 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -32,6 +32,8 @@ versioned_overrides = \ gst-0.10.24.ignore \ gst-0.10.25.ignore \ gst-0.10.26.ignore \ + gst-0.10.29.ignore \ + gst-0.10.30.ignore \ gst-pb-0.10.23.ignore \ gst-pb-0.10.25.ignore \ gst-pb-0.10.26.ignore \ diff --git a/gst/gst-0.10.29.ignore b/gst/gst-0.10.29.ignore new file mode 100644 index 0000000..106c41c --- /dev/null +++ b/gst/gst-0.10.29.ignore @@ -0,0 +1,9 @@ +%% +ignore + gst_message_new_qos + gst_message_set_qos_values + gst_message_set_qos_stats + gst_message_parse_qos + gst_message_parse_qos_values + gst_message_parse_qos_stats +%%
\ No newline at end of file diff --git a/gst/gst-0.10.30.ignore b/gst/gst-0.10.30.ignore new file mode 100644 index 0000000..4e4837c --- /dev/null +++ b/gst/gst-0.10.30.ignore @@ -0,0 +1,11 @@ +%% +ignore + gst_caps_steal_structure + gst_structure_fixate_field_boolean + gst_tag_list_peek_string_index + gst_pad_link_full + gst_element_link_pads_full +%% +ignore-type + GstPadLinkCheck +%%
\ No newline at end of file diff --git a/gst/gst-types.defs b/gst/gst-types.defs index 42ddd55..a933942 100644 --- a/gst/gst-types.defs +++ b/gst/gst-types.defs @@ -740,6 +740,7 @@ '("debug" "GST_LEVEL_DEBUG") '("log" "GST_LEVEL_LOG") '("fixme" "GST_LEVEL_FIXME") + '("trace" "GST_LEVEL_TRACE") '("memdump" "GST_LEVEL_MEMDUMP") '("count" "GST_LEVEL_COUNT") ) @@ -824,6 +825,7 @@ '("async-done" "GST_MESSAGE_ASYNC_DONE") '("request-state" "GST_MESSAGE_REQUEST_STATE") '("step-start" "GST_MESSAGE_STEP_START") + '("qos" "GST_MESSAGE_QOS") '("any" "GST_MESSAGE_ANY") ) ) @@ -894,6 +896,8 @@ (c-name "GstFlowReturn") (gtype-id "GST_TYPE_FLOW_RETURN") (values + '("custom-success-2" "GST_FLOW_CUSTOM_SUCCESS_2") + '("custom-success-1" "GST_FLOW_CUSTOM_SUCCESS_1") '("custom-success" "GST_FLOW_CUSTOM_SUCCESS") '("resend" "GST_FLOW_RESEND") '("ok" "GST_FLOW_OK") @@ -904,6 +908,20 @@ '("error" "GST_FLOW_ERROR") '("not-supported" "GST_FLOW_NOT_SUPPORTED") '("custom-error" "GST_FLOW_CUSTOM_ERROR") + '("custom-error-1" "GST_FLOW_CUSTOM_ERROR_1") + '("custom-error-2" "GST_FLOW_CUSTOM_ERROR_2") + ) +) + +(define-flags PadLinkCheck + (in-module "Gst") + (c-name "GstPadLinkCheck") + (gtype-id "GST_TYPE_PAD_LINK_CHECK") + (values + '("nothing" "GST_PAD_LINK_CHECK_NOTHING") + '("hierarchy" "GST_PAD_LINK_CHECK_HIERARCHY") + '("template-caps" "GST_PAD_LINK_CHECK_TEMPLATE_CAPS") + '("caps" "GST_PAD_LINK_CHECK_CAPS") ) ) diff --git a/gst/gst.defs b/gst/gst.defs index be4d932..4b06c1d 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -760,6 +760,16 @@ ) ) +(define-method steal_structure + (of-object "GstCaps") + (c-name "gst_caps_steal_structure") + (return-type "GstStructure*") + (caller-owns-return #t) + (parameters + '("guint" "index") + ) +) + (define-method copy_nth (of-object "GstCaps") (c-name "gst_caps_copy_nth") @@ -3565,6 +3575,77 @@ ) ) +(define-function message_new_qos + (c-name "gst_message_new_qos") + (return-type "GstMessage*") + (caller-owns-return #t) + (parameters + '("GstObject*" "src") + '("gboolean" "live") + '("guint64" "running_time") + '("guint64" "stream_time") + '("guint64" "timestamp") + '("guint64" "duration") + ) +) + +(define-method set_qos_values + (of-object "GstMessage") + (c-name "gst_message_set_qos_values") + (return-type "none") + (parameters + '("gint64" "jitter") + '("gdouble" "proportion") + '("gint" "quality") + ) +) + +(define-method set_qos_stats + (of-object "GstMessage") + (c-name "gst_message_set_qos_stats") + (return-type "none") + (parameters + '("GstFormat" "format") + '("guint64" "processed") + '("guint64" "dropped") + ) +) + +(define-method parse_qos + (of-object "GstMessage") + (c-name "gst_message_parse_qos") + (return-type "none") + (parameters + '("gboolean*" "live") + '("guint64*" "running_time") + '("guint64*" "stream_time") + '("guint64*" "timestamp") + '("guint64*" "duration") + ) +) + +(define-method parse_qos_values + (of-object "GstMessage") + (c-name "gst_message_parse_qos_values") + (return-type "none") + (parameters + '("gint64*" "jitter") + '("gdouble*" "proportion") + '("gint*" "quality") + ) +) + +(define-method parse_qos_stats + (of-object "GstMessage") + (c-name "gst_message_parse_qos_stats") + (return-type "none") + (parameters + '("GstFormat*" "format") + '("guint64*" "processed") + '("guint64*" "dropped") + ) +) + (define-function message_new_custom (c-name "gst_message_new_custom") (return-type "GstMessage*") @@ -4331,6 +4412,16 @@ ) ) +(define-method link_full + (of-object "GstPad") + (c-name "gst_pad_link_full") + (return-type "GstPadLinkReturn") + (parameters + '("GstPad*" "sinkpad") + '("GstPadLinkCheck" "flags") + ) +) + (define-method unlink (of-object "GstPad") (c-name "gst_pad_unlink") @@ -4856,7 +4947,7 @@ (c-name "gst_event_new_sink_message") (return-type "GstEvent*") (parameters - '("struct-GstMessage*" "msg") + '("GstMessage*" "msg") ) ) @@ -4865,7 +4956,7 @@ (c-name "gst_event_parse_sink_message") (return-type "none") (parameters - '("struct-GstMessage**" "msg") + '("GstMessage**" "msg") ) ) @@ -6797,6 +6888,16 @@ ) ) +(define-method fixate_field_string + (of-object "GstStructure") + (c-name "gst_structure_fixate_field_string") + (return-type "gboolean") + (parameters + '("const-char*" "field_name") + '("const-gchar*" "target") + ) +) + (define-method fixate_field_nearest_fraction (of-object "GstStructure") (c-name "gst_structure_fixate_field_nearest_fraction") @@ -7319,6 +7420,17 @@ ) ) +(define-method peek_string_index + (of-object "GstTagList") + (c-name "gst_tag_list_peek_string_index") + (return-type "gboolean") + (parameters + '("const-gchar*" "tag") + '("guint" "index") + '("const-gchar**" "value") + ) +) + (define-method get_pointer (of-object "GstTagList") (c-name "gst_tag_list_get_pointer") @@ -8175,6 +8287,18 @@ ) ) +(define-method link_pads_full + (of-object "GstElement") + (c-name "gst_element_link_pads_full") + (return-type "gboolean") + (parameters + '("const-gchar*" "srcpadname") + '("GstElement*" "dest") + '("const-gchar*" "destpadname") + '("GstPadLinkCheck" "flags") + ) +) + (define-method unlink_pads (of-object "GstElement") (c-name "gst_element_unlink_pads") diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index 851f37f..d166060 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -11,4 +11,6 @@ include @IGNORE_GST_0_10_26@ @IGNORE_GST_PB_0_10_26@ @IGNORE_GST_LOADSAVE@ +@IGNORE_GST_0_10_29@ +@IGNORE_GST_0_10_30@ %% |