From c37b502949404b3ba80c84919a40ada531840300 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 9 Oct 2005 16:02:42 +0000 Subject: [PATCH] now we can send events to elements again Original commit message from CVS: * gst/gstelement.override: * testsuite/test_event.py: now we can send events to elements again --- ChangeLog | 6 ++++++ gst/gstelement.override | 7 ++++--- testsuite/test_event.py | 20 ++++++++++++-------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18be481fcc..4c540923cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-10-09 Thomas Vander Stichele + + * gst/gstelement.override: + * testsuite/test_event.py: + now we can send events to elements again + 2005-10-09 Thomas Vander Stichele * gst/gst.defs: diff --git a/gst/gstelement.override b/gst/gstelement.override index 4ed5a16743..7752bc1976 100644 --- a/gst/gstelement.override +++ b/gst/gstelement.override @@ -370,9 +370,9 @@ _wrap_gst_element_send_event(PyGObject *self, PyObject *args, PyObject *kwargs) if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:GstElement.send_event", kwlist, &py_event)) return NULL; - if (pyg_boxed_check(py_event, GST_TYPE_EVENT)) - event = pyg_boxed_get(py_event, GstEvent); - else { + if (pygstminiobject_check (py_event, &PyGstEvent_Type)) { + event = GST_EVENT (pygstminiobject_get (py_event)); + } else { PyErr_SetString(PyExc_TypeError, "event should be a GstEvent"); return NULL; } @@ -406,6 +406,7 @@ _wrap_gst_element_query_position (PyGObject *self, PyObject *args) PyList_Append(ret, PyLong_FromLongLong(end)); PyList_Append(ret, pyg_enum_from_gtype (GST_TYPE_FORMAT, format )); } else { + g_print("FIXME: query failed\n"); Py_INCREF(Py_None); ret = Py_None; } diff --git a/testsuite/test_event.py b/testsuite/test_event.py index ffcbb165e6..163f2052e1 100644 --- a/testsuite/test_event.py +++ b/testsuite/test_event.py @@ -30,14 +30,18 @@ class EventTest(unittest.TestCase): self.sink = pipeline.get_by_name('sink') pipeline.set_state(gst.STATE_PLAYING) -# def testEventEmpty(self): -# event = gst.Event(gst.EVENT_EMPTY) -# self.sink.send_event(event) - -# def testEventSeek(self): -# event = gst.event_new_seek(gst.SEEK_METHOD_CUR, 0) -# assert event -# self.sink.send_event(event) + def testEventSeek(self): + event = gst.event_new_seek(1.0, gst.FORMAT_BYTES, gst.SEEK_FLAG_FLUSH, + gst.SEEK_TYPE_NONE, 0, gst.SEEK_TYPE_NONE, 0) + assert event + self.sink.send_event(event) + + def testWrongEvent(self): + buffer = gst.Buffer() + self.assertRaises(TypeError, self.sink.send_event, buffer) + number = 1 + self.assertRaises(TypeError, self.sink.send_event, number) + # FIXME: fix these tests #class EventFileSrcTest(unittest.TestCase):