srd_inst_decode(): Make the code API version dependent.
authorUwe Hermann <uwe@hermann-uwe.de>
Thu, 25 Aug 2016 20:26:41 +0000 (22:26 +0200)
committerUwe Hermann <uwe@hermann-uwe.de>
Thu, 25 Aug 2016 20:38:04 +0000 (22:38 +0200)
instance.c

index b4f9cfd67638dbc54ac214641e64b31976bb4d1d..86b826f25f9bb6656965c4522f2c99c29470114e 100644 (file)
@@ -543,6 +543,7 @@ SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
 {
        PyObject *py_res;
        srd_logic *logic;
 {
        PyObject *py_res;
        srd_logic *logic;
+       long apiver;
 
        /* Return an error upon unusable input. */
        if (!di) {
 
        /* Return an error upon unusable input. */
        if (!di) {
@@ -566,28 +567,32 @@ SRD_PRIV int srd_inst_decode(const struct srd_decoder_inst *di,
                end_samplenum - start_samplenum, inbuflen, di->data_unitsize,
                di->inst_id);
 
                end_samplenum - start_samplenum, inbuflen, di->data_unitsize,
                di->inst_id);
 
-       /*
-        * Create new srd_logic object. Each iteration around the PD's loop
-        * will fill one sample into this object.
-        */
-       logic = PyObject_New(srd_logic, (PyTypeObject *)srd_logic_type);
-       Py_INCREF(logic);
-       logic->di = (struct srd_decoder_inst *)di;
-       logic->start_samplenum = start_samplenum;
-       logic->itercnt = 0;
-       logic->inbuf = (uint8_t *)inbuf;
-       logic->inbuflen = inbuflen;
-       logic->sample = PyList_New(2);
-       Py_INCREF(logic->sample);
-
-       Py_IncRef(di->py_inst);
-       if (!(py_res = PyObject_CallMethod(di->py_inst, "decode",
+       apiver = srd_decoder_apiver(di->decoder);
+
+       if (apiver == 2) {
+               /*
+                * Create new srd_logic object. Each iteration around the PD's
+                * loop will fill one sample into this object.
+                */
+               logic = PyObject_New(srd_logic, (PyTypeObject *)srd_logic_type);
+               Py_INCREF(logic);
+               logic->di = (struct srd_decoder_inst *)di;
+               logic->start_samplenum = start_samplenum;
+               logic->itercnt = 0;
+               logic->inbuf = (uint8_t *)inbuf;
+               logic->inbuflen = inbuflen;
+               logic->sample = PyList_New(2);
+               Py_INCREF(logic->sample);
+
+               Py_IncRef(di->py_inst);
+               if (!(py_res = PyObject_CallMethod(di->py_inst, "decode",
                        "KKO", start_samplenum, end_samplenum, logic))) {
                        "KKO", start_samplenum, end_samplenum, logic))) {
-               srd_exception_catch("Protocol decoder instance %s",
-                               di->inst_id);
-               return SRD_ERR_PYTHON;
+                       srd_exception_catch("Protocol decoder instance %s",
+                                       di->inst_id);
+                       return SRD_ERR_PYTHON;
+               }
+               Py_DecRef(py_res);
        }
        }
-       Py_DecRef(py_res);
 
        return SRD_OK;
 }
 
        return SRD_OK;
 }