mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-26 06:54:49 +00:00
gst/gstmodule.c: Remove do_pending_calls timeout which has been handled more gracefully in pygobject MainLoop for the...
Original commit message from CVS: * gst/gstmodule.c: (init_gst): Remove do_pending_calls timeout which has been handled more gracefully in pygobject MainLoop for the past 3 years. Fixes #512916
This commit is contained in:
parent
4bb2d5c501
commit
e97c51a473
2 changed files with 7 additions and 22 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2008-01-30 Edward Hervey <edward.hervey@collabora.co.uk>
|
||||||
|
|
||||||
|
* gst/gstmodule.c: (init_gst):
|
||||||
|
Remove do_pending_calls timeout which has been handled more gracefully
|
||||||
|
in pygobject MainLoop for the past 3 years.
|
||||||
|
Fixes #512916
|
||||||
|
|
||||||
2008-01-28 Jan Schmidt <jan.schmidt@sun.com>
|
2008-01-28 Jan Schmidt <jan.schmidt@sun.com>
|
||||||
|
|
||||||
* configure.ac:
|
* configure.ac:
|
||||||
|
|
|
@ -58,26 +58,6 @@ GST_DEBUG_CATEGORY (python_debug); /* for python code */
|
||||||
o=pyg_type_wrapper_new(gtype)); \
|
o=pyg_type_wrapper_new(gtype)); \
|
||||||
Py_DECREF(o);
|
Py_DECREF(o);
|
||||||
|
|
||||||
|
|
||||||
/* This is a timeout that gets added to the mainloop to handle SIGINT (Ctrl-C)
|
|
||||||
* Other signals get handled at some other point where transition from
|
|
||||||
* C -> Python is being made.
|
|
||||||
*/
|
|
||||||
static gboolean
|
|
||||||
python_do_pending_calls(gpointer data)
|
|
||||||
{
|
|
||||||
PyGILState_STATE state;
|
|
||||||
|
|
||||||
if (PyOS_InterruptOccurred()) {
|
|
||||||
state = pyg_gil_state_ensure();
|
|
||||||
PyErr_SetNone(PyExc_KeyboardInterrupt);
|
|
||||||
pyg_gil_state_release(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static PyObject*
|
static PyObject*
|
||||||
pygstminiobject_from_gvalue(const GValue *value)
|
pygstminiobject_from_gvalue(const GValue *value)
|
||||||
{
|
{
|
||||||
|
@ -269,8 +249,6 @@ init_gst (void)
|
||||||
PyModule_AddStringConstant (m, "CORE_ERROR", (gchar *) g_quark_to_string(GST_CORE_ERROR));
|
PyModule_AddStringConstant (m, "CORE_ERROR", (gchar *) g_quark_to_string(GST_CORE_ERROR));
|
||||||
PyModule_AddStringConstant (m, "STREAM_ERROR", (gchar *) g_quark_to_string(GST_STREAM_ERROR));
|
PyModule_AddStringConstant (m, "STREAM_ERROR", (gchar *) g_quark_to_string(GST_STREAM_ERROR));
|
||||||
|
|
||||||
g_timeout_add_full (0, 100, python_do_pending_calls, NULL, NULL);
|
|
||||||
|
|
||||||
if (PyErr_Occurred ()) {
|
if (PyErr_Occurred ()) {
|
||||||
Py_FatalError ("can't initialize module gst");
|
Py_FatalError ("can't initialize module gst");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue