mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-07 07:58:51 +00:00
gst/gst.defs (gst_registry_scan_paths) (gst_element_abort_preroll, gst_plugin_check_file)
Original commit message from CVS: 2005-10-12 Andy Wingo <wingo@pobox.com> * gst/gst.defs (gst_registry_scan_paths) (gst_element_abort_preroll, gst_plugin_check_file) (gst_element_finish_preroll): Removed undefined symbols. * gst/gstelement.override (_wrap_gst_element_get_state): Fix for GstClockTime api change.
This commit is contained in:
parent
2cfbf3f112
commit
46e1018e41
4 changed files with 17 additions and 38 deletions
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,16 @@
|
||||||
|
2005-10-12 Andy Wingo <wingo@pobox.com>
|
||||||
|
|
||||||
|
* gst/gst.defs (gst_element_abort_preroll): foo
|
||||||
|
(gst_plugin_check_file):
|
||||||
|
|
||||||
|
* gst/gst.defs (gst_element_finish_preroll): foo
|
||||||
|
|
||||||
|
* gst/gstelement.override (_wrap_gst_element_get_state): Fix for
|
||||||
|
GstClockTime api change.
|
||||||
|
|
||||||
|
* gst/gst.defs (gst_registry_scan_paths): Removed, following
|
||||||
|
removal from GStreamer.
|
||||||
|
|
||||||
2005-10-12 Julien MOUTTE <julien@moutte.net>
|
2005-10-12 Julien MOUTTE <julien@moutte.net>
|
||||||
|
|
||||||
* gst/gst-argtypes.c:
|
* gst/gst-argtypes.c:
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 37ed26e33bae9a6ab256c62ebbb9d711374a0abb
|
Subproject commit 2485a65b662de25fb7b71857e34411426c6f530c
|
30
gst/gst.defs
30
gst/gst.defs
|
@ -3929,15 +3929,6 @@
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
(define-function plugin_check_file
|
|
||||||
(c-name "gst_plugin_check_file")
|
|
||||||
(return-type "gboolean")
|
|
||||||
(parameters
|
|
||||||
'("const-gchar*" "filename")
|
|
||||||
'("GError**" "error")
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
(define-function plugin_load_file
|
(define-function plugin_load_file
|
||||||
(c-name "gst_plugin_load_file")
|
(c-name "gst_plugin_load_file")
|
||||||
(return-type "GstPlugin*")
|
(return-type "GstPlugin*")
|
||||||
|
@ -4395,12 +4386,6 @@
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
(define-method scan_paths
|
|
||||||
(of-object "GstRegistry")
|
|
||||||
(c-name "gst_registry_scan_paths")
|
|
||||||
(return-type "none")
|
|
||||||
)
|
|
||||||
|
|
||||||
;; From ../gstreamer/gst/gststructure.h
|
;; From ../gstreamer/gst/gststructure.h
|
||||||
|
|
||||||
(define-function gst_structure_get_type
|
(define-function gst_structure_get_type
|
||||||
|
@ -5816,21 +5801,6 @@
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
(define-method abort_preroll
|
|
||||||
(of-object "GstElement")
|
|
||||||
(c-name "gst_element_abort_preroll")
|
|
||||||
(return-type "GstFlowReturn")
|
|
||||||
)
|
|
||||||
|
|
||||||
(define-method finish_preroll
|
|
||||||
(of-object "GstElement")
|
|
||||||
(c-name "gst_element_finish_preroll")
|
|
||||||
(return-type "GstFlowReturn")
|
|
||||||
(parameters
|
|
||||||
'("GstPad*" "pad")
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
(define-method create_all_pads
|
(define-method create_all_pads
|
||||||
(of-object "GstElement")
|
(of-object "GstElement")
|
||||||
(c-name "gst_element_create_all_pads")
|
(c-name "gst_element_create_all_pads")
|
||||||
|
|
|
@ -83,8 +83,7 @@ _wrap_gst_element_get_state(PyGObject *self, PyObject *args, PyObject *kwargs)
|
||||||
GstStateChangeReturn ret;
|
GstStateChangeReturn ret;
|
||||||
PyObject *timeout = NULL;
|
PyObject *timeout = NULL;
|
||||||
gdouble timeoutd;
|
gdouble timeoutd;
|
||||||
GTimeVal *timevalp = NULL;
|
GstClockTime timeout64;
|
||||||
GTimeVal timeval;
|
|
||||||
PyObject *tuple;
|
PyObject *tuple;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -112,16 +111,13 @@ _wrap_gst_element_get_state(PyGObject *self, PyObject *args, PyObject *kwargs)
|
||||||
timeoutd = PyFloat_AsDouble (timeout);
|
timeoutd = PyFloat_AsDouble (timeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
timeval.tv_sec = (glong) timeoutd;
|
timeout64 = timeoutd * GST_SECOND;
|
||||||
timeval.tv_usec = (glong) ((timeoutd - (gdouble) timeval.tv_sec)
|
|
||||||
* 1000.0 * 1000.0);
|
|
||||||
timevalp = &timeval;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pyg_begin_allow_threads;
|
pyg_begin_allow_threads;
|
||||||
|
|
||||||
ret = gst_element_get_state(GST_ELEMENT (self->obj), &state, &pending,
|
ret = gst_element_get_state(GST_ELEMENT (self->obj), &state, &pending,
|
||||||
timevalp);
|
timeout64);
|
||||||
|
|
||||||
pyg_end_allow_threads;
|
pyg_end_allow_threads;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue