Send SRD_OUTPUT_PYTHON to registered callbacks as well.

[libsigrokdecode.git] / type_decoder.c

diff --git a/type_decoder.c b/type_decoder.c
index 6140fd0b21e63112b54259fcb56a6bf3dc618b4e..f64f849e9eee9fd51ff5694e7d3c6b61bc0fa53e 100644 (file)
--- 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
@@ -252,19 +252,22 @@ static PyObject *Decoder_put(PyObject *self, PyObject *args)
        case SRD_OUTPUT_PYTHON:
                for (l = di->next_di; l; l = l->next) {
                        next_di = l->data;
-                       /* TODO: Is this needed? */
-                       Py_XINCREF(next_di->py_inst);
                        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))) {
@@ -366,23 +369,9 @@ static PyObject *Decoder_register(PyObject *self, PyObject *args,
        return py_new_output_id;
 }
 
-/* TODO: this is just a stub that calls _register() until all PDs
- * are changed to use the new register API. */
-static PyObject *Decoder_add(PyObject *self, PyObject *args)
-{
-       PyObject *py_keywords, *py_new_output_id;
-
-       py_keywords = PyDict_New();
-       py_new_output_id = Decoder_register(self, args, py_keywords);
-       Py_DecRef(py_keywords);
-
-       return py_new_output_id;
-}
-
 static PyMethodDef Decoder_methods[] = {
        {"put", Decoder_put, METH_VARARGS,
         "Accepts a dictionary with the following keys: startsample, endsample, data"},
-       {"add", Decoder_add, METH_VARARGS, "Create a new output stream"},
        {"register", (PyCFunction)Decoder_register, METH_VARARGS|METH_KEYWORDS,
                        "Register a new output stream"},
        {NULL, NULL, 0, NULL}