summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2006-02-07 18:54:52 +0000
committerEdward Hervey <bilboed@bilboed.com>2006-02-07 18:54:52 +0000
commite11b1fcafae35ae823c955311d45c1a169fe2856 (patch)
tree40055bd6dc5852582abc4a4755af368956b9c74e
parentfd727fd969cdbba54eec1b94c1ec6647d6fe38fe (diff)
gst/: Remove deprecated code dating back from 0.8 era.
Original commit message from CVS: * gst/gst.override: * gst/gstmodule.c: (python_do_pending_calls): Remove deprecated code dating back from 0.8 era.
-rw-r--r--ChangeLog6
-rw-r--r--gst/gst.override26
-rw-r--r--gst/gstmodule.c7
3 files changed, 6 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index 4035264..abdc384 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-07 Edward Hervey <edward@fluendo.com>
+
+ * gst/gst.override:
+ * gst/gstmodule.c: (python_do_pending_calls):
+ Remove deprecated code dating back from 0.8 era.
+
2006-02-06 Andy Wingo <wingo@pobox.com>
* codegen/argtypes.py (UInt64Arg.write_param): Parse long
diff --git a/gst/gst.override b/gst/gst.override
index 986d11d..9e1d5d1 100644
--- a/gst/gst.override
+++ b/gst/gst.override
@@ -62,32 +62,6 @@ GST_DEBUG_CATEGORY_EXTERN (python_debug);
GST_DEBUG_CATEGORY_EXTERN (pygst_debug);
#define GST_CAT_DEFAULT pygst_debug
-GSList *mainloops = NULL;
-void
-_pygst_main_quit(void)
-{
- if (!mainloops)
- g_error ("Quit more loops than there are");
- else {
- GMainLoop *loop = mainloops->data;
-
- mainloops = g_slist_delete_link (mainloops, mainloops);
- g_main_loop_quit (loop);
- g_main_loop_unref (loop);
- }
- }
-
-void
-_pygst_main(void)
-{
- GMainLoop *loop;
-
- loop = g_main_loop_new (NULL, FALSE);
- mainloops = g_slist_prepend (mainloops, loop);
-
- g_main_loop_run (loop);
-}
-
/* This function checks if a former Python code threw an exception and if
* so, transforms this exception into an error on the given GstElement.
* This allows code run on the element to just raise an exception instead of
diff --git a/gst/gstmodule.c b/gst/gstmodule.c
index e0737d1..f5573ed 100644
--- a/gst/gstmodule.c
+++ b/gst/gstmodule.c
@@ -39,8 +39,6 @@ void pygst_add_constants(PyObject *module, const gchar *strip_prefix);
void _pygst_register_boxed_types(PyObject *moddict);
extern PyMethodDef pygst_functions[];
-extern GSList *mainloops;
-extern void _pygst_main_quit(void);
GST_DEBUG_CATEGORY (pygst_debug); /* for bindings code */
GST_DEBUG_CATEGORY (python_debug); /* for python code */
@@ -68,19 +66,14 @@ GST_DEBUG_CATEGORY (python_debug); /* for python code */
static gboolean
python_do_pending_calls(gpointer data)
{
- gboolean quit = FALSE;
PyGILState_STATE state;
if (PyOS_InterruptOccurred()) {
state = pyg_gil_state_ensure();
PyErr_SetNone(PyExc_KeyboardInterrupt);
pyg_gil_state_release(state);
- quit = TRUE;
}
- if (quit && mainloops != NULL)
- _pygst_main_quit();
-
return TRUE;
}