mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 16:50:47 +00:00
update upstream API changes
Original commit message from CVS: * configure.ac: * gst/Makefile.am: * gst/base.defs: * gst/gst-0.10.18.ignore: * gst/gst-0.10.20.ignore: * gst/gst-pb-0.10.18.ignore: * gst/gst-types.defs: * gst/gst.defs: * gst/gstversion.override.in: * gst/interfaces.defs: update upstream API changes
This commit is contained in:
parent
4373919e96
commit
8c5646ea9e
12 changed files with 367 additions and 4 deletions
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
|||
2008-07-02 Edward Hervey <edward.hervey@collabora.co.uk>
|
||||
|
||||
* configure.ac:
|
||||
* gst/Makefile.am:
|
||||
* gst/base.defs:
|
||||
* gst/gst-0.10.18.ignore:
|
||||
* gst/gst-0.10.20.ignore:
|
||||
* gst/gst-pb-0.10.18.ignore:
|
||||
* gst/gst-types.defs:
|
||||
* gst/gst.defs:
|
||||
* gst/gstversion.override.in:
|
||||
* gst/interfaces.defs:
|
||||
update upstream API changes
|
||||
|
||||
2008-06-27 Edward Hervey <edward.hervey@collabora.co.uk>
|
||||
|
||||
* testsuite/test_interface.py:
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit d9cd98b46aebaf143dc43d8563a3bff650be6a7e
|
||||
Subproject commit 593bb114c6f5c32b529aa6443be4c2d60d6484c7
|
27
configure.ac
27
configure.ac
|
@ -131,6 +131,20 @@ then
|
|||
IGNORE_GST_0_10_16=""
|
||||
fi
|
||||
|
||||
if test $GST_MINOR_VERSION -lt "18"
|
||||
then
|
||||
IGNORE_GST_0_10_18="gst-0.10.18.ignore"
|
||||
else
|
||||
IGNORE_GST_0_10_18=""
|
||||
fi
|
||||
|
||||
if test $GST_MINOR_VERSION -lt "20"
|
||||
then
|
||||
IGNORE_GST_0_10_20="gst-0.10.20.ignore"
|
||||
else
|
||||
IGNORE_GST_0_10_20=""
|
||||
fi
|
||||
|
||||
dnl plugins base
|
||||
if test $GST_PB_MINOR_VERSION -lt "14"
|
||||
then
|
||||
|
@ -147,13 +161,23 @@ then
|
|||
AC_DEFINE_UNQUOTED(HAVE_PLUGINS_INSTALL, 1, [We can use the plugins-install methods])
|
||||
fi
|
||||
|
||||
if test $GST_PB_MINOR_VERSION -lt "18"
|
||||
then
|
||||
IGNORE_GST_PB_0_10_18="gst-pb-0.10.18.ignore"
|
||||
else
|
||||
IGNORE_GST_PB_0_10_18=""
|
||||
fi
|
||||
|
||||
else
|
||||
IGNORE_GST_0_10_13=""
|
||||
IGNORE_GST_0_10_14=""
|
||||
IGNORE_GST_0_10_15=""
|
||||
IGNORE_GST_0_10_16=""
|
||||
IGNORE_GST_0_10_18=""
|
||||
IGNORE_GST_0_10_20=""
|
||||
IGNORE_GST_PB_0_10_14=""
|
||||
IGNORE_GST_PB_0_10_16=""
|
||||
IGNORE_GST_PB_0_10_18=""
|
||||
AC_DEFINE_UNQUOTED(HAVE_PLUGINS_INSTALL, 1, [We can use the plugins-install methods])
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED(HAVE_VIDEO_ORIENTATION_INTERFACE, 1, [We can use the videoorientation interface])
|
||||
|
@ -161,8 +185,11 @@ AC_SUBST(IGNORE_GST_0_10_13)
|
|||
AC_SUBST(IGNORE_GST_0_10_14)
|
||||
AC_SUBST(IGNORE_GST_0_10_15)
|
||||
AC_SUBST(IGNORE_GST_0_10_16)
|
||||
AC_SUBST(IGNORE_GST_0_10_18)
|
||||
AC_SUBST(IGNORE_GST_0_10_20)
|
||||
AC_SUBST(IGNORE_GST_PB_0_10_14)
|
||||
AC_SUBST(IGNORE_GST_PB_0_10_16)
|
||||
AC_SUBST(IGNORE_GST_PB_0_10_18)
|
||||
AC_SUBST(HAVE_VIDEO_ORIENTATION)
|
||||
AC_SUBST(HAVE_PLUGINS_INSTALL)
|
||||
|
||||
|
|
|
@ -29,8 +29,11 @@ versioned_overrides = \
|
|||
gst-0.10.14.ignore \
|
||||
gst-0.10.15.ignore \
|
||||
gst-0.10.16.ignore \
|
||||
gst-0.10.18.ignore \
|
||||
gst-0.10.20.ignore \
|
||||
gst-pb-0.10.14.ignore \
|
||||
gst-pb-0.10.16.ignore \
|
||||
gst-pb-0.10.18.ignore \
|
||||
gst-disable-loadsave.ignore
|
||||
|
||||
INCLUDES = $(PYTHON_INCLUDES)
|
||||
|
|
|
@ -421,7 +421,7 @@
|
|||
(c-name "gst_base_src_set_do_timestamp")
|
||||
(return-type "none")
|
||||
(parameters
|
||||
'("gboolean" "live")
|
||||
'("gboolean" "timestamp")
|
||||
)
|
||||
)
|
||||
|
||||
|
@ -863,6 +863,26 @@
|
|||
)
|
||||
)
|
||||
|
||||
(define-method read_buffer
|
||||
(of-object "GstCollectPads")
|
||||
(c-name "gst_collect_pads_read_buffer")
|
||||
(return-type "GstBuffer*")
|
||||
(parameters
|
||||
'("GstCollectData*" "data")
|
||||
'("guint" "size")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method take_buffer
|
||||
(of-object "GstCollectPads")
|
||||
(c-name "gst_collect_pads_take_buffer")
|
||||
(return-type "GstBuffer*")
|
||||
(parameters
|
||||
'("GstCollectData*" "data")
|
||||
'("guint" "size")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method flush
|
||||
(of-object "GstCollectPads")
|
||||
(c-name "gst_collect_pads_flush")
|
||||
|
|
7
gst/gst-0.10.18.ignore
Normal file
7
gst/gst-0.10.18.ignore
Normal file
|
@ -0,0 +1,7 @@
|
|||
%%
|
||||
ignore
|
||||
gst_index_set_resolver_full
|
||||
%%
|
||||
ignore-type
|
||||
GstPoll
|
||||
%%
|
16
gst/gst-0.10.20.ignore
Normal file
16
gst/gst-0.10.20.ignore
Normal file
|
@ -0,0 +1,16 @@
|
|||
%%
|
||||
ignore
|
||||
gst_event_has_name
|
||||
gst_message_set_buffering_stats
|
||||
gst_message_parse_buffering_stats
|
||||
gst_value_dup_mini_object
|
||||
gst_parse_context_new
|
||||
gst_parse_context_get_missing_elements
|
||||
gst_parse_context_free
|
||||
gst_parse_launch_full
|
||||
gst_parse_launchv_full
|
||||
%%
|
||||
ignore-type
|
||||
GstParseFlags
|
||||
GstBufferingMode
|
||||
%%
|
8
gst/gst-pb-0.10.18.ignore
Normal file
8
gst/gst-pb-0.10.18.ignore
Normal file
|
@ -0,0 +1,8 @@
|
|||
%%
|
||||
ignore
|
||||
gst_collect_pads_read_buffer
|
||||
gst_collect_pads_take_buffer
|
||||
gst_mixer_message_parse_options_list_changed
|
||||
%%
|
||||
ignore-type
|
||||
%%
|
|
@ -515,6 +515,8 @@
|
|||
'("demux" "GST_STREAM_ERROR_DEMUX")
|
||||
'("mux" "GST_STREAM_ERROR_MUX")
|
||||
'("format" "GST_STREAM_ERROR_FORMAT")
|
||||
'("decrypt" "GST_STREAM_ERROR_DECRYPT")
|
||||
'("decrypt-nokey" "GST_STREAM_ERROR_DECRYPT_NOKEY")
|
||||
'("num-errors" "GST_STREAM_ERROR_NUM_ERRORS")
|
||||
)
|
||||
)
|
||||
|
@ -883,6 +885,16 @@
|
|||
)
|
||||
)
|
||||
|
||||
(define-flags ParseFlags
|
||||
(in-module "Gst")
|
||||
(c-name "GstParseFlags")
|
||||
(gtype-id "GST_TYPE_PARSE_FLAGS")
|
||||
(values
|
||||
'("none" "GST_PARSE_FLAG_NONE")
|
||||
'("fatal-errors" "GST_PARSE_FLAG_FATAL_ERRORS")
|
||||
)
|
||||
)
|
||||
|
||||
(define-flags PipelineFlags
|
||||
(in-module "Gst")
|
||||
(c-name "GstPipelineFlags")
|
||||
|
@ -928,6 +940,19 @@
|
|||
'("segment" "GST_QUERY_SEGMENT")
|
||||
'("convert" "GST_QUERY_CONVERT")
|
||||
'("formats" "GST_QUERY_FORMATS")
|
||||
'("buffering" "GST_QUERY_BUFFERING")
|
||||
)
|
||||
)
|
||||
|
||||
(define-enum BufferingMode
|
||||
(in-module "Gst")
|
||||
(c-name "GstBufferingMode")
|
||||
(gtype-id "GST_TYPE_BUFFERING_MODE")
|
||||
(values
|
||||
'("stream" "GST_BUFFERING_STREAM")
|
||||
'("download" "GST_BUFFERING_DOWNLOAD")
|
||||
'("timeshift" "GST_BUFFERING_TIMESHIFT")
|
||||
'("live" "GST_BUFFERING_LIVE")
|
||||
)
|
||||
)
|
||||
|
||||
|
|
235
gst/gst.defs
235
gst/gst.defs
|
@ -658,7 +658,7 @@
|
|||
(c-name "gst_caps_set_simple")
|
||||
(return-type "none")
|
||||
(parameters
|
||||
'("char*" "field")
|
||||
'("const-char*" "field")
|
||||
)
|
||||
(varargs #t)
|
||||
)
|
||||
|
@ -668,7 +668,7 @@
|
|||
(c-name "gst_caps_set_simple_valist")
|
||||
(return-type "none")
|
||||
(parameters
|
||||
'("char*" "field")
|
||||
'("const-char*" "field")
|
||||
'("va_list" "varargs")
|
||||
)
|
||||
)
|
||||
|
@ -1958,6 +1958,15 @@
|
|||
(return-type "const-GstStructure*")
|
||||
)
|
||||
|
||||
(define-method has_name
|
||||
(of-object "GstEvent")
|
||||
(c-name "gst_event_has_name")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("const-gchar*" "name")
|
||||
)
|
||||
)
|
||||
|
||||
(define-function event_new_flush_start
|
||||
(c-name "gst_event_new_flush_start")
|
||||
(return-type "GstEvent*")
|
||||
|
@ -2377,6 +2386,17 @@
|
|||
)
|
||||
)
|
||||
|
||||
(define-method set_resolver_full
|
||||
(of-object "GstIndex")
|
||||
(c-name "gst_index_set_resolver_full")
|
||||
(return-type "none")
|
||||
(parameters
|
||||
'("GstIndexResolver" "resolver")
|
||||
'("gpointer" "user_data")
|
||||
'("GDestroyNotify" "user_data_destroy")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method get_writer_id
|
||||
(of-object "GstIndex")
|
||||
(c-name "gst_index_get_writer_id")
|
||||
|
@ -3202,6 +3222,30 @@
|
|||
)
|
||||
)
|
||||
|
||||
(define-method set_buffering_stats
|
||||
(of-object "GstMessage")
|
||||
(c-name "gst_message_set_buffering_stats")
|
||||
(return-type "none")
|
||||
(parameters
|
||||
'("GstBufferingMode" "mode")
|
||||
'("gint" "avg_in")
|
||||
'("gint" "avg_out")
|
||||
'("gint64" "buffering_left")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method parse_buffering_stats
|
||||
(of-object "GstMessage")
|
||||
(c-name "gst_message_parse_buffering_stats")
|
||||
(return-type "none")
|
||||
(parameters
|
||||
'("GstBufferingMode*" "mode")
|
||||
'("gint*" "avg_in")
|
||||
'("gint*" "avg_out")
|
||||
'("gint64*" "buffering_left")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method parse_state_changed
|
||||
(of-object "GstMessage")
|
||||
(c-name "gst_message_parse_state_changed")
|
||||
|
@ -3401,6 +3445,13 @@
|
|||
)
|
||||
)
|
||||
|
||||
(define-function gst_value_dup_mini_object
|
||||
(c-name "gst_value_dup_mini_object")
|
||||
(return-type "GstMiniObject*")
|
||||
(parameters
|
||||
'("const-GValue*" "value")
|
||||
)
|
||||
)
|
||||
;; From ../gstreamer/gst/gstobject.h
|
||||
|
||||
(define-function object_get_type
|
||||
|
@ -4314,6 +4365,24 @@
|
|||
(return-type "GQuark")
|
||||
)
|
||||
|
||||
(define-function gst_parse_context_new
|
||||
(c-name "gst_parse_context_new")
|
||||
(is-constructor-of "GstParseContext")
|
||||
(return-type "GstParseContext*")
|
||||
)
|
||||
|
||||
(define-method get_missing_elements
|
||||
(of-object "GstParseContext")
|
||||
(c-name "gst_parse_context_get_missing_elements")
|
||||
(return-type "gchar**")
|
||||
)
|
||||
|
||||
(define-method free
|
||||
(of-object "GstParseContext")
|
||||
(c-name "gst_parse_context_free")
|
||||
(return-type "none")
|
||||
)
|
||||
|
||||
(define-function parse_launch
|
||||
(c-name "gst_parse_launch")
|
||||
(return-type "GstElement*")
|
||||
|
@ -4334,6 +4403,27 @@
|
|||
)
|
||||
)
|
||||
|
||||
(define-function parse_launch_full
|
||||
(c-name "gst_parse_launch_full")
|
||||
(return-type "GstElement*")
|
||||
(parameters
|
||||
'("const-gchar*" "pipeline_description")
|
||||
'("GstParseContext*" "context")
|
||||
'("GstParseFlags" "flags")
|
||||
'("GError**" "error")
|
||||
)
|
||||
)
|
||||
|
||||
(define-function parse_launchv_full
|
||||
(c-name "gst_parse_launchv_full")
|
||||
(return-type "GstElement*")
|
||||
(parameters
|
||||
'("const-gchar**" "argv")
|
||||
'("GstParseContext*" "context")
|
||||
'("GstParseFlags" "flags")
|
||||
'("GError**" "error")
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
;; From ../gstreamer/gst/gstpipeline.h
|
||||
|
@ -4631,6 +4721,147 @@
|
|||
)
|
||||
)
|
||||
|
||||
;; From gstpoll.h
|
||||
|
||||
(define-function gst_poll_new
|
||||
(c-name "gst_poll_new")
|
||||
(is-constructor-of "GstPoll")
|
||||
(return-type "GstPoll*")
|
||||
(parameters
|
||||
'("gboolean" "controllable")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method free
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_free")
|
||||
(return-type "none")
|
||||
)
|
||||
|
||||
(define-method init
|
||||
(of-object "GstPollFD")
|
||||
(c-name "gst_poll_fd_init")
|
||||
(return-type "none")
|
||||
)
|
||||
|
||||
(define-method add_fd
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_add_fd")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("GstPollFD*" "fd")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method remove_fd
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_remove_fd")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("GstPollFD*" "fd")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method fd_ctl_write
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_fd_ctl_write")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("GstPollFD*" "fd")
|
||||
'("gboolean" "active")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method fd_ctl_read
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_fd_ctl_read")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("GstPollFD*" "fd")
|
||||
'("gboolean" "active")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method fd_ignored
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_fd_ignored")
|
||||
(return-type "none")
|
||||
(parameters
|
||||
'("GstPollFD*" "fd")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method fd_has_closed
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_fd_has_closed")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("GstPollFD*" "fd")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method fd_has_error
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_fd_has_error")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("GstPollFD*" "fd")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method fd_can_read
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_fd_can_read")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("GstPollFD*" "fd")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method fd_can_write
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_fd_can_write")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("GstPollFD*" "fd")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method wait
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_wait")
|
||||
(return-type "gint")
|
||||
(parameters
|
||||
'("GstClockTime" "timeout")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method set_controllable
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_set_controllable")
|
||||
(return-type "gboolean")
|
||||
(parameters
|
||||
'("gboolean" "controllable")
|
||||
)
|
||||
)
|
||||
|
||||
(define-method restart
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_restart")
|
||||
(return-type "none")
|
||||
)
|
||||
|
||||
(define-method set_flushing
|
||||
(of-object "GstPoll")
|
||||
(c-name "gst_poll_set_flushing")
|
||||
(return-type "none")
|
||||
(parameters
|
||||
'("gboolean" "flushing")
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
|
||||
;; From ../gstreamer/gst/gstquery.h
|
||||
|
||||
(define-method get_name
|
||||
|
|
|
@ -6,5 +6,8 @@ include
|
|||
@IGNORE_GST_0_10_15@
|
||||
@IGNORE_GST_0_10_16@
|
||||
@IGNORE_GST_PB_0_10_16@
|
||||
@IGNORE_GST_0_10_18@
|
||||
@IGNORE_GST_PB_0_10_18@
|
||||
@IGNORE_GST_0_10_20@
|
||||
@IGNORE_GST_LOADSAVE@
|
||||
%%
|
||||
|
|
|
@ -407,6 +407,15 @@
|
|||
)
|
||||
)
|
||||
|
||||
(define-function gst_mixer_message_parse_options_list_changed
|
||||
(c-name "gst_mixer_message_parse_options_list_changed")
|
||||
(return-type "none")
|
||||
(parameters
|
||||
'("GstMessage*" "message")
|
||||
'("GstMixerOptions**" "options")
|
||||
)
|
||||
)
|
||||
|
||||
(define-virtual list_tracks
|
||||
(of-object "GstMixer")
|
||||
(return-type "const-GList*")
|
||||
|
|
Loading…
Reference in a new issue