summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert Vermeulen <bert@biot.com>2013-12-13 17:57:01 +0100
committerBert Vermeulen <bert@biot.com>2013-12-13 17:57:01 +0100
commit3d14e7c9ac0155c0438b46dee267e3e16a6b8e3a (patch)
tree5a52f523736307f546394dcc2db1bbad7f5ec225
parentc8233c78da6acb23b74afe271c30355442fdaa5c (diff)
downloadlibsigrokdecode-3d14e7c9ac0155c0438b46dee267e3e16a6b8e3a.tar.gz
libsigrokdecode-3d14e7c9ac0155c0438b46dee267e3e16a6b8e3a.zip
Send SRD_OUTPUT_PYTHON to registered callbacks as well.
There's really only one use case for this: the testing framework. This allows it to check what gets sent up the stack as well.
-rw-r--r--type_decoder.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/type_decoder.c b/type_decoder.c
index 3e6f17b..f64f849 100644
--- a/type_decoder.c
+++ b/type_decoder.c
@@ -209,7 +209,7 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
}
if (!PyArg_ParseTuple(args, "KKiO", &start_sample, &end_sample,
- &output_id, &py_data)) {
+ &output_id, &py_data)) {
/*
* This throws an exception, but by returning NULL here we let
* Python raise it. This results in a much better trace in
@@ -253,16 +253,21 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
for (l = di->next_di; l; l = l->next) {
next_di = l->data;
srd_spew("Sending %d-%d to instance %s",
- start_sample, end_sample,
- next_di->inst_id);
+ start_sample, end_sample, next_di->inst_id);
if (!(py_res = PyObject_CallMethod(
- next_di->py_inst, "decode", "KKO", start_sample,
- end_sample, py_data))) {
+ next_di->py_inst, "decode", "KKO", start_sample,
+ end_sample, py_data))) {
srd_exception_catch("Calling %s decode(): ",
- next_di->inst_id);
+ next_di->inst_id);
}
Py_XDECREF(py_res);
}
+ if ((cb = srd_pd_output_callback_find(di->sess, pdo->output_type))) {
+ /* Frontends aren't really supposed to get Python
+ * callbacks, but it's useful for testing. */
+ pdata->data = py_data;
+ cb->cb(pdata, cb->cb_data);
+ }
break;
case SRD_OUTPUT_BINARY:
if ((cb = srd_pd_output_callback_find(di->sess, pdo->output_type))) {