From a018096a7cd7adf0941281d7138a8ef656429e70 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 1 Jul 2009 10:58:42 +0200 Subject: [PATCH] Update .defs for core API additions --- configure.ac | 9 + gst/Makefile.am | 1 + gst/gst-0.10.24.ignore | 43 +++ gst/gst-types.defs | 42 +++ gst/gst.defs | 526 +++++++++++++++++++++++++++++++++++++ gst/gstversion.override.in | 1 + 6 files changed, 622 insertions(+) create mode 100644 gst/gst-0.10.24.ignore diff --git a/configure.ac b/configure.ac index 550b4c9c1e..c77432a65c 100644 --- a/configure.ac +++ b/configure.ac @@ -167,6 +167,13 @@ then IGNORE_GST_0_10_23="" fi + if test $GST_MINOR_VERSION -lt "24" + then + IGNORE_GST_0_10_24="gst-0.10.24.ignore" + else + IGNORE_GST_0_10_24="" + fi + dnl plugins base if test $GST_PB_MINOR_VERSION -lt "14" then @@ -213,6 +220,7 @@ else IGNORE_GST_0_10_21="" IGNORE_GST_0_10_22="" IGNORE_GST_0_10_23="" + IGNORE_GST_0_10_24="" IGNORE_GST_PB_0_10_14="" IGNORE_GST_PB_0_10_16="" IGNORE_GST_PB_0_10_18="" @@ -232,6 +240,7 @@ AC_SUBST(IGNORE_GST_0_10_20) AC_SUBST(IGNORE_GST_0_10_21) AC_SUBST(IGNORE_GST_0_10_22) AC_SUBST(IGNORE_GST_0_10_23) +AC_SUBST(IGNORE_GST_0_10_24) AC_SUBST(IGNORE_GST_PB_0_10_14) AC_SUBST(IGNORE_GST_PB_0_10_16) AC_SUBST(IGNORE_GST_PB_0_10_18) diff --git a/gst/Makefile.am b/gst/Makefile.am index 0e9f67a703..a0e1e2b4c9 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -34,6 +34,7 @@ versioned_overrides = \ gst-0.10.21.ignore \ gst-0.10.22.ignore \ gst-0.10.23.ignore \ + gst-0.10.24.ignore \ gst-pb-0.10.14.ignore \ gst-pb-0.10.16.ignore \ gst-pb-0.10.18.ignore \ diff --git a/gst/gst-0.10.24.ignore b/gst/gst-0.10.24.ignore new file mode 100644 index 0000000000..4e3dd88c59 --- /dev/null +++ b/gst/gst-0.10.24.ignore @@ -0,0 +1,43 @@ +%% +ignore + gst_element_set_start_time + gst_element_get_start_time + gst_event_new_step + gst_event_parse_step + gst_message_new_tag_full + gst_message_parse_tag_full + gst_message_new_step_done + gst_message_parse_step_done + gst_message_new_stream_status + gst_message_parse_stream_status + gst_message_set_stream_status_object + gst_message_get_stream_status_object + gst_message_new_step_start + gst_message_parse_step_start + gst_pad_set_chain_list_function + gst_pad_push_list + gst_pad_chain_list + gst_plugin_get_cache_data + gst_plugin_set_cache_data + gst_segment_to_position + gst_segment_set_running_time + gst_structure_get_valist + gst_structure_get + gst_structure_id_get_valist + gst_structure_id_get + gst_tag_list_add_value + gst_tag_setter_add_tag_value + gst_task_set_priority + gst_task_get_pool + gst_task_set_pool + gst_task_set_thread_callbacks + gst_task_set_state +%% +ignore-type + GstBufferList + GstTaskPool + GstBufferListItem + GstStreamStatusType + GstBufferList + GstBufferListIterator +%% diff --git a/gst/gst-types.defs b/gst/gst-types.defs index c7c49c63b5..f7bd3427e6 100644 --- a/gst/gst-types.defs +++ b/gst/gst-types.defs @@ -123,6 +123,13 @@ (gtype-id "GST_TYPE_TASK") ) +(define-object TaskPool + (in-module "Gst") + (parent "GstObject") + (c-name "GstTaskPool") + (gtype-id "GST_TYPE_TASK_POOL") +) + (define-object TypeFindFactory (in-module "Gst") (parent "GstPluginFeature") @@ -171,6 +178,13 @@ ) ) +(define-miniobject BufferList + (in-module "Gst") + (parent "GstMiniObject") + (c-name "GstBufferList") + (gtype-id "GST_TYPE_BUFFER_LIST") +) + (define-miniobject Event (in-module "Gst") (parent "GstMiniObject") @@ -367,6 +381,17 @@ ) ) +(define-enum BufferListItem + (in-module "Gst") + (c-name "GstBufferListItem") + (gtype-id "GST_TYPE_BUFFER_LIST_ITEM") + (values + '("continue" "GST_BUFFER_LIST_CONTINUE") + '("skip-group" "GST_BUFFER_LIST_SKIP_GROUP") + '("end" "GST_BUFFER_LIST_END") + ) +) + (define-flags BusFlags (in-module "Gst") (c-name "GstBusFlags") @@ -585,6 +610,7 @@ '("seek" "GST_EVENT_SEEK") '("navigation" "GST_EVENT_NAVIGATION") '("latency" "GST_EVENT_LATENCY") + '("gst-event-step" "GST_EVENT_STEP") '("custom-upstream" "GST_EVENT_CUSTOM_UPSTREAM") '("custom-downstream" "GST_EVENT_CUSTOM_DOWNSTREAM") '("custom-downstream-oob" "GST_EVENT_CUSTOM_DOWNSTREAM_OOB") @@ -796,6 +822,7 @@ '("async-start" "GST_MESSAGE_ASYNC_START") '("async-done" "GST_MESSAGE_ASYNC_DONE") '("request-state" "GST_MESSAGE_REQUEST_STATE") + '("step-start" "GST_MESSAGE_STEP_START") '("any" "GST_MESSAGE_ANY") ) ) @@ -810,6 +837,21 @@ ) ) +(define-enum StreamStatusType + (in-module "Gst") + (c-name "GstStreamStatusType") + (gtype-id "GST_TYPE_STREAM_STATUS_TYPE") + (values + '("create" "GST_STREAM_STATUS_TYPE_CREATE") + '("enter" "GST_STREAM_STATUS_TYPE_ENTER") + '("leave" "GST_STREAM_STATUS_TYPE_LEAVE") + '("destroy" "GST_STREAM_STATUS_TYPE_DESTROY") + '("start" "GST_STREAM_STATUS_TYPE_START") + '("pause" "GST_STREAM_STATUS_TYPE_PAUSE") + '("stop" "GST_STREAM_STATUS_TYPE_STOP") + ) +) + (define-flags MiniObjectFlags (in-module "Gst") (c-name "GstMiniObjectFlags") diff --git a/gst/gst.defs b/gst/gst.defs index 6789f8dbbf..ffc5ed8dda 100644 --- a/gst/gst.defs +++ b/gst/gst.defs @@ -342,6 +342,123 @@ +;; From gstbufferlist.h + +(define-function gst_buffer_list_get_type + (c-name "gst_buffer_list_get_type") + (return-type "GType") +) + +(define-function gst_buffer_list_new + (c-name "gst_buffer_list_new") + (is-constructor-of "GstBufferList") + (return-type "GstBufferList*") +) + +(define-method foreach + (of-object "GstBufferList") + (c-name "gst_buffer_list_foreach") + (return-type "none") + (parameters + '("GstBufferListFunc" "func") + '("gpointer" "user_data") + ) +) + +(define-method get + (of-object "GstBufferList") + (c-name "gst_buffer_list_get") + (return-type "GstBuffer*") + (parameters + '("guint" "group") + '("guint" "idx") + ) +) + +(define-method iterate + (of-object "GstBufferList") + (c-name "gst_buffer_list_iterate") + (return-type "GstBufferListIterator*") +) + +(define-method free + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_free") + (return-type "none") +) + +(define-method n_buffers + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_n_buffers") + (return-type "guint") +) + +(define-method next + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_next") + (return-type "GstBuffer*") +) + +(define-method next_group + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_next_group") + (return-type "gboolean") +) + +(define-method add + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_add") + (return-type "none") + (parameters + '("GstBuffer*" "buffer") + ) +) + +(define-method add_group + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_add_group") + (return-type "none") +) + +(define-method remove + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_remove") + (return-type "none") +) + +(define-method steal + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_steal") + (return-type "GstBuffer*") +) + +(define-method take + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_take") + (return-type "none") + (parameters + '("GstBuffer*" "buffer") + ) +) + +(define-method do + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_do") + (return-type "GstBuffer*") + (parameters + '("GstBufferListDoFunction" "do_func") + '("gpointer" "user_data") + ) +) + +(define-method merge_group + (of-object "GstBufferListIterator") + (c-name "gst_buffer_list_iterator_merge_group") + (return-type "GstBuffer*") +) + + + ;; From ../gstreamer/gst/gstbus.h (define-function bus_get_type @@ -1172,6 +1289,21 @@ (return-type "GstClockTime") ) +(define-method set_start_time + (of-object "GstElement") + (c-name "gst_element_set_start_time") + (return-type "none") + (parameters + '("GstClockTime" "time") + ) +) + +(define-method get_start_time + (of-object "GstElement") + (c-name "gst_element_get_start_time") + (return-type "GstClockTime") +) + (define-method is_indexable (of-object "GstElement") (c-name "gst_element_is_indexable") @@ -1433,6 +1565,15 @@ (return-type "none") ) +(define-method lost_state_full + (of-object "GstElement") + (c-name "gst_element_lost_state_full") + (return-type "none") + (parameters + '("gboolean" "new_base_time") + ) +) + (define-method get_factory (of-object "GstElement") (c-name "gst_element_get_factory") @@ -2207,6 +2348,31 @@ ) ) +(define-function event_new_step + (c-name "gst_event_new_step") + (return-type "GstEvent*") + (parameters + '("GstFormat" "format") + '("guint64" "amount") + '("gdouble" "rate") + '("gboolean" "flush") + '("gboolean" "intermediate") + ) +) + +(define-method parse_step + (of-object "GstEvent") + (c-name "gst_event_parse_step") + (return-type "none") + (parameters + '("GstFormat*" "format") + '("guint64*" "amount") + '("gdouble*" "rate") + '("gboolean*" "flush") + '("gboolean*" "intermediate") + ) +) + ;; From ../gstreamer/gst/gstfilter.h (define-function filter_run @@ -3128,6 +3294,36 @@ ) ) +(define-function message_new_step_done + (c-name "gst_message_new_step_done") + (return-type "GstMessage*") + (parameters + '("GstObject*" "src") + '("GstFormat" "format") + '("guint64" "amount") + '("gdouble" "rate") + '("gboolean" "flush") + '("gboolean" "intermediate") + '("guint64" "duration") + '("gboolean" "eos") + ) +) + +(define-method parse_step_done + (of-object "GstMessage") + (c-name "gst_message_parse_step_done") + (return-type "none") + (parameters + '("GstFormat*" "format") + '("guint64*" "amount") + '("gdouble*" "rate") + '("gboolean*" "flush") + '("gboolean*" "intermediate") + '("guint64*" "duration") + '("gboolean*" "eos") + ) +) + (define-function message_new_clock_provide (c-name "gst_message_new_clock_provide") (return-type "GstMessage*") @@ -3263,6 +3459,41 @@ ) ) +(define-function message_new_stream_status + (c-name "gst_message_new_stream_status") + (return-type "GstMessage*") + (parameters + '("GstObject*" "src") + '("GstStreamStatusType" "type") + '("GstElement*" "owner") + ) +) + +(define-method parse_stream_status + (of-object "GstMessage") + (c-name "gst_message_parse_stream_status") + (return-type "none") + (parameters + '("GstStreamStatusType*" "type") + '("GstElement**" "owner") + ) +) + +(define-method set_stream_status_object + (of-object "GstMessage") + (c-name "gst_message_set_stream_status_object") + (return-type "none") + (parameters + '("const-GValue*" "object") + ) +) + +(define-method get_stream_status_object + (of-object "GstMessage") + (c-name "gst_message_get_stream_status_object") + (return-type "const-GValue*") +) + (define-function message_new_request_state (c-name "gst_message_new_request_state") (return-type "GstMessage*") @@ -3282,6 +3513,34 @@ ) ) +(define-function message_new_step_start + (c-name "gst_message_new_step_start") + (return-type "GstMessage*") + (parameters + '("GstObject*" "src") + '("gboolean" "active") + '("GstFormat" "format") + '("guint64" "amount") + '("gdouble" "rate") + '("gboolean" "flush") + '("gboolean" "intermediate") + ) +) + +(define-method parse_step_start + (of-object "GstMessage") + (c-name "gst_message_parse_step_start") + (return-type "none") + (parameters + '("gboolean*" "active") + '("GstFormat*" "format") + '("guint64*" "amount") + '("gdouble*" "rate") + '("gboolean*" "flush") + '("gboolean*" "intermediate") + ) +) + (define-function message_new_custom (c-name "gst_message_new_custom") (return-type "GstMessage*") @@ -3323,6 +3582,16 @@ ) ) +(define-function message_new_tag_full + (c-name "gst_message_new_tag_full") + (return-type "GstMessage*") + (parameters + '("GstObject*" "src") + '("GstPad*" "pad") + '("GstTagList*" "tag_list" (keep-refcount)) + ) +) + (define-method parse_tag (of-object "GstMessage") (c-name "gst_message_parse_tag") @@ -3332,6 +3601,16 @@ ) ) +(define-method parse_tag_full + (of-object "GstMessage") + (c-name "gst_message_parse_tag_full") + (return-type "none") + (parameters + '("GstPad**" "pad") + '("GstTagList**" "tag_list") + ) +) + (define-method parse_buffering (of-object "GstMessage") (c-name "gst_message_parse_buffering") @@ -3964,6 +4243,15 @@ ) ) +(define-method set_chain_list_function + (of-object "GstPad") + (c-name "gst_pad_set_chain_list_function") + (return-type "none") + (parameters + '("GstPadChainListFunction" "chainlist") + ) +) + (define-method set_getrange_function (of-object "GstPad") (c-name "gst_pad_set_getrange_function") @@ -4155,6 +4443,15 @@ ) ) +(define-method push_list + (of-object "GstPad") + (c-name "gst_pad_push_list") + (return-type "GstFlowReturn") + (parameters + '("GstBufferList*" "list" (keep-refcount)) + ) +) + (define-method check_pull_range (of-object "GstPad") (c-name "gst_pad_check_pull_range") @@ -4199,6 +4496,15 @@ ) ) +(define-method chain_list + (of-object "GstPad") + (c-name "gst_pad_chain_list") + (return-type "GstFlowReturn") + (parameters + '("GstBufferList*" "list" (keep-refcount)) + ) +) + (define-method get_range (of-object "GstPad") (c-name "gst_pad_get_range") @@ -4749,6 +5055,21 @@ (return-type "const-gchar*") ) +(define-method get_cache_data + (of-object "GstPlugin") + (c-name "gst_plugin_get_cache_data") + (return-type "const-GstStructure*") +) + +(define-method set_cache_data + (of-object "GstPlugin") + (c-name "gst_plugin_set_cache_data") + (return-type "none") + (parameters + '("GstStructure*" "cache_data") + ) +) + (define-method get_module (of-object "GstPlugin") (c-name "gst_plugin_get_module") @@ -5819,6 +6140,16 @@ ) ) +(define-method to_position + (of-object "GstSegment") + (c-name "gst_segment_to_position") + (return-type "gint64") + (parameters + '("GstFormat" "format") + '("gint64" "running_time") + ) +) + (define-method clip (of-object "GstSegment") (c-name "gst_segment_clip") @@ -5832,6 +6163,16 @@ ) ) +(define-method set_running_time + (of-object "GstSegment") + (c-name "gst_segment_set_running_time") + (return-type "gboolean") + (parameters + '("GstFormat" "format") + '("gint64" "running_time") + ) +) + ;; From ../gstreamer/gst/gststructure.h @@ -5881,6 +6222,17 @@ ) ) +(define-function gst_structure_id_new + (c-name "gst_structure_id_new") + (is-constructor-of "GstStructureId") + (return-type "GstStructure*") + (parameters + '("GQuark" "name_quark") + '("GQuark" "field_quark") + ) + (varargs #t) +) + (define-method copy (of-object "GstStructure") (c-name "gst_structure_copy") @@ -5973,6 +6325,66 @@ ) ) +(define-method id_set + (of-object "GstStructure") + (c-name "gst_structure_id_set") + (return-type "none") + (parameters + '("GQuark" "fieldname") + ) + (varargs #t) +) + +(define-method id_set_valist + (of-object "GstStructure") + (c-name "gst_structure_id_set_valist") + (return-type "none") + (parameters + '("GQuark" "fieldname") + '("va_list" "varargs") + ) +) + +(define-method get_valist + (of-object "GstStructure") + (c-name "gst_structure_get_valist") + (return-type "gboolean") + (parameters + '("const-char*" "first_fieldname") + '("va_list" "args") + ) +) + +(define-method get + (of-object "GstStructure") + (c-name "gst_structure_get") + (return-type "gboolean") + (parameters + '("const-char*" "first_fieldname") + ) + (varargs #t) +) + +(define-method id_get_valist + (of-object "GstStructure") + (c-name "gst_structure_id_get_valist") + (return-type "gboolean") + (parameters + '("GQuark" "first_field_id") + '("va_list" "args") + ) +) + +(define-method id_get + (of-object "GstStructure") + (c-name "gst_structure_id_get") + (return-type "gboolean") + (parameters + '("GQuark" "first_field_id") + ) + (varargs #t) +) + (define-method id_get_value (of-object "GstStructure") (c-name "gst_structure_id_get_value") @@ -6464,6 +6876,17 @@ ) ) +(define-method add_value + (of-object "GstTagList") + (c-name "gst_tag_list_add_value") + (return-type "none") + (parameters + '("GstTagMergeMode" "mode") + '("const-gchar*" "tag") + '("const-GValue*" "value") + ) +) + (define-method remove_tag (of-object "GstTagList") (c-name "gst_tag_list_remove_tag") @@ -6885,6 +7308,17 @@ ) ) +(define-method add_tag_value + (of-object "GstTagSetter") + (c-name "gst_tag_setter_add_tag_value") + (return-type "none") + (parameters + '("GstTagMergeMode" "mode") + '("const-gchar*" "tag") + '("const-GValue*" "value") + ) +) + (define-method get_tag_list (of-object "GstTagSetter") (c-name "gst_tag_setter_get_tag_list") @@ -6933,12 +7367,56 @@ ) ) +(define-method set_priority + (of-object "GstTask") + (c-name "gst_task_set_priority") + (return-type "none") + (parameters + '("GThreadPriority" "priority") + ) +) + +(define-method get_pool + (of-object "GstTask") + (c-name "gst_task_get_pool") + (return-type "GstTaskPool*") +) + +(define-method set_pool + (of-object "GstTask") + (c-name "gst_task_set_pool") + (return-type "none") + (parameters + '("GstTaskPool*" "pool") + ) +) + +(define-method set_thread_callbacks + (of-object "GstTask") + (c-name "gst_task_set_thread_callbacks") + (return-type "none") + (parameters + '("GstTaskThreadCallbacks*" "callbacks") + '("gpointer" "user_data") + '("GDestroyNotify" "notify") + ) +) + (define-method get_state (of-object "GstTask") (c-name "gst_task_get_state") (return-type "GstTaskState") ) +(define-method set_state + (of-object "GstTask") + (c-name "gst_task_set_state") + (return-type "gboolean") + (parameters + '("GstTaskState" "state") + ) +) + (define-method start (of-object "GstTask") (c-name "gst_task_start") @@ -6957,6 +7435,54 @@ (return-type "gboolean") ) +;; From gsttaskpool.h + +(define-function gst_task_pool_get_type + (c-name "gst_task_pool_get_type") + (return-type "GType") +) + +(define-function gst_task_pool_new + (c-name "gst_task_pool_new") + (is-constructor-of "GstTaskPool") + (return-type "GstTaskPool*") +) + +(define-method prepare + (of-object "GstTaskPool") + (c-name "gst_task_pool_prepare") + (return-type "none") + (parameters + '("GError**" "error") + ) +) + +(define-method push + (of-object "GstTaskPool") + (c-name "gst_task_pool_push") + (return-type "gpointer") + (parameters + '("GstTaskPoolFunction" "func") + '("gpointer" "user_data") + '("GError**" "error") + ) +) + +(define-method join + (of-object "GstTaskPool") + (c-name "gst_task_pool_join") + (return-type "none") + (parameters + '("gpointer" "id") + ) +) + +(define-method cleanup + (of-object "GstTaskPool") + (c-name "gst_task_pool_cleanup") + (return-type "none") +) + ;; From ../gstreamer/gst/gsttrace.h (define-function trace_new diff --git a/gst/gstversion.override.in b/gst/gstversion.override.in index f18e46a429..02a28fef57 100644 --- a/gst/gstversion.override.in +++ b/gst/gstversion.override.in @@ -13,5 +13,6 @@ include @IGNORE_GST_0_10_22@ @IGNORE_GST_0_10_23@ @IGNORE_GST_PB_0_10_23@ +@IGNORE_GST_0_10_24@ @IGNORE_GST_LOADSAVE@ %%