mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/: Update for core changes.

Browse source 
Original commit message from CVS:
2005-09-02  Andy Wingo  <wingo@pobox.com>

* gst/gstelement.override:
* gst/gstmessage.override:
* gst/gst-types.defs (State, StateChangeReturn, StateChange):
* gst/gst.defs (change_state): Update for core changes.
This commit is contained in:
Andy Wingo 2005-09-02 16:21:45 +00:00
parent f0607ec5f1
commit 52d5e11fa7
6 changed files with 62 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-09-02 Andy Wingo <wingo@pobox.com>
* gst/gstmessage.override:
* gst/gst-types.defs (State, StateChangeReturn, StateChange):
* gst/gst.defs (change_state): Update for core changes.
2005-09-01 Thomas Vander Stichele <thomas at apestaart dot org> 2005-09-01 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/gst.defs: * gst/gst.defs:

2
env
View file

@ -8,6 +8,8 @@ else
export PYTHONPATH=$thisdir export PYTHONPATH=$thisdir
fi fi
export PKG_CONFIG_PATH=$thisdir/pkgconfig:$PKG_CONFIG_PATH
export PACKAGES="pygst $PACKAGES" export PACKAGES="pygst $PACKAGES"
exec "$@" exec "$@"

34
gst/gst-types.defs
View file

@ -874,10 +874,10 @@
) )
) )
(define-flags ElementState (define-enum State
(in-module "Gst") (in-module "Gst")
(c-name "GstElementState") (c-name "GstState")
(gtype-id "GST_TYPE_ELEMENT_STATE") (gtype-id "GST_TYPE_STATE")
(values (values
'("void-pending" "GST_STATE_VOID_PENDING") '("void-pending" "GST_STATE_VOID_PENDING")
'("null" "GST_STATE_NULL") '("null" "GST_STATE_NULL")
@ -887,15 +887,29 @@
) )
) )
(define-enum ElementStateReturn (define-enum StateChangeReturn
(in-module "Gst") (in-module "Gst")
(c-name "GstElementStateReturn") (c-name "GstStateChangeReturn")
(gtype-id "GST_TYPE_ELEMENT_STATE_RETURN") (gtype-id "GST_TYPE_STATE_CHANGE_RETURN")
(values (values
'("failure" "GST_STATE_FAILURE") '("failure" "GST_STATE_CHANGE_FAILURE")
'("success" "GST_STATE_SUCCESS") '("success" "GST_STATE_CHANGE_SUCCESS")
'("async" "GST_STATE_ASYNC") '("async" "GST_STATE_CHANGE_ASYNC")
'("no-preroll" "GST_STATE_NO_PREROLL") '("no-preroll" "GST_STATE_CHANGE_NO_PREROLL")
)
)
(define-enum StateChange
(in-module "Gst")
(c-name "GstStateChange")
(gtype-id "GST_TYPE_STATE_CHANGE")
(values
'("null-to-ready" "GST_STATE_CHANGE_NULL_TO_READY")
'("ready-to-paused" "GST_STATE_CHANGE_READY_TO_PAUSED")
'("paused-to-playing" "GST_STATE_CHANGE_PAUSED_TO_PLAYING")
'("playing-to-paused" "GST_STATE_CHANGE_PLAYING_TO_PAUSED")
'("paused-to-ready" "GST_STATE_CHANGE_PAUSED_TO_READY")
'("ready-to-null" "GST_STATE_CHANGE_READY_TO_NULL")
) )
) )

33
gst/gst.defs
View file

@ -1038,10 +1038,10 @@
(define-method get_state (define-method get_state
(of-object "GstElement") (of-object "GstElement")
(c-name "gst_element_get_state") (c-name "gst_element_get_state")
(return-type "GstElementStateReturn") (return-type "GstStateChangeReturn")
(parameters (parameters
'("GstElementState*" "state") '("GstState*" "state")
'("GstElementState*" "pending") '("GstState*" "pending")
'("GTimeVal*" "timeout") '("GTimeVal*" "timeout")
) )
) )
@ -1049,9 +1049,9 @@
(define-method set_state (define-method set_state
(of-object "GstElement") (of-object "GstElement")
(c-name "gst_element_set_state") (c-name "gst_element_set_state")
(return-type "GstElementStateReturn") (return-type "GstStateChangeReturn")
(parameters (parameters
'("GstElementState" "state") '("GstState" "state")
) )
) )
@ -1102,17 +1102,20 @@
(define-virtual get_state (define-virtual get_state
(of-object "GstElement") (of-object "GstElement")
(return-type "GstElementStateReturn") (return-type "GstStateChangeReturn")
(parameters (parameters
'("GstElementState*" "state") '("GstState*" "state")
'("GstElementState*" "pending") '("GstState*" "pending")
'("GTimeVal*" "timeout") '("GTimeVal*" "timeout")
) )
) )
(define-virtual change_state (define-virtual change_state
(of-object "GstElement") (of-object "GstElement")
(return-type "GstElementStateReturn") (return-type "GstStateChangeReturn")
(parameters
'("GstStateChange" "transition")
)
) )
(define-virtual request_new_pad (define-virtual request_new_pad
@ -2544,8 +2547,8 @@
(return-type "GstMessage*") (return-type "GstMessage*")
(parameters (parameters
'("GstObject*" "src") '("GstObject*" "src")
'("GstElementState" "old_state") '("GstState" "old_state")
'("GstElementState" "new_state") '("GstState" "new_state")
) )
) )
@ -2611,8 +2614,8 @@
(c-name "gst_message_parse_state_changed") (c-name "gst_message_parse_state_changed")
(return-type "none") (return-type "none")
(parameters (parameters
'("GstElementState*" "old_state") '("GstState*" "old_state")
'("GstElementState*" "new_state") '("GstState*" "new_state")
) )
) )
@ -5635,7 +5638,7 @@
) )
(define-method get_name (define-method get_name
(of-object "GstElementState") (of-object "GstState")
(c-name "gst_element_state_get_name") (c-name "gst_element_state_get_name")
(return-type "const-gchar*") (return-type "const-gchar*")
) )
@ -5643,7 +5646,7 @@
(define-function element_state_get_name (define-function element_state_get_name
(c-name "gst_element_state_get_name") (c-name "gst_element_state_get_name")
(parameters (parameters
'("GstElementState" "state") '("GstState" "state")
) )
(return-type "const-gchar*") (return-type "const-gchar*")
) )

10
gst/gstelement.override
View file

@ -92,12 +92,12 @@ _wrap_gst_element_set_state(PyGObject *self, PyObject *args, PyObject *kwargs)
{ {
static char *kwlist[] = { "state", NULL }; static char *kwlist[] = { "state", NULL };
PyObject *py_state = NULL; PyObject *py_state = NULL;
GstElementState state; GstState state;
gint ret; gint ret;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:GstElement.set_state", kwlist, &py_state)) if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:GstElement.set_state", kwlist, &py_state))
return NULL; return NULL;
if (pyg_flags_get_value(GST_TYPE_ELEMENT_STATE, py_state, (gint *)&state)) if (pyg_enum_get_value(GST_TYPE_STATE, py_state, (gint *)&state))
return NULL; return NULL;
pyg_begin_allow_threads; pyg_begin_allow_threads;
@ -113,8 +113,8 @@ override gst_element_get_state kwargs
static PyObject * static PyObject *
_wrap_gst_element_get_state(PyGObject *self, PyObject *args, PyObject *kwargs) _wrap_gst_element_get_state(PyGObject *self, PyObject *args, PyObject *kwargs)
{ {
GstElementState state; GstState state;
GstElementStateReturn ret; GstStateChangeReturn ret;
/* Only returns the state for the time being */ /* Only returns the state for the time being */
ret = gst_element_get_state(GST_ELEMENT (self->obj), &state, NULL, NULL); ret = gst_element_get_state(GST_ELEMENT (self->obj), &state, NULL, NULL);
@ -122,7 +122,7 @@ _wrap_gst_element_get_state(PyGObject *self, PyObject *args, PyObject *kwargs)
PyErr_SetString(PyExc_RuntimeError, "Element is in an error state"); PyErr_SetString(PyExc_RuntimeError, "Element is in an error state");
return NULL; return NULL;
} }
return pyg_flags_from_gtype(GST_TYPE_ELEMENT_STATE, state); return pyg_enum_from_gtype(GST_TYPE_STATE, state);
} }
%% %%
/* override gst_element_query kwargs */ /* override gst_element_query kwargs */

14
gst/gstmessage.override
View file

@ -25,8 +25,8 @@ override gst_message_parse_state_changed noargs
static PyObject * static PyObject *
_wrap_gst_message_parse_state_changed (PyGstMiniObject *self) _wrap_gst_message_parse_state_changed (PyGstMiniObject *self)
{ {
GstElementState old; GstState old;
GstElementState new; GstState new;
PyObject *ret; PyObject *ret;
/* Should raise an exception if it's not a state-changed message */ /* Should raise an exception if it's not a state-changed message */
@ -37,8 +37,8 @@ _wrap_gst_message_parse_state_changed (PyGstMiniObject *self)
gst_message_parse_state_changed (GST_MESSAGE(self->obj), &old, &new); gst_message_parse_state_changed (GST_MESSAGE(self->obj), &old, &new);
/* Return this as a tuple */ /* Return this as a tuple */
ret = PyList_New(2); ret = PyList_New(2);
PyList_SET_ITEM(ret, 0, pyg_flags_from_gtype(GST_TYPE_ELEMENT_STATE, old)); PyList_SET_ITEM(ret, 0, pyg_enum_from_gtype(GST_TYPE_STATE, old));
PyList_SET_ITEM(ret, 1, pyg_flags_from_gtype(GST_TYPE_ELEMENT_STATE, new)); PyList_SET_ITEM(ret, 1, pyg_enum_from_gtype(GST_TYPE_STATE, new));
return ret; return ret;
} }
%% %%
@ -242,14 +242,14 @@ _wrap_gst_message_new_state_changed(PyObject *self, PyObject *args, PyObject *kw
static char *kwlist[] = { "src", "old_state", "new_state", NULL }; static char *kwlist[] = { "src", "old_state", "new_state", NULL };
PyGObject *src; PyGObject *src;
PyObject *py_old_state = NULL, *py_new_state = NULL; PyObject *py_old_state = NULL, *py_new_state = NULL;
GstElementState old_state, new_state; GstState old_state, new_state;
GstMessage *ret; GstMessage *ret;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!OO:message_new_state_changed", kwlist, &PyGstObject_Type, &src, &py_old_state, &py_new_state)) if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!OO:message_new_state_changed", kwlist, &PyGstObject_Type, &src, &py_old_state, &py_new_state))
return NULL; return NULL;
if (pyg_flags_get_value(GST_TYPE_ELEMENT_STATE, py_old_state, (gint *)&old_state)) if (pyg_enum_get_value(GST_TYPE_STATE, py_old_state, (gint *)&old_state))
return NULL; return NULL;
if (pyg_flags_get_value(GST_TYPE_ELEMENT_STATE, py_new_state, (gint *)&new_state)) if (pyg_enum_get_value(GST_TYPE_STATE, py_new_state, (gint *)&new_state))
return NULL; return NULL;
ret = gst_message_new_state_changed(GST_OBJECT(src->obj), old_state, new_state); ret = gst_message_new_state_changed(GST_OBJECT(src->obj), old_state, new_state);
/* pygobject_new handles NULL checking */ /* pygobject_new handles NULL checking */