mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

thread block/unblock in callback functions indentation update

Browse source 
Original commit message from CVS:
thread block/unblock in callback functions
indentation update
This commit is contained in:
David I. Lehn 2002-12-21 23:46:29 +00:00
parent b807857c46
commit 0b94dd64f0
3 changed files with 103 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2002-12-21 David I. Lehn <dlehn@users.sourceforge.net>
* gstreamer/gstreamer.override (call_connect_function,
call_chain_function): block/unblock threads before entering Python
interpreter
* gstreamer/gstreamer.override: indent
2002-12-17 David I. Lehn <dlehn@users.sourceforge.net> 2002-12-17 David I. Lehn <dlehn@users.sourceforge.net>
* gstreamer/gstreamer.override: add wrapper for gst_element_set_state * gstreamer/gstreamer.override: add wrapper for gst_element_set_state

63
gst/gstreamer.override
View file

@ -75,9 +75,12 @@ call_connect_function (GstPad *pad, GstCaps *caps)
{ {
PyObject *function; PyObject *function;
PyObject *retval; PyObject *retval;
GstPadConnectReturn ret;
function = pad_private(pad)->connect_function; function = pad_private(pad)->connect_function;
pyg_block_threads();
retval = (PyObject*)PyObject_CallFunction (function, retval = (PyObject*)PyObject_CallFunction (function,
"OO", "OO",
pad_private(pad)->pad, pad_private(pad)->pad,
@ -85,10 +88,15 @@ call_connect_function (GstPad *pad, GstCaps *caps)
if (PyErr_Occurred ()) { if (PyErr_Occurred ()) {
PyErr_Print (); PyErr_Print ();
pyg_unblock_threads();
return GST_PAD_CONNECT_REFUSED; return GST_PAD_CONNECT_REFUSED;
} }
return PyInt_AsLong(retval); ret = PyInt_AsLong(retval);
pyg_unblock_threads();
return ret;
} }
static PyObject* static PyObject*
@ -101,9 +109,9 @@ _wrap_gst_pad_set_connect_function (PyGObject *self,
GstPad *pad; GstPad *pad;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"O:GstPad.set_connect_funcion", "O:GstPad.set_connect_funcion",
kwlist, kwlist,
&connect_function)) { &connect_function)) {
return NULL; return NULL;
} }
@ -130,15 +138,20 @@ call_chain_function(GstPad *pad, GstBuffer *buf)
function = pad_private(pad)->chain_function; function = pad_private(pad)->chain_function;
pyg_block_threads();
PyObject_CallFunction (function, PyObject_CallFunction (function,
"OO", "OO",
pad_private(pad)->pad, pad_private(pad)->pad,
pyg_boxed_new(GST_TYPE_BUFFER, buf, TRUE, TRUE)); pyg_boxed_new(GST_TYPE_BUFFER, buf, TRUE, TRUE));
if (PyErr_Occurred ()) { if (PyErr_Occurred ()) {
PyErr_Print (); PyErr_Print ();
pyg_unblock_threads();
return; return;
} }
pyg_unblock_threads();
} }
static PyObject* static PyObject*
@ -151,9 +164,9 @@ _wrap_gst_pad_set_chain_function(PyGObject *self,
GstPad *pad; GstPad *pad;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"O:GstPad.set_chain_funcion", "O:GstPad.set_chain_funcion",
kwlist, kwlist,
&chain_function)) { &chain_function)) {
return NULL; return NULL;
} }
@ -222,12 +235,12 @@ override gst_bin_iterate
static PyObject * static PyObject *
_wrap_gst_bin_iterate(PyGObject *self) _wrap_gst_bin_iterate(PyGObject *self)
{ {
int ret; int ret;
pyg_unblock_threads(); pyg_unblock_threads();
ret = gst_bin_iterate(GST_BIN(self->obj)); ret = gst_bin_iterate(GST_BIN(self->obj));
pyg_block_threads(); pyg_block_threads();
return PyInt_FromLong(ret); return PyInt_FromLong(ret);
} }
%% %%
override gst_element_set_state kwargs override gst_element_set_state kwargs
@ -235,17 +248,17 @@ override gst_element_set_state kwargs
static PyObject * static PyObject *
_wrap_gst_element_set_state(PyGObject *self, PyObject *args, PyObject *kwargs) _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; GstElementState 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_flags_get_value(GST_TYPE_ELEMENT_STATE, py_state, (gint *)&state))
return NULL; return NULL;
pyg_unblock_threads(); pyg_unblock_threads();
ret = gst_element_set_state(GST_ELEMENT(self->obj), state); ret = gst_element_set_state(GST_ELEMENT(self->obj), state);
pyg_block_threads(); pyg_block_threads();
return PyInt_FromLong(ret); return PyInt_FromLong(ret);
} }

63
gstreamer/gstreamer.override
View file

@ -75,9 +75,12 @@ call_connect_function (GstPad *pad, GstCaps *caps)
{ {
PyObject *function; PyObject *function;
PyObject *retval; PyObject *retval;
GstPadConnectReturn ret;
function = pad_private(pad)->connect_function; function = pad_private(pad)->connect_function;
pyg_block_threads();
retval = (PyObject*)PyObject_CallFunction (function, retval = (PyObject*)PyObject_CallFunction (function,
"OO", "OO",
pad_private(pad)->pad, pad_private(pad)->pad,
@ -85,10 +88,15 @@ call_connect_function (GstPad *pad, GstCaps *caps)
if (PyErr_Occurred ()) { if (PyErr_Occurred ()) {
PyErr_Print (); PyErr_Print ();
pyg_unblock_threads();
return GST_PAD_CONNECT_REFUSED; return GST_PAD_CONNECT_REFUSED;
} }
return PyInt_AsLong(retval); ret = PyInt_AsLong(retval);
pyg_unblock_threads();
return ret;
} }
static PyObject* static PyObject*
@ -101,9 +109,9 @@ _wrap_gst_pad_set_connect_function (PyGObject *self,
GstPad *pad; GstPad *pad;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"O:GstPad.set_connect_funcion", "O:GstPad.set_connect_funcion",
kwlist, kwlist,
&connect_function)) { &connect_function)) {
return NULL; return NULL;
} }
@ -130,15 +138,20 @@ call_chain_function(GstPad *pad, GstBuffer *buf)
function = pad_private(pad)->chain_function; function = pad_private(pad)->chain_function;
pyg_block_threads();
PyObject_CallFunction (function, PyObject_CallFunction (function,
"OO", "OO",
pad_private(pad)->pad, pad_private(pad)->pad,
pyg_boxed_new(GST_TYPE_BUFFER, buf, TRUE, TRUE)); pyg_boxed_new(GST_TYPE_BUFFER, buf, TRUE, TRUE));
if (PyErr_Occurred ()) { if (PyErr_Occurred ()) {
PyErr_Print (); PyErr_Print ();
pyg_unblock_threads();
return; return;
} }
pyg_unblock_threads();
} }
static PyObject* static PyObject*
@ -151,9 +164,9 @@ _wrap_gst_pad_set_chain_function(PyGObject *self,
GstPad *pad; GstPad *pad;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"O:GstPad.set_chain_funcion", "O:GstPad.set_chain_funcion",
kwlist, kwlist,
&chain_function)) { &chain_function)) {
return NULL; return NULL;
} }
@ -222,12 +235,12 @@ override gst_bin_iterate
static PyObject * static PyObject *
_wrap_gst_bin_iterate(PyGObject *self) _wrap_gst_bin_iterate(PyGObject *self)
{ {
int ret; int ret;
pyg_unblock_threads(); pyg_unblock_threads();
ret = gst_bin_iterate(GST_BIN(self->obj)); ret = gst_bin_iterate(GST_BIN(self->obj));
pyg_block_threads(); pyg_block_threads();
return PyInt_FromLong(ret); return PyInt_FromLong(ret);
} }
%% %%
override gst_element_set_state kwargs override gst_element_set_state kwargs
@ -235,17 +248,17 @@ override gst_element_set_state kwargs
static PyObject * static PyObject *
_wrap_gst_element_set_state(PyGObject *self, PyObject *args, PyObject *kwargs) _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; GstElementState 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_flags_get_value(GST_TYPE_ELEMENT_STATE, py_state, (gint *)&state))
return NULL; return NULL;
pyg_unblock_threads(); pyg_unblock_threads();
ret = gst_element_set_state(GST_ELEMENT(self->obj), state); ret = gst_element_set_state(GST_ELEMENT(self->obj), state);
pyg_block_threads(); pyg_block_threads();
return PyInt_FromLong(ret); return PyInt_FromLong(ret);
} }